Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to Eclipse 2022-12 and Java 17 #575

Merged
merged 3 commits into from
Dec 9, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>2.7.4</version>
<version>3.0.1</version>
</extension>
</extensions>
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.framework.applications/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
Original file line number Diff line number Diff line change
@@ -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,
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.framework.views/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
Original file line number Diff line number Diff line change
@@ -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,
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.framework.vsum/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.framework.vsum/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -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,
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.testutils.vsum/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="xtend-gen"/>
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.testutils.vsum/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -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,
8 changes: 4 additions & 4 deletions releng/tools.vitruv.parent/pom.xml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>parent</artifactId>
<version>2.0.2</version>
<version>2.1.1</version>
</parent>
<artifactId>framework-parent</artifactId>
<version>3.0.1-SNAPSHOT</version>
@@ -27,17 +27,17 @@
<repository>
<id>Demo Metamodels</id>
<layout>p2</layout>
<url>https://kit-sdq.github.io/updatesite/release/metamodels/demo/latest/</url>
<url>https://kit-sdq.github.io/updatesite/release/metamodels/demo/${sdq.demometamodels.version}</url>
</repository>
<repository>
<id>SDQ Commons</id>
<layout>p2</layout>
<url>https://kit-sdq.github.io/updatesite/release/commons/latest/</url>
<url>https://kit-sdq.github.io/updatesite/release/commons/${sdq.commons.version}</url>
</repository>
<repository>
<id>XAnnotations</id>
<layout>p2</layout>
<url>https://kit-sdq.github.io/updatesite/release/xannotations/latest/</url>
<url>https://kit-sdq.github.io/updatesite/release/xannotations/${sdq.xannotations.version}</url>
</repository>
</repositories>

2 changes: 1 addition & 1 deletion tests/tools.vitruv.framework.views.tests/.classpath
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="xtend-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
Original file line number Diff line number Diff line change
@@ -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,
2 changes: 1 addition & 1 deletion tests/tools.vitruv.framework.vsum.tests/.classpath
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
Original file line number Diff line number Diff line change
@@ -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,