Merge remote-tracking branch 'parent/pr/537' into asf-master
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index a1aa5da..e834040 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -29,9 +29,11 @@
CAY-2761 Modeler: Editor for the cgen templates
CAY-2767 Modeler: upgrade deprecated code in custom components
CAY-2773 Switch master to "5.0"
+CAY-2776 Upgrade Gradle to 7.6
Bug Fixes:
CAY-2755 Modeler: Entities are not sorted by name in the class generation view
CAY-2762 Modeler: Difference in toolbars colors on OSX
CAY-2765 dbimport: check excluded catalogs and schemas for the SQLServer
+CAY-2774 Overriding service ordering in DI List causes DIRuntimeException
diff --git a/cayenne-gradle-plugin/build.gradle b/cayenne-gradle-plugin/build.gradle
index 656c39c..8d8aee3 100644
--- a/cayenne-gradle-plugin/build.gradle
+++ b/cayenne-gradle-plugin/build.gradle
@@ -28,7 +28,7 @@
apply plugin: 'java'
-sourceCompatibility = 1.8
+sourceCompatibility = 11
repositories {
mavenLocal()
diff --git a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
index e1087ec..e82efb8 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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-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 d34d3ab..c9ea501 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 @@
// Old gradle versions will fail on new JDK
int javaMajorVersion = getJavaMajorVersion(System.getProperty("java.version"));
- if(javaMajorVersion >= 17) {
+ if(javaMajorVersion >= 19) {
+ versions = new String[]{"7.6"};
+ } else if(javaMajorVersion >= 17) {
versions = new String[]{"7.3"};
} else if(javaMajorVersion >= 16) {
versions = new String[]{"7.0"};
