You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2021/11/19 08:13:37 UTC
[cayenne] 02/02: CAY-2711 JDK 17 compatibility - update to Gradle 7.3
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
commit a1a17f91f0f2e06bfc230ed393d82faa38105c19
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Fri Nov 19 11:13:25 2021 +0300
CAY-2711 JDK 17 compatibility
- update to Gradle 7.3
---
cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties | 2 +-
.../src/test/java/org/apache/cayenne/tools/GradlePluginIT.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
index ea9326a..e1087ec 100644
--- a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java
index 6555116..d34d3ab 100644
--- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java
+++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java
@@ -56,7 +56,9 @@ public class GradlePluginIT extends BaseTaskIT {
// Old gradle versions will fail on new JDK
int javaMajorVersion = getJavaMajorVersion(System.getProperty("java.version"));
- if(javaMajorVersion >= 16) {
+ if(javaMajorVersion >= 17) {
+ versions = new String[]{"7.3"};
+ } else if(javaMajorVersion >= 16) {
versions = new String[]{"7.0"};
} else if(javaMajorVersion >= 11) {
versions = new String[]{"4.8"};