Skip to content

Commit 490bce7

Browse files
suztomosuztomo
authoredJan 30, 2025··
fix: animal-sniffer and clirr to a profiles (#1145)
* fix: animal-sniffer-maven-plugin and clirr-maven-plugin to profiles b/384085175#comment40. We can skip animal-sniffer-maven-plugin execution if we wrap it as a profile. * clirr profile
·
v1.39.0louhi-1139
1 parent 91d8947 commit 490bce7

File tree

4 files changed

+67
-73
lines changed

4 files changed

+67
-73
lines changed
 

‎google-oauth-client-appengine/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,6 @@
6262
</execution>
6363
</executions>
6464
</plugin>
65-
<!--App Engine uses Java 7 or Java 8-->
66-
<plugin>
67-
<groupId>org.codehaus.mojo</groupId>
68-
<artifactId>animal-sniffer-maven-plugin</artifactId>
69-
<configuration>
70-
<signature>
71-
<groupId>org.codehaus.mojo.signature</groupId>
72-
<artifactId>java17</artifactId>
73-
<version>1.0</version>
74-
</signature>
75-
</configuration>
76-
</plugin>
7765
<plugin>
7866
<groupId>org.apache.felix</groupId>
7967
<artifactId>maven-bundle-plugin</artifactId>

‎google-oauth-client-java6/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,6 @@
4747
</execution>
4848
</executions>
4949
</plugin>
50-
<!--Set minimum version to Java 7-->
51-
<plugin>
52-
<groupId>org.codehaus.mojo</groupId>
53-
<artifactId>animal-sniffer-maven-plugin</artifactId>
54-
<configuration>
55-
<signature>
56-
<groupId>org.codehaus.mojo.signature</groupId>
57-
<artifactId>java17</artifactId>
58-
<version>1.0</version>
59-
</signature>
60-
</configuration>
61-
</plugin>
6250
<plugin>
6351
<groupId>org.apache.felix</groupId>
6452
<artifactId>maven-bundle-plugin</artifactId>

‎google-oauth-client-jetty/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,6 @@
4949
</execution>
5050
</executions>
5151
</plugin>
52-
<!--Minimum version is Java 7 -->
53-
<plugin>
54-
<groupId>org.codehaus.mojo</groupId>
55-
<artifactId>animal-sniffer-maven-plugin</artifactId>
56-
<configuration>
57-
<signature>
58-
<groupId>org.codehaus.mojo.signature</groupId>
59-
<artifactId>java17</artifactId>
60-
<version>1.0</version>
61-
</signature>
62-
</configuration>
63-
</plugin>
6452
<plugin>
6553
<groupId>org.apache.felix</groupId>
6654
<artifactId>maven-bundle-plugin</artifactId>

‎pom.xml

+67-37
Original file line numberDiff line numberDiff line change
@@ -399,43 +399,6 @@
399399
</plugins>
400400
</configuration>
401401
</plugin>
402-
<plugin>
403-
<groupId>org.codehaus.mojo</groupId>
404-
<artifactId>clirr-maven-plugin</artifactId>
405-
<configuration>
406-
<comparisonVersion>1.19.0</comparisonVersion>
407-
<ignoredDifferencesFile>${basedir}/../clirr-ignored-differences.xml</ignoredDifferencesFile>
408-
<logResults>true</logResults>
409-
</configuration>
410-
<executions>
411-
<execution>
412-
<goals>
413-
<goal>check</goal>
414-
</goals>
415-
</execution>
416-
</executions>
417-
</plugin>
418-
<plugin>
419-
<groupId>org.codehaus.mojo</groupId>
420-
<artifactId>animal-sniffer-maven-plugin</artifactId>
421-
<configuration>
422-
<signature>
423-
<groupId>org.codehaus.mojo.signature</groupId>
424-
<artifactId>java17</artifactId>
425-
<version>1.0</version>
426-
</signature>
427-
<ignores>
428-
<ignore>com.sun.net.httpserver.*</ignore>
429-
</ignores>
430-
</configuration>
431-
<executions>
432-
<execution>
433-
<goals>
434-
<goal>check</goal>
435-
</goals>
436-
</execution>
437-
</executions>
438-
</plugin>
439402
<!-- Build the dependencies report at package time (needed for the assembly artifact). -->
440403
<plugin>
441404
<artifactId>maven-project-info-reports-plugin</artifactId>
@@ -661,5 +624,72 @@
661624
</snapshotRepository>
662625
</distributionManagement>
663626
</profile>
627+
<profile>
628+
<id>clirr-compatibility-check</id>
629+
<!--
630+
CLIRR Maven plugin's dependencies are quite old and not available
631+
in some build environment (Airlock).
632+
https://github.com/googleapis/java-shared-config/issues/956
633+
Extracting this plugin declaration as a profile enables us to disable
634+
the CLIRR dependency resolution by `mvn -P=-clirr-compatibility-check ...`
635+
-->
636+
<activation>
637+
<!-- The compatibility check runs by default in CIs -->
638+
<jdk>[1.8,)</jdk>
639+
</activation>
640+
<build>
641+
<plugins>
642+
<plugin>
643+
<groupId>org.codehaus.mojo</groupId>
644+
<artifactId>clirr-maven-plugin</artifactId>
645+
<configuration>
646+
<comparisonVersion>1.19.0</comparisonVersion>
647+
<ignoredDifferencesFile>${basedir}/../clirr-ignored-differences.xml</ignoredDifferencesFile>
648+
<logResults>true</logResults>
649+
</configuration>
650+
<executions>
651+
<execution>
652+
<goals>
653+
<goal>check</goal>
654+
</goals>
655+
</execution>
656+
</executions>
657+
</plugin>
658+
</plugins>
659+
</build>
660+
</profile>
661+
<profile>
662+
<id>animal-sniffer</id>
663+
<activation>
664+
<!-- The compatibility check runs by default in CIs -->
665+
<jdk>[1.8,)</jdk>
666+
</activation>
667+
<build>
668+
<plugins>
669+
<plugin>
670+
<groupId>org.codehaus.mojo</groupId>
671+
<artifactId>animal-sniffer-maven-plugin</artifactId>
672+
<configuration>
673+
<signature>
674+
<groupId>org.codehaus.mojo.signature</groupId>
675+
<!--Set minimum version to Java 7-->
676+
<artifactId>java17</artifactId>
677+
<version>1.0</version>
678+
</signature>
679+
<ignores>
680+
<ignore>com.sun.net.httpserver.*</ignore>
681+
</ignores>
682+
</configuration>
683+
<executions>
684+
<execution>
685+
<goals>
686+
<goal>check</goal>
687+
</goals>
688+
</execution>
689+
</executions>
690+
</plugin>
691+
</plugins>
692+
</build>
693+
</profile>
664694
</profiles>
665695
</project>

0 commit comments

Comments
 (0)
Please sign in to comment.