Skip to content

Commit

Permalink
make java 11 as project base but keep javac release 8, we will be abl…
Browse files Browse the repository at this point in the history
…e to upgrade ecj and errorprone (#186)

* make java 11 as project base but keep javac release flag to 8, we will be able to upgrade ecj and errorprone

Signed-off-by: Olivier Lamy <[email protected]>
  • Loading branch information
olamy authored Feb 8, 2022
1 parent bc74ba0 commit 79199e4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ jobs:

build:
name: Build it
uses: codehaus-plexus/.github/.github/workflows/maven.yml@v0.0.1
uses: codehaus-plexus/.github/.github/workflows/maven.yml@master
with:
jdk-matrix: '["8", "11", "17"]'
jdk-distribution-matrix: '["zulu", "temurin"]'
jdk-fast-fail-build: '11'
jdk-matrix: '["11", "17"]'
jdk-distribution-matrix: '["zulu", "temurin", "microsoft", "liberica"]'
os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]'
maven_args: 'verify javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx'

14 changes: 10 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<connection>${scm.url}</connection>
<developerConnection>${scm.url}</developerConnection>
<url>http://github.com/codehaus-plexus/plexus-compiler/tree/${project.scm.tag}/</url>
<tag>master</tag>
</scm>
<issueManagement>
<system>github</system>
Expand All @@ -43,7 +42,7 @@

<properties>
<scm.url>scm:git:[email protected]:codehaus-plexus/plexus-compiler.git</scm.url>
<javaVersion>8</javaVersion>
<javaVersion>11</javaVersion>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<project.build.outputTimestamp>2021-10-18T08:22:06Z</project.build.outputTimestamp>
<jupiter.version>5.8.2</jupiter.version>
Expand Down Expand Up @@ -121,6 +120,13 @@
<redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>8</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand Down Expand Up @@ -192,8 +198,8 @@
<configuration>
<rules>
<requireJavaVersion>
<version>[1.8,)</version>
<message>[ERROR] OLD JDK [${java.version}] in use. This projects requires JDK 8 or newer</message>
<version>[11,)</version>
<message>[ERROR] OLD JDK [${java.version}] in use. This projects requires JDK 11 or newer</message>
</requireJavaVersion>
</rules>
</configuration>
Expand Down

0 comments on commit 79199e4

Please sign in to comment.