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: 16 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,6 @@ jobs:
matrix:
package: ${{ fromJSON(needs.changes.outputs.packages) }}
steps:
- name: Get current week within the year
id: date
run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
Expand All @@ -264,8 +261,23 @@ jobs:
BUILD_SUBDIR: ${{matrix.package}}
JOB_TYPE: clirr
JOB_NAME: clirr-${{matrix.package}}
split-dependencies:
runs-on: ubuntu-latest
needs: changes
strategy:
matrix:
package: ${{ fromJSON(needs.changes.outputs.packages) }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
- run: .kokoro/dependencies.sh
env:
BUILD_SUBDIR: ${{matrix.package}}
required:
needs: [ changes, split-units, split-clirr ]
needs: [ changes, split-units, split-clirr, split-dependencies ]
name: conditional-required-check
if: ${{ always() }} # Always run even if any "needs" jobs fail
runs-on: ubuntu-22.04
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/google-auth-library-java-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,20 @@ jobs:
env:
JOB_TYPE: clirr
BUILD_SUBDIR: google-auth-library-java
dependencies:
needs: filter
if: ${{ needs.filter.outputs.library == 'true' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
- run: .kokoro/dependencies.sh

required:
needs: [ units-logging, clirr ]
needs: [ units-logging, clirr, dependencies ]
name: conditional-required-check
if: ${{ always() }} # Always run even if any "needs" jobs fail
runs-on: ubuntu-22.04
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/java-spanner-jdbc-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,12 @@ jobs:
needs: filter
if: ${{ needs.filter.outputs.library == 'true' }}
runs-on: ubuntu-latest
strategy:
matrix:
java: [17]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: ${{matrix.java}}
- run: java -version
java-version: 17
- run: .kokoro/dependencies.sh
javadoc:
needs: filter
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/java-storage-nio-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,12 @@ jobs:
needs: filter
if: ${{ needs.filter.outputs.library == 'true' }}
runs-on: ubuntu-latest
strategy:
matrix:
java: [17]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: ${{matrix.java}}
- run: java -version
java-version: 17
- run: .kokoro/dependencies.sh
javadoc:
needs: filter
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/sdk-platform-java-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,20 @@ jobs:
JOB_TYPE: clirr
BUILD_SUBDIR: sdk-platform-java

dependencies:
needs: filter
if: ${{ needs.filter.outputs.library == 'true' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
- run: .kokoro/dependencies.sh
env:
BUILD_SUBDIR: sdk-platform-java

sdk-platform-java-8:
needs: filter
if: ${{ needs.filter.outputs.library == 'true' }}
Expand Down
5 changes: 2 additions & 3 deletions .kokoro/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,8 @@ then
fi

# this should run maven enforcer
retry_with_backoff 3 10 \
mvn install -B -V -ntp \
-Pquick-build -DskipTests=true -Dmaven.javadoc.skip=true -Denforcer.skip=false
mvn install -B -V -ntp \
-Pquick-build -DskipTests=true -Dmaven.javadoc.skip=true -Denforcer.skip=false

mvn -B dependency:analyze -Pquick-build -DfailOnWarning=true -Dmdep.analyze.skip=false

Expand Down
18 changes: 10 additions & 8 deletions google-auth-library-java/cab-token-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
</properties>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
Expand All @@ -38,21 +42,19 @@
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>dev.cel</groupId>
<artifactId>cel</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.crypto.tink</groupId>
Expand Down
1 change: 1 addition & 0 deletions google-cloud-jar-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
</parent>
<properties>
<skipUnitTests>false</skipUnitTests>
<ignoreNonCompile>true</ignoreNonCompile><!-- maven-dependency-plugin:analyze to skip test scope dependencies -->
</properties>

<dependencyManagement>
Expand Down
10 changes: 7 additions & 3 deletions java-bigquery/google-cloud-bigquery-jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<github.global.server>github</github.global.server>
<site.installationModule>google-cloud-bigquery-jdbc
</site.installationModule>
<site.installationModule>google-cloud-bigquery-jdbc</site.installationModule>
</properties>

<build>
Expand Down Expand Up @@ -278,6 +277,11 @@
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
Expand Down Expand Up @@ -372,4 +376,4 @@
</properties>
</profile>
</profiles>
</project>
</project>
1 change: 1 addition & 0 deletions java-showcase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<checkstyle.skip>true</checkstyle.skip>
<clirr.skip>true</clirr.skip>
<enforcer.skip>true</enforcer.skip>
<mdep.analyze.skip>true</mdep.analyze.skip><!-- The showcase modules are not meant for library customers. -->
</properties>

<dependencyManagement>
Expand Down
27 changes: 16 additions & 11 deletions sdk-platform-java/api-common-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,11 @@
<version>${errorprone.version}</version>
<scope>compile</scope>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -81,8 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
Expand All @@ -92,11 +91,6 @@
<version>1.4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
<version>${j2objc-annotations.version}</version>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -129,6 +123,17 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<!-- They are declared to fix upper bound failures -->
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>com.google.errorprone:error_prone_annotations</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<slf4j.version>2.0.16</slf4j.version>
<!-- skipping clirr check for protobuf 4.x upgrade -->
<clirr.skip>true</clirr.skip>
<ignoreNonCompile>true</ignoreNonCompile><!-- maven-dependency-plugin:analyze to skip test scope dependencies -->
</properties>

<developers>
Expand Down
50 changes: 50 additions & 0 deletions sdk-platform-java/gapic-generator-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>com.google.errorprone:error_prone_annotations</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -487,5 +496,46 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>2.62.0</version><!-- {x-version-update:api-common:current} -->
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
<version>${google.http-client.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>2.70.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
</dependencies>
</project>
28 changes: 27 additions & 1 deletion sdk-platform-java/gax-java/gax-grpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,20 @@
<scope>test</scope>
<classifier>testlib</classifier>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -148,6 +162,18 @@
<!-- <test>!InstantiatingGrpcChannelProviderTest#testLogDirectPathMisconfig_AttemptDirectPathNotSetAndAttemptDirectPathXdsSetViaEnv_warns</test> -->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>io.grpc:grpc-netty-shaded</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>io.grpc:grpc-googleapis</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.slf4j:slf4j-api</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>io.grpc:grpc-s2a</ignoredUnusedDeclaredDependency>
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.

It seems is only used in tests, we should be able to remove it from here.

</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
Expand All @@ -166,4 +192,4 @@
</build>
</profile>
</profiles>
</project>
</project>
Loading
Loading