Skip to content

fix(deps): build and release with dependencies from Airlock only #2639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blakeli0 merged 2 commits into from
Oct 22, 2026
+115 −25
Merged

fix(deps): build and release with dependencies from Airlock only #2639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6948047
fix(deps): build and release with dependencies from Airlock only
hj690 Oct 22, 2026
24c0327
fix(deps): exclude unused xerces:xmlParserAPIs and evicted org.osgi.c…
hj690 Oct 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .kokoro/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ samples)
fi
;;
clirr)
mvn -B -ntp -Denforcer.skip=true clirr:check
mvn -B -ntp -Denforcer.skip=true -P=clirr-compatibility-check clirr:check
RETURN_CODE=$?
;;
*)
Expand Down
7 changes: 7 additions & 0 deletions google-api-client-android/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@
<artifactId>android</artifactId>
<version>4.1.1.4</version>
<scope>provided</scope>
<exclusions>
<!-- Provided by the JDK since Java 1.4; Airlock (maven-3p-trusted) does not have a license for xerces:xmlParserAPIs:2.6.2 -->
<exclusion>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
Expand Down
1 change: 0 additions & 1 deletion google-api-client-apache-v5/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<executions>
<execution>
<id>bundle-manifest</id>
Expand Down
1 change: 0 additions & 1 deletion google-api-client-appengine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<executions>
<execution>
<id>bundle-manifest</id>
Expand Down
1 change: 0 additions & 1 deletion google-api-client-gson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<executions>
<execution>
<id>bundle-manifest</id>
Expand Down
1 change: 0 additions & 1 deletion google-api-client-jackson2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<executions>
<execution>
<id>bundle-manifest</id>
Expand Down
1 change: 0 additions & 1 deletion google-api-client-protobuf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<executions>
<execution>
<id>bundle-manifest</id>
Expand Down
1 change: 0 additions & 1 deletion google-api-client-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<executions>
<execution>
<id>bundle-manifest</id>
Expand Down
1 change: 0 additions & 1 deletion google-api-client-xml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<executions>
<execution>
<id>bundle-manifest</id>
Expand Down
1 change: 0 additions & 1 deletion google-api-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<executions>
<execution>
<id>bundle-manifest</id>
Expand Down
123 changes: 107 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,81 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.5</version>
<dependencies>
<!--
Airlock (maven-3p-trusted) has no approved license for antlr 2.7.2
and plexus-i18n 1.0-beta-7, which this plugin pulls in through
doxia-site-renderer 1.7.
-->
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.7</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-i18n</artifactId>
<version>1.0-beta-10</version>
<exclusions>
<!-- Its parent adds old Plexus container JARs that Airlock does not have. Maven core provides them. -->
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<dependencies>
<!--
Airlock (maven-3p-trusted) has no approved license for plexus-i18n 1.0-beta-7,
which this plugin pulls in through doxia-site-renderer 1.0.
-->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-i18n</artifactId>
<version>1.0-beta-10</version>
<exclusions>
<!-- Its parent adds old Plexus container JARs that Airlock does not have. Maven core provides them. -->
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--
maven-bundle-plugin 5.1.9 directly depends on org.osgi:org.osgi.core:6.0.0,
which evicts the 4.1.0 transitive dependency declared by bundlerepository and utils.
Excluding org.osgi.core here stops Maven from probing the evicted 4.1.0 POM,
which has no license metadata in Airlock (maven-3p-trusted).
-->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
<version>1.6.6</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
<version>1.6.0</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -471,22 +546,6 @@
</plugins>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<configuration>
<comparisonVersion>1.27.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>
Expand Down Expand Up @@ -760,5 +819,37 @@
</snapshotRepository>
</distributionManagement>
</profile>
<profile>
<id>clirr-compatibility-check</id>
<!--
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 ...`
The profile is opt-in: the CLIRR CI job enables it with
`-P=clirr-compatibility-check`. Builds that use only Airlock do not
resolve the CLIRR dependencies, such as plexus-components 1.1.4 and
classworlds 1.1-alpha-2, which have no approved license in Airlock.
-->
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<configuration>
<comparisonVersion>1.27.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>
</profiles>
</project>
Loading