Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -413,12 +413,30 @@ jobs:
java-version: 11
cache: maven
- run: java -version
- run: mvn -B -ntp enforcer:enforce@enforce -T 1C
ban-duplicate-classes:
needs: bulk-filter
if: |
needs.bulk-filter.outputs.runnable == 'true' &&
github.head_ref == 'release-please--branches--main' &&
!endsWith(github.event.pull_request.title, 'SNAPSHOT')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
with:
persist-credentials: false
- uses: actions/setup-java@cf277c60eb25467037889841efdb72551f06f6c3 # v4.9.1
with:
distribution: temurin
java-version: 11
cache: maven
- run: java -version
- name: Install Maven modules to local Maven repository
run: .kokoro/build.sh
env:
JOB_TYPE: install
- run: java -version
- run: mvn -B -ntp enforcer:enforce@enforce -T 1C
- run: mvn -B -ntp enforcer:enforce@enforce-banned-duplicate-classes -T 1C
gapic-libraries-bom:
needs: bulk-filter
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
Expand Down
47 changes: 47 additions & 0 deletions google-auth-library-java/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,51 @@
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<!-- Temporary enforcer configuration override until a new version of google-cloud-shared-config is released to Maven Central.
Because this module inherits a released version of google-cloud-shared-config from Central (which includes banDuplicateClasses in its default enforce execution),
we override the enforce execution here to avoid running banDuplicateClasses on standard PRs where intra-repo SNAPSHOT JARs are unbuilt.
Remove this override once the parent version is bumped to the newly released google-cloud-shared-config. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce</id>
<configuration>
<rules combine.self="override">
<requireMavenVersion>
<version>[3.8.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.8,)</version>
</requireJavaVersion>
<requireUpperBoundDeps/>
</rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-duplicate-classes</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<banDuplicateClasses>
<scopes>
<scope>compile</scope>
<scope>provided</scope>
</scopes>
<findAllDuplicates>true</findAllDuplicates>
<ignoreWhenIdentical>true</ignoreWhenIdentical>
</banDuplicateClasses>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
42 changes: 42 additions & 0 deletions google-auth-library-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,48 @@
</plugins>
</pluginManagement>
<plugins>
<!-- Temporary enforcer configuration override until a new version of google-cloud-shared-config is released to Maven Central.
Because this module inherits a released version of google-cloud-shared-config from Central (which includes banDuplicateClasses in its default enforce execution),
we override the enforce execution here to avoid running banDuplicateClasses on standard PRs where intra-repo SNAPSHOT JARs are unbuilt.
Remove this override once the parent version is bumped to the newly released google-cloud-shared-config. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce</id>
<configuration>
<rules combine.self="override">
<requireMavenVersion>
<version>[3.8.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.8,)</version>
</requireJavaVersion>
<requireUpperBoundDeps/>
</rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-duplicate-classes</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<banDuplicateClasses>
<scopes>
<scope>compile</scope>
<scope>provided</scope>
</scopes>
<findAllDuplicates>true</findAllDuplicates>
<ignoreWhenIdentical>true</ignoreWhenIdentical>
</banDuplicateClasses>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
Expand Down
4 changes: 2 additions & 2 deletions grpc-gcp-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
first-party-dependencies, which is imported by google-cloud-shared-dependencies;
importing shared dependency management from grpc-gcp would create a dependency
management cycle. -->
<version>1.17.0</version>
<relativePath/>
<version>1.21.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-config:current} -->
<relativePath>../java-shared-config/java-shared-config/pom.xml</relativePath>
</parent>

<groupId>com.google.cloud</groupId>
Expand Down
4 changes: 4 additions & 0 deletions java-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
<relativePath>../google-cloud-jar-parent/pom.xml</relativePath>
</parent>

<properties>
<enforcer.skip>true</enforcer.skip>
</properties>

<modules>
<module>native-image-sample</module>
</modules>
Expand Down
14 changes: 12 additions & 2 deletions java-shared-config/java-shared-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,22 @@
<configuration>
<rules>
<requireMavenVersion>
<version>[3.0,)</version>
<version>[3.8.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.7,)</version>
<version>[1.8,)</version>
</requireJavaVersion>
<requireUpperBoundDeps/>
</rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-duplicate-classes</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<banDuplicateClasses>
<scopes>
<scope>compile</scope>
Expand Down
Loading