From dc5d4cdaf50915d677aa9c616a97ca612a50f85c Mon Sep 17 00:00:00 2001 From: Jan Wittler Date: Tue, 6 Dec 2022 15:43:24 +0100 Subject: [PATCH 1/3] update parent pom and tycho dependency --- .mvn/extensions.xml | 2 +- releng/tools.vitruv.parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index f0507af18e..727b460d19 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho tycho-build - 2.7.4 + 3.0.0 \ No newline at end of file diff --git a/releng/tools.vitruv.parent/pom.xml b/releng/tools.vitruv.parent/pom.xml index 748ad87c85..8132db3c42 100644 --- a/releng/tools.vitruv.parent/pom.xml +++ b/releng/tools.vitruv.parent/pom.xml @@ -6,7 +6,7 @@ tools.vitruv parent - 2.0.2 + 2.1.0 framework-parent 3.0.1-SNAPSHOT From f07e0ce09053bb4e74b3a7d1bfa0962d8827450c Mon Sep 17 00:00:00 2001 From: Jan Wittler Date: Tue, 6 Dec 2022 15:42:40 +0100 Subject: [PATCH 2/3] migrate classpath and manifests to Java 17 --- bundles/tools.vitruv.framework.applications/.classpath | 2 +- .../tools.vitruv.framework.applications/META-INF/MANIFEST.MF | 2 +- bundles/tools.vitruv.framework.views/.classpath | 2 +- bundles/tools.vitruv.framework.views/META-INF/MANIFEST.MF | 2 +- bundles/tools.vitruv.framework.vsum/.classpath | 2 +- bundles/tools.vitruv.framework.vsum/META-INF/MANIFEST.MF | 2 +- bundles/tools.vitruv.testutils.vsum/.classpath | 2 +- bundles/tools.vitruv.testutils.vsum/META-INF/MANIFEST.MF | 2 +- tests/tools.vitruv.framework.views.tests/.classpath | 2 +- tests/tools.vitruv.framework.views.tests/META-INF/MANIFEST.MF | 2 +- tests/tools.vitruv.framework.vsum.tests/.classpath | 2 +- tests/tools.vitruv.framework.vsum.tests/META-INF/MANIFEST.MF | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bundles/tools.vitruv.framework.applications/.classpath b/bundles/tools.vitruv.framework.applications/.classpath index c5b28acbae..ef548cb968 100644 --- a/bundles/tools.vitruv.framework.applications/.classpath +++ b/bundles/tools.vitruv.framework.applications/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/tools.vitruv.framework.applications/META-INF/MANIFEST.MF b/bundles/tools.vitruv.framework.applications/META-INF/MANIFEST.MF index b827f21288..ab5c0a4c41 100644 --- a/bundles/tools.vitruv.framework.applications/META-INF/MANIFEST.MF +++ b/bundles/tools.vitruv.framework.applications/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: vitruv.tools Bundle-SymbolicName: tools.vitruv.framework.applications;singleton:=true Automatic-Module-Name: tools.vitruv.framework.applications Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: tools.vitruv.change.propagation;visibility:=reexport, com.google.guava, org.apache.log4j, diff --git a/bundles/tools.vitruv.framework.views/.classpath b/bundles/tools.vitruv.framework.views/.classpath index c5b28acbae..ef548cb968 100644 --- a/bundles/tools.vitruv.framework.views/.classpath +++ b/bundles/tools.vitruv.framework.views/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/tools.vitruv.framework.views/META-INF/MANIFEST.MF b/bundles/tools.vitruv.framework.views/META-INF/MANIFEST.MF index 31f257dfcf..e96ea43e07 100644 --- a/bundles/tools.vitruv.framework.views/META-INF/MANIFEST.MF +++ b/bundles/tools.vitruv.framework.views/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Vitruv Framework Views Bundle-SymbolicName: tools.vitruv.framework.views;singleton:=true Automatic-Module-Name: tools.vitruv.framework.views Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.apache.log4j, tools.vitruv.change.composite, org.eclipse.emf.compare, diff --git a/bundles/tools.vitruv.framework.vsum/.classpath b/bundles/tools.vitruv.framework.vsum/.classpath index c5b28acbae..ef548cb968 100644 --- a/bundles/tools.vitruv.framework.vsum/.classpath +++ b/bundles/tools.vitruv.framework.vsum/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/tools.vitruv.framework.vsum/META-INF/MANIFEST.MF b/bundles/tools.vitruv.framework.vsum/META-INF/MANIFEST.MF index 1d8c5fbf16..4abb89d0e1 100644 --- a/bundles/tools.vitruv.framework.vsum/META-INF/MANIFEST.MF +++ b/bundles/tools.vitruv.framework.vsum/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Vitruv Framework Virtual Single Underlying Model Bundle-SymbolicName: tools.vitruv.framework.vsum;singleton:=true Automatic-Module-Name: tools.vitruv.framework.vsum Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.apache.log4j, tools.vitruv.change.composite;visibility:=reexport, tools.vitruv.framework.views;visibility:=reexport, diff --git a/bundles/tools.vitruv.testutils.vsum/.classpath b/bundles/tools.vitruv.testutils.vsum/.classpath index e769fecbe9..5b259b9051 100644 --- a/bundles/tools.vitruv.testutils.vsum/.classpath +++ b/bundles/tools.vitruv.testutils.vsum/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/tools.vitruv.testutils.vsum/META-INF/MANIFEST.MF b/bundles/tools.vitruv.testutils.vsum/META-INF/MANIFEST.MF index 6fd1979397..83ce564854 100644 --- a/bundles/tools.vitruv.testutils.vsum/META-INF/MANIFEST.MF +++ b/bundles/tools.vitruv.testutils.vsum/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: tools.vitruv.testutils.vsum Bundle-Version: 3.0.1.qualifier Bundle-Vendor: tools.vitruv Automatic-Module-Name: tools.vitruv.testutils.vsum -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, diff --git a/tests/tools.vitruv.framework.views.tests/.classpath b/tests/tools.vitruv.framework.views.tests/.classpath index 15965baf00..c348871474 100644 --- a/tests/tools.vitruv.framework.views.tests/.classpath +++ b/tests/tools.vitruv.framework.views.tests/.classpath @@ -2,7 +2,7 @@ - + diff --git a/tests/tools.vitruv.framework.views.tests/META-INF/MANIFEST.MF b/tests/tools.vitruv.framework.views.tests/META-INF/MANIFEST.MF index ad6232a7ff..65fe88bae5 100644 --- a/tests/tools.vitruv.framework.views.tests/META-INF/MANIFEST.MF +++ b/tests/tools.vitruv.framework.views.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Vitruv Framwork Views Tests Bundle-SymbolicName: tools.vitruv.framework.views.tests;singleton:=true Automatic-Module-Name: tools.vitruv.framework.views.tests Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Fragment-Host: tools.vitruv.framework.views Require-Bundle: org.apache.log4j, tools.vitruv.testutils.vsum, diff --git a/tests/tools.vitruv.framework.vsum.tests/.classpath b/tests/tools.vitruv.framework.vsum.tests/.classpath index 43503a10b8..2d43d32ef7 100644 --- a/tests/tools.vitruv.framework.vsum.tests/.classpath +++ b/tests/tools.vitruv.framework.vsum.tests/.classpath @@ -6,7 +6,7 @@ - + diff --git a/tests/tools.vitruv.framework.vsum.tests/META-INF/MANIFEST.MF b/tests/tools.vitruv.framework.vsum.tests/META-INF/MANIFEST.MF index 6d8ac91774..3112d93abc 100644 --- a/tests/tools.vitruv.framework.vsum.tests/META-INF/MANIFEST.MF +++ b/tests/tools.vitruv.framework.vsum.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Vitruv Framwork Virtual Single Underlying Model Tests Bundle-SymbolicName: tools.vitruv.framework.vsum.tests;singleton:=true Automatic-Module-Name: tools.vitruv.framework.vsum.tests Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Fragment-Host: tools.vitruv.framework.vsum Require-Bundle: org.apache.log4j, tools.vitruv.testutils.vsum, From b6c289653bae812eea4aabea4aaba43d939a56db Mon Sep 17 00:00:00 2001 From: Jan Wittler Date: Thu, 8 Dec 2022 14:28:41 +0100 Subject: [PATCH 3/3] update parent pom pin sdq repository versions --- .mvn/extensions.xml | 2 +- releng/tools.vitruv.parent/pom.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 727b460d19..f5bf8ddd25 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho tycho-build - 3.0.0 + 3.0.1 \ No newline at end of file diff --git a/releng/tools.vitruv.parent/pom.xml b/releng/tools.vitruv.parent/pom.xml index 8132db3c42..2260e6cf89 100644 --- a/releng/tools.vitruv.parent/pom.xml +++ b/releng/tools.vitruv.parent/pom.xml @@ -6,7 +6,7 @@ tools.vitruv parent - 2.1.0 + 2.1.1 framework-parent 3.0.1-SNAPSHOT @@ -27,17 +27,17 @@ Demo Metamodels p2 - https://kit-sdq.github.io/updatesite/release/metamodels/demo/latest/ + https://kit-sdq.github.io/updatesite/release/metamodels/demo/${sdq.demometamodels.version} SDQ Commons p2 - https://kit-sdq.github.io/updatesite/release/commons/latest/ + https://kit-sdq.github.io/updatesite/release/commons/${sdq.commons.version} XAnnotations p2 - https://kit-sdq.github.io/updatesite/release/xannotations/latest/ + https://kit-sdq.github.io/updatesite/release/xannotations/${sdq.xannotations.version}