From 68bd3ff31d6e69202a0c2de1bb2bd575ddfd3529 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Thu, 29 Jun 2023 16:08:54 +0200
Subject: [PATCH] Update Groovy to version 2.5.22 for compatibility with Java 9
and newer
---
build.gradle | 2 +-
de.bmotionstudio.gef.editor/.classpath | 8 +-------
de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF | 8 +-------
3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/build.gradle b/build.gradle
index 5867a7d8..a733a62f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,7 +57,7 @@ project(":de.bmotionstudio.gef.editor") {
// hardcode a specific MXParser version here.
// It *should* be safe to update this when a new version is released.
implementation group: "io.github.x-stream", name: "mxparser", version: "1.2.2"
- implementation group: "org.codehaus.groovy", name: "groovy", version: "2.0.5"
+ implementation group: "org.codehaus.groovy", name: "groovy", version: "2.5.22"
}
}
diff --git a/de.bmotionstudio.gef.editor/.classpath b/de.bmotionstudio.gef.editor/.classpath
index 03868966..ca96913a 100644
--- a/de.bmotionstudio.gef.editor/.classpath
+++ b/de.bmotionstudio.gef.editor/.classpath
@@ -4,13 +4,7 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/antlr-2.7.7.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/asm-4.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/asm-analysis-4.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/asm-commons-4.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/asm-tree-4.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/asm-util-4.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/groovy-2.0.5.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/groovy-2.5.22.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/mxparser-1.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/xmlpull-1.1.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/xstream-1.4.20.jar"/>
diff --git a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
index b9c85784..4c0989e0 100644
--- a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
+++ b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
@@ -149,13 +149,7 @@ Export-Package: de.bmotionstudio.gef.editor;
org.eclipse.swt.widgets,
de.bmotionstudio.gef.editor"
Bundle-ClassPath: .,
- lib/dependencies/antlr-2.7.7.jar,
- lib/dependencies/asm-4.0.jar,
- lib/dependencies/asm-analysis-4.0.jar,
- lib/dependencies/asm-commons-4.0.jar,
- lib/dependencies/asm-tree-4.0.jar,
- lib/dependencies/asm-util-4.0.jar,
- lib/dependencies/groovy-2.0.5.jar,
+ lib/dependencies/groovy-2.5.22.jar,
lib/dependencies/mxparser-1.2.2.jar,
lib/dependencies/xmlpull-1.1.3.1.jar,
lib/dependencies/xstream-1.4.20.jar
--
GitLab