Skip to content
This repository has been archived by the owner on Oct 18, 2023. It is now read-only.

Commit

Permalink
ci(java): run dependency test on Java 8 and 11 (#76)
Browse files Browse the repository at this point in the history
* ci(java): run dependency test on Java 8 and 11

Redo fix in #633 with proper jinja templating format

Source-Author: Jeff Ching <chingor@google.com>
Source-Date: Fri Jun 19 16:52:15 2020 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 4f2c9f752a94042472fc03c5bd9e06e89817d2bd
Source-Link: googleapis/synthtool@4f2c9f7

* remove unused profiles

Co-authored-by: yoshi-automation <yoshi-automation@google.com>
  • Loading branch information
stephaniewang526 and yoshi-automation committed Jul 7, 2020
1 parent 0c37cf3 commit 8ce50d0
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 53 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yaml
Expand Up @@ -36,11 +36,14 @@ jobs:
JOB_TYPE: test
dependencies:
runs-on: ubuntu-latest
strategy:
matrix:
java: [8, 11]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: 8
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/dependencies.sh
linkage-monitor:
Expand Down
4 changes: 3 additions & 1 deletion .kokoro/dependencies.sh
Expand Up @@ -41,8 +41,10 @@ echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
## Run dependency list completeness check
function completenessCheck() {
# Output dep list with compile scope generated using the original pom
# Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
# This is stripped from the output as it is not present in the flattened pom.
msg "Generating dependency list using original pom..."
mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt
mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | grep -v ':test$' >.org-list.txt

# Output dep list generated using the flattened pom (test scope deps are ommitted)
msg "Generating dependency list using flattened pom..."
Expand Down
15 changes: 0 additions & 15 deletions google-cloud-bigqueryconnection/pom.xml
Expand Up @@ -97,21 +97,6 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand Down
15 changes: 0 additions & 15 deletions grpc-google-cloud-bigqueryconnection-v1/pom.xml
Expand Up @@ -43,21 +43,6 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand Down
15 changes: 0 additions & 15 deletions grpc-google-cloud-bigqueryconnection-v1beta1/pom.xml
Expand Up @@ -43,21 +43,6 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand Down
12 changes: 6 additions & 6 deletions synth.metadata
Expand Up @@ -4,30 +4,30 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-bigqueryconnection.git",
"sha": "70cec5026dfa8f37a32b42ec4112d49e64f9f73b"
"sha": "75d63e4d69e181c8d389cec320dcb3f433ddaf05"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "163aa04ede887024d245ab2c6af2528d9460bb9c",
"internalRef": "317204502"
"sha": "79a17b8c64efa7bafff0a16b467754c73d570b6e",
"internalRef": "317385359"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "163aa04ede887024d245ab2c6af2528d9460bb9c",
"internalRef": "317204502"
"sha": "79a17b8c64efa7bafff0a16b467754c73d570b6e",
"internalRef": "317385359"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "c4f3059c27591eb24d6942a0e357ec94c80459f2"
"sha": "4f2c9f752a94042472fc03c5bd9e06e89817d2bd"
}
}
],
Expand Down

0 comments on commit 8ce50d0

Please sign in to comment.