This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/1.22 by this push:
new 90383a8e3d OAK-10876: Oak 1.22 does not compile with JDK 11 anymore -
remove animal sniffer plugin, require JDK 11+ for compilation, target JRE 8
(#1523)
90383a8e3d is described below
commit 90383a8e3d29b2b573dfa0aca133f0b80bc45495
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Thu Jun 13 21:56:27 2024 +0200
OAK-10876: Oak 1.22 does not compile with JDK 11 anymore - remove animal
sniffer plugin, require JDK 11+ for compilation, target JRE 8 (#1523)
* OAK-10876: Oak 1.22 does not compile with JDK 11 anymore - remove animal
sniffer plugin, require JDK 11+ for compilation, target JRE 8
* OAK-10876: bump minimalBuildVersion to 11
* OAK-10876: adjust README
---
README.md | 6 ++++--
oak-parent/pom.xml | 40 +++++++++-------------------------------
2 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/README.md b/README.md
index df3a98d0fe..bd511ecdd0 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,12 @@ Getting Started
---------------
To get started with Oak, build the latest sources with
-Maven 3 and Java 8 (or higher) like this:
+Maven 3 and Java 11 (or higher) like this:
mvn clean install
+Note that build *target* is still Java 8.
+
To enable all integration tests, including the JCR TCK, use:
mvn clean install -PintegrationTesting
@@ -62,7 +64,7 @@ The build consists of the following main components:
- oak-segment-tar - TarMK API and implementation
- oak-upgrade - tooling for upgrading Jackrabbit repositories to Oak
- oak-it - integration tests
- - oak-it/osgi - integration tests for OSGi
+ - oak-it/osgi - integration tests for OSGi
- [oak-exercise][2] - Oak training material
[1]: oak-core/README.md
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index 6c198827d1..a3fbb8d6d1 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -71,12 +71,15 @@
<jackson.version>2.16.2</jackson.version>
<testcontainers.version>1.19.0</testcontainers.version>
<groovy.version>2.5.23</groovy.version>
- <java.version>1.8</java.version>
- <java.version.signature>java18</java.version.signature>
-
- <!-- specifies on which fixture to run the integration testing tests.
- override in profiles or provide from command line to change behaviour.
Provide
- more fixtures space separated. See
org.apache.jackrabbit.oak.jcr.FixturesHelper#AVAILABLE_FIXTURES
+ <!-- determines the bytecode version (i.e. the minimum JRE required to run
the build artifact) -->
+ <javaTargetVersion>8</javaTargetVersion>
+ <maven.compiler.release>${javaTargetVersion}</maven.compiler.release>
+ <maven.compiler.target>${javaTargetVersion}</maven.compiler.target>
+ <minimalJavaBuildVersion>11</minimalJavaBuildVersion>
+
+ <!-- specifies on which fixture to run the integration testing tests.
+ override in profiles or provide from command line to change behaviour.
Provide
+ more fixtures space separated. See
org.apache.jackrabbit.oak.jcr.FixturesHelper#AVAILABLE_FIXTURES
for the possible values: SEGMENT_MK SEGMENT_TAR SEGMENT_AZURE
DOCUMENT_NS DOCUMENT_RDB -->
<fixtures>SEGMENT_TAR</fixtures>
@@ -111,18 +114,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>
@@ -462,19 +453,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>
