Skip to content

Commit

Permalink
Require at least JDK 11 for the build (#1413)
Browse files Browse the repository at this point in the history
  • Loading branch information
Godin authored Mar 16, 2023
1 parent a68effb commit 4fca868
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ install:
curl -LsS "http://www.apache.org/dyn/closer.cgi?action=download&filename=maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip" > apache-maven-3.3.9-bin.zip &&
unzip apache-maven-3.3.9-bin.zip -d C:\Users\appveyor
)
- SET PATH=C:\Users\appveyor\apache-maven-3.3.9\bin;%PATH%
- SET JAVA_HOME=C:\Program Files\Java\jdk11
- SET PATH=C:\Users\appveyor\apache-maven-3.3.9\bin;%JAVA_HOME%;%PATH%

build_script:
# Maven 3.3.9 requires Java >= 7, but generation of Javadocs requires Java <= 6 (https://github.com/jacoco/jacoco/issues/110)
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
tar -xzf .maven/maven.tar.gz -C .maven --strip-components 1
displayName: Setup Maven
- bash: |
if [[ "$JDK_VERSION" -ge "8" ]]; then
if [[ "$JDK_VERSION" -ge "11" ]]; then
export JAVA_HOME=$PWD/.jdk
fi
if [[ "$BUILD_SOURCEBRANCH" == "refs/heads/master" && "$JDK_VERSION" == "5" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion org.jacoco.build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@
<configuration>
<rules>
<requireJavaVersion>
<version>1.8</version>
<version>11</version>
</requireJavaVersion>
<requireMavenVersion>
<!-- Maven 3.8.2 contains bug - see https://github.com/jacoco/jacoco/issues/1218 -->
Expand Down
2 changes: 1 addition & 1 deletion org.jacoco.doc/docroot/doc/build.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1>Build</h1>
The JaCoCo build is based on <a href="http://maven.apache.org/">Maven</a> and
can be locally executed on every machine with a proper
<a href="environment.html">environment setup</a>. In particular you need at
least <a href="http://maven.apache.org/">Maven 3.3.9</a> and JDK 8
least <a href="http://maven.apache.org/">Maven 3.3.9</a> and JDK 11
installations. Developers are encouraged to run the build before every commit
to ensure consistency of the source tree.
</p>
Expand Down
2 changes: 2 additions & 0 deletions org.jacoco.doc/docroot/doc/changes.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ <h3>Non-functional Changes</h3>
<li>JaCoCo now depends on ASM 9.4
(GitHub <a href="https://github.com/jacoco/jacoco/issues/1299">#1299</a>,
<a href="https://github.com/jacoco/jacoco/issues/1368">#1368</a>).</li>
<li>JaCoCo build now requires JDK 11
(GitHub <a href="https://github.com/jacoco/jacoco/issues/1413">#1413</a>).</li>
</ul>

<h2>Release 0.8.8 (2022/04/05)</h2>
Expand Down
2 changes: 1 addition & 1 deletion org.jacoco.doc/docroot/doc/environment.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3>Build</h3>

<p>
The JaCoCo build is based on <a href="http://maven.apache.org/">Maven</a>
and requires at least Maven 3.3.9 and JDK 8.
and requires at least Maven 3.3.9 and JDK 11.
See the <a href="build.html">build description</a> for details.
</p>

Expand Down

0 comments on commit 4fca868

Please sign in to comment.