Skip to content

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

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 20, 2026
Merged

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

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
9a0c25e
fix(deps): build and release with dependencies from Airlock only
hj690 Oct 19, 2026
a9559fa
build: remove duplicate maven-bundle-plugin version from submodules
hj690 Oct 20, 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 @@ -104,7 +104,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
1 change: 0 additions & 1 deletion google-http-client-apache-v2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,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-http-client-apache-v5/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,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-http-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,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
55 changes: 51 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,53 @@
<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>
Comment on lines +398 to +400

@lqiu96 lqiu96 Oct 19, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

qq, this looks to be adding in a new plugin? Is this intended? Do we need maven-bundle-plugin?

@blakeli0 blakeli0 Oct 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think maven-bundle-plugin is used in multiple sub-modules, and this is supposed to be the parent that override dependencies.

That being said, I think we should remove the version declaration in submodules (e.g. here) so it is less confusing.

@hj690 hj690 Oct 20, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you both for the review!

@lqiu96 , yes as Blake mentioned, maven-bundle-plugin is already used by google-http-client, google-http-client-apache-v2, and google-http-client-apache-v5, adding this in the root pom.xml lets the parent POM centrally override its transitive plexus-i18n dependency (1.0-beta-7 -> 1.0-beta-10) without repeating the override in all three modules.

Thanks for the suggestion @BlakeLi, I updated in a9559fa to remove the duplicate <version>5.1.9</version> declarations from the three child pom.xml files so they inherit the version from the parent <pluginManagement>.

<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>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -575,11 +622,11 @@
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.
-->
<activation>
<!-- The compatibility check runs by default in CIs -->
<jdk>[1.8,)</jdk>
</activation>
<build>
<plugins>
<plugin>
Expand Down
Loading