Skip to content

Commit

Permalink
Merge pull request #575 from vitruv-tools/java-17
Browse files Browse the repository at this point in the history
  • Loading branch information
@TomWerm
TomWerm authored Dec 9, 2022
2 parents 7abec11 + b6c2896 commit f1ef65c
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
View file
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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.framework.applications/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.framework.views/.classpath
View file
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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.framework.views/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.framework.vsum/.classpath
View file
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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.framework.vsum/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.testutils.vsum/.classpath
View file
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"/>
Expand Down
2 changes: 1 addition & 1 deletion bundles/tools.vitruv.testutils.vsum/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions releng/tools.vitruv.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/tools.vitruv.framework.views.tests/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tests/tools.vitruv.framework.views.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/tools.vitruv.framework.vsum.tests/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tests/tools.vitruv.framework.vsum.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit f1ef65c

Please sign in to comment.