Skip to content

Commit

Permalink
fix: animal-sniffer and clirr to a profiles (#1145)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@suztomo
suztomo authored Jan 30, 2025
1 parent 91d8947 commit 490bce7
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 73 deletions.
12 changes: 0 additions & 12 deletions google-oauth-client-appengine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,6 @@
</execution>
</executions>
</plugin>
<!--App Engine uses Java 7 or Java 8-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java17</artifactId>
<version>1.0</version>
</signature>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down
12 changes: 0 additions & 12 deletions google-oauth-client-java6/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,6 @@
</execution>
</executions>
</plugin>
<!--Set minimum version to Java 7-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java17</artifactId>
<version>1.0</version>
</signature>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down
12 changes: 0 additions & 12 deletions google-oauth-client-jetty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,6 @@
</execution>
</executions>
</plugin>
<!--Minimum version is Java 7 -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java17</artifactId>
<version>1.0</version>
</signature>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down
104 changes: 67 additions & 37 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,43 +399,6 @@
</plugins>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<configuration>
<comparisonVersion>1.19.0</comparisonVersion>
<ignoredDifferencesFile>${basedir}/../clirr-ignored-differences.xml</ignoredDifferencesFile>
<logResults>true</logResults>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java17</artifactId>
<version>1.0</version>
</signature>
<ignores>
<ignore>com.sun.net.httpserver.*</ignore>
</ignores>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Build the dependencies report at package time (needed for the assembly artifact). -->
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
Expand Down Expand Up @@ -661,5 +624,72 @@
</snapshotRepository>
</distributionManagement>
</profile>
<profile>
<id>clirr-compatibility-check</id>
<!--
CLIRR Maven plugin's dependencies are quite old and not available
in some build environment (Airlock).
https://github.com/googleapis/java-shared-config/issues/956
Extracting this plugin declaration as a profile enables us to disable
the CLIRR dependency resolution by `mvn -P=-clirr-compatibility-check ...`
-->
<activation>
<!-- The compatibility check runs by default in CIs -->
<jdk>[1.8,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<configuration>
<comparisonVersion>1.19.0</comparisonVersion>
<ignoredDifferencesFile>${basedir}/../clirr-ignored-differences.xml</ignoredDifferencesFile>
<logResults>true</logResults>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>animal-sniffer</id>
<activation>
<!-- The compatibility check runs by default in CIs -->
<jdk>[1.8,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<!--Set minimum version to Java 7-->
<artifactId>java17</artifactId>
<version>1.0</version>
</signature>
<ignores>
<ignore>com.sun.net.httpserver.*</ignore>
</ignores>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

0 comments on commit 490bce7

Please sign in to comment.