You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2023/01/27 17:13:01 UTC
[jackrabbit-oak] branch trunk updated: OAK-10001: Bump up minimal Java version to 11 (#823)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new caf43a19c5 OAK-10001: Bump up minimal Java version to 11 (#823)
caf43a19c5 is described below
commit caf43a19c505bb02afa237153c55d68c2630817f
Author: Julian Reschke <re...@apache.org>
AuthorDate: Fri Jan 27 18:12:55 2023 +0100
OAK-10001: Bump up minimal Java version to 11 (#823)
---
RELEASE-NOTES.txt | 2 +-
oak-doc/src/site/markdown/roadmap.md | 1 +
oak-parent/pom.xml | 33 +++++----------------------------
3 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e7c69dae46..96d2229af7 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -13,7 +13,7 @@ releases. This release is considered stable and targeted for
production use.
While Oak 1.48.0 compiles and tests successfully on Java 17, Javadocs
-generation fails on Java 17 (but works as expected on Java 8).
+generation fails on Java 17 (but works as expected on Java 11).
The Oak effort is a part of the Apache Jackrabbit project.
Apache Jackrabbit is a project of the Apache Software Foundation.
diff --git a/oak-doc/src/site/markdown/roadmap.md b/oak-doc/src/site/markdown/roadmap.md
index baaf9de665..2bf95ff923 100644
--- a/oak-doc/src/site/markdown/roadmap.md
+++ b/oak-doc/src/site/markdown/roadmap.md
@@ -25,6 +25,7 @@ releases directly from [trunk](https://github.com/apache/jackrabbit-oak/tree/tru
* [download](https://jackrabbit.apache.org/jcr/downloads.html#latest)
+Starting with 1.48.0, these require Java 11.
Maintenance branches
--------------------
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index 77c233e71b..a3b734e363 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -35,7 +35,6 @@
<properties>
<minimalMavenBuildVersion>3.3.9</minimalMavenBuildVersion><!-- evaluated by ASF parent -->
- <maven.compiler.target>${java.version}</maven.compiler.target><!-- evaluated by m-compiler-p and m-javadoc-p -->
<test.opts.memory>-Xmx512m</test.opts.memory>
<test.opts>${test.opts.coverage} ${test.opts.memory} -XX:+HeapDumpOnOutOfMemoryError -Dupdate.limit=100 -Djava.awt.headless=true</test.opts>
<skip.deployment>false</skip.deployment>
@@ -69,8 +68,11 @@
<testcontainers.version>1.17.5</testcontainers.version>
<pax-exam.version>4.13.1</pax-exam.version>
<groovy.version>2.5.20</groovy.version>
- <java.version>1.8</java.version>
- <java.version.signature>java18</java.version.signature>
+
+ <java.version>11</java.version>
+ <maven.compiler.release>${java.version}</maven.compiler.release>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
+ <minimalJavaBuildVersion>${java.version}</minimalJavaBuildVersion>
<!-- specifies on which fixture to run the integration testing tests.
override in profiles or provide from command line to change behaviour. Provide
@@ -118,18 +120,6 @@
</compilerArgs>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.22</version>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>${java.version.signature}</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -476,19 +466,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>animal-sniffer</id>
- <phase>compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>