This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new b69f5d1df CAY-2742 Switch minimum required Java version to 11
b69f5d1df is described below
commit b69f5d1df253b05bf788204b838b21f8614de592
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Wed Jul 6 20:15:47 2022 +0300
CAY-2742 Switch minimum required Java version to 11
---
.travis.yml | 19 +++++++++----------
RELEASE-NOTES.txt | 1 +
UPGRADE.txt | 2 ++
pom.xml | 25 +++++++------------------
4 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 62f506114..7e4404557 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,6 @@ env:
- secure:
"cysyR/fEtBHC26lYHGhfXYIPMaol1c1wP+r59idByE4iq71QiOffA4j1CQCAnN5Zo7QsNavz/GZoIxNif4SUcY7sW5M92a78VFVK3aYGTOBtN9jpqWDJoFc8jm5C75j3CoBe7dVFkxw3pCdMlZQ7HJj7L+GiyZ5USu6E2vD5X7A="
jdk:
- - openjdk8
- openjdk11
- openjdk17
@@ -41,24 +40,24 @@ script:
- travis_wait 25 mvn verify -fae -q $EXCLUDE_MODULES
-DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR
jobs:
-# add hsql, h2 and derby databases to tests on openjdk8
-# To reduce the test time, add only postgress db on openjdk-ea
+# add hsql, h2 and derby databases to tests on JDK 11
+# To reduce the test time, add only postgres db on JDK 18
include:
- env: DB_PROFILE=hsql
- jdk: openjdk8
+ jdk: openjdk11
- env: DB_PROFILE=h2
- jdk: openjdk8
+ jdk: openjdk11
- env: DB_PROFILE=derby
- jdk: openjdk8
- - jdk: openjdk-ea
+ jdk: openjdk11
+ - jdk: openjdk-18
env: DB_PROFILE=postgres-tc
- stage: deploy
script: mvn deploy -DskipTests --settings .travis-mvn-settings.xml
- jdk: openjdk8
+ jdk: openjdk11
if: type = push AND branch = master AND repo = apache/cayenne
allow_failures:
- - jdk: openjdk-ea
+ - jdk: openjdk-18
# prevent Travis from unnecessary checks with pull request
exclude:
@@ -67,7 +66,7 @@ jobs:
- if: type = pull_request
jdk: openjdk17
- if: type = pull_request
- jdk: openjdk-ea
+ jdk: openjdk18
# prevent Travis from unneeded "mvn install" run
install: true
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 0d457db58..02ec6b044 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -16,6 +16,7 @@ Changes/New Features:
CAY-2378 Switch usage of SelectQuery to ObjectSelect internally
CAY-2737 Cayenne 4.3: cleanup deprecated code
CAY-2741 Cleanup TransactionDescriptor and deprecate
DefaultTransactionDescriptor
+CAY-2742 Switch minimum required Java version to 11
Bug Fixes:
diff --git a/UPGRADE.txt b/UPGRADE.txt
index c439d7ff8..66be321a1 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -9,6 +9,8 @@ UPGRADING TO 4.3.M1
* Per CAY-2737 All code deprecated in Cayenne 4.1 and 4.2 was removed, please
review your code before upgrading.
+* Per CAY-2742 Minimum required Java version for Apache Cayenne is 11
+
UPGRADING TO 4.2.M2
* Per CAY-2659 All batch translators (`InsertBatchTranslator`,
`UpdateBatchTranslator`, etc.) are updated to the new SQLBuilder utility.
diff --git a/pom.xml b/pom.xml
index 2dce686db..834ab9580 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,9 @@
<ant.version>1.10.11</ant.version>
<testcontainers.version>1.16.0</testcontainers.version>
+ <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@@ -772,8 +775,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
@@ -861,10 +862,8 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
- <!-- Java 8 is too strict about
Javadoc omissions -->
-
<doclint>${javadoc.doclint}</doclint>
<additionalOptions>${javadoc.additionalOptions}</additionalOptions>
- <source>1.8</source>
+ <source>11</source>
</configuration>
</plugin>
<plugin>
@@ -1077,7 +1076,7 @@
<configuration>
<skip>false</skip>
<sourceEncoding>utf-8</sourceEncoding>
-
<targetJdk>1.8</targetJdk>
+
<targetJdk>11</targetJdk>
<verbose>true</verbose>
<failOnViolation>false</failOnViolation>
<!-- TODO make it
'true' when we will be ready -->
@@ -1639,19 +1638,9 @@
</dependencies>
</profile>
<profile>
- <id>java8-disable-strict-javadoc</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <properties>
- <javadoc.doclint>none</javadoc.doclint>
- <javadoc.additionalOptions />
- </properties>
- </profile>
- <profile>
- <id>java9-javadoc-html5-no-modules</id>
+ <id>java11-javadoc-html5-no-modules</id>
<activation>
- <jdk>[9,14)</jdk>
+ <jdk>[11,14)</jdk>
</activation>
<properties>
<javadoc.additionalOptions>-html5
--no-module-directories</javadoc.additionalOptions>
