Skip to content
Draft
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
5 changes: 0 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -413,11 +413,6 @@ jobs:
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
gapic-libraries-bom:
needs: bulk-filter
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/sdk-platform-java-shared_dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ on:
- main
pull_request:
paths:
- 'gapic-generator-java-bom/**'
- 'gapic-generator-java-pom-parent/**'
- 'java-shared-dependencies/**'
- 'sdk-platform-java/gapic-generator-java-bom/**'
- 'sdk-platform-java/gapic-generator-java-pom-parent/**'
- 'sdk-platform-java/java-shared-dependencies/**'
- '.github/workflows/sdk-platform-java-shared_dependencies.yaml'
name: sdk-platform-java shared-dependencies version check
env:
BUILD_SUBDIR: sdk-platform-java
Expand Down Expand Up @@ -46,6 +47,6 @@ jobs:
- name: Install maven modules
run: |
mvn install -B -ntp -DskipTests -Pquick-build
- name: Check the BOM content satisfies the upper-bound-check test case
run: mvn -B -V -ntp verify -Pquick-build
- name: Check the BOM content satisfies the upper-bound-check and duplicate-classes test case
run: mvn -B -ntp enforcer:enforce
working-directory: sdk-platform-java/java-shared-dependencies/upper-bound-check
25 changes: 25 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,29 @@
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<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.9.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.8,)</version>
</requireJavaVersion>
<requireUpperBoundDeps/>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
20 changes: 20 additions & 0 deletions google-auth-library-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,26 @@
</plugins>
</pluginManagement>
<plugins>
<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.9.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.8,)</version>
</requireJavaVersion>
<requireUpperBoundDeps/>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
Expand Down
20 changes: 20 additions & 0 deletions grpc-gcp-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,26 @@
</extension>
</extensions>
<plugins>
<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.9.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.8,)</version>
</requireJavaVersion>
<requireUpperBoundDeps/>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
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
12 changes: 2 additions & 10 deletions java-shared-config/java-shared-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -248,20 +248,12 @@
<configuration>
<rules>
<requireMavenVersion>
<version>[3.0,)</version>
<version>[3.9.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.7,)</version>
<version>[1.8,)</version>
</requireJavaVersion>
<requireUpperBoundDeps/>
<banDuplicateClasses>
<scopes>
<scope>compile</scope>
<scope>provided</scope>
</scopes>
<findAllDuplicates>true</findAllDuplicates>
<ignoreWhenIdentical>true</ignoreWhenIdentical>
</banDuplicateClasses>
</rules>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,4 +252,42 @@
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.5.0</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.9.0</version>
</dependency>
</dependencies>
<configuration>
<rules>
<requireUpperBoundDeps/>
<banDuplicateClasses>
<scopes>
<scope>compile</scope>
<scope>provided</scope>
</scopes>
<findAllDuplicates>true</findAllDuplicates>
<ignoreWhenIdentical>true</ignoreWhenIdentical>
</banDuplicateClasses>
</rules>
</configuration>
<executions>
<execution>
<id>enforce-banned-duplicate-classes</id>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading