Skip to content

Commit

Permalink
Run CI with java 17 (#1656)
Browse files Browse the repository at this point in the history
* Run CI with java 17

* Bump surefire version

* Allow tests to donwload anything extra not covered by 'Resolving Dependencies'
  • Loading branch information
velo committed Jun 28, 2022
1 parent bc54d21 commit a820b83
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ commands:
- run:
name: 'Resolving Dependencies'
command: |
mvn dependency:resolve-plugins go-offline:resolve-dependencies -DskipTests=true
mvn dependency:resolve-plugins go-offline:resolve-dependencies -DskipTests=true -B
verify-formatting:
steps:
- run:
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
- run:
name: 'Test'
command: |
mvn -o test
mvn -B test
- verify-formatting
android-test:
# These next lines define the Android machine image executor: https://circleci.com/docs/2.0/executor-types/
Expand Down Expand Up @@ -191,8 +191,8 @@ workflows:
filters:
<<: *all-branches
- test:
jdk: '14-buster'
name: 'jdk 14'
jdk: '17-buster'
name: 'jdk 17'
filters:
<<: *all-branches
- test:
Expand All @@ -212,8 +212,8 @@ workflows:
filters:
<<: *master-only
- test:
jdk: '14-buster'
name: 'jdk 14'
jdk: '17-buster'
name: 'jdk 17'
filters:
<<: *master-only
- deploy:
Expand All @@ -222,7 +222,7 @@ workflows:
requires:
- 'jdk 8'
- 'jdk 11'
- 'jdk 14'
- 'jdk 17'
context: Sonatype
filters:
<<: *master-only
Expand Down
2 changes: 1 addition & 1 deletion apt-test-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
</activation>

<properties>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
<jvm.options>--add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</jvm.options>
</properties>
</profile>
Expand Down

0 comments on commit a820b83

Please sign in to comment.