Skip to content

Commit

Permalink
Updates Java to v21
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxkratz
maxkratz committed Oct 7, 2024
1 parent c2abeaa commit c564d8c
Show file tree
Hide file tree
Showing 10 changed files with 68 additions and 48 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '17'
java-version: '21'
- name: Install dependencies
run: sudo apt-get install -yq grep coreutils wget curl
- name: Check out repository code
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '17'
java-version: '21'
- name: Download JAR file
uses: actions/download-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion org.emoflon.ibex.ci.helloworld.gt/.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="src-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
9 changes: 9 additions & 0 deletions org.emoflon.ibex.ci.helloworld.gt/.settings/org.eclipse.jdt.core.prefs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
org.eclipse.jdt.core.compiler.compliance=21
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=21
43 changes: 22 additions & 21 deletions org.emoflon.ibex.ci.helloworld.gt/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
Manifest-Version: 1.0
Automatic-Module-Name: org.emoflon.ibex.ci.helloworld.gt
Bundle-ManifestVersion: 2
Bundle-Name: org.emoflon.ibex.ci.helloworld.gt
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.emoflon.ibex.ci.helloworld.gt; singleton:=tru
e
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.log4j,org.apache.commons.logging
Bundle-RequiredExecutionEnvironment: JavaSE-16
Export-Package: org.emoflon.ibex.ci.helloworld.gt,
org.emoflon.ibex.ci.helloworld.gt.api,
org.emoflon.ibex.ci.helloworld.gt.api.matches,
org.emoflon.ibex.ci.helloworld.gt.api.rules
Require-Bundle: org.emoflon.ibex.ci.helloworld;bundle-version="0.0.1",
org.emoflon.ibex.gt;bundle-version="1.0.0",
org.emoflon.ibex.gt.hipe;bundle-version="1.0.0",
org.emoflon.ibex.gt.democles;bundle-version="1.0.0",
org.emoflon.ibex.common,
org.emoflon.ibex.patternmodel
Manifest-Version: 1.0
Automatic-Module-Name: org.emoflon.ibex.ci.helloworld.gt
Bundle-ManifestVersion: 2
Bundle-Name: org.emoflon.ibex.ci.helloworld.gt
Bundle-Vendor: My Company
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: org.emoflon.ibex.ci.helloworld.gt; singleton:=true
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.log4j,
org.apache.commons.logging
Bundle-RequiredExecutionEnvironment: JavaSE-21
Export-Package: org.emoflon.ibex.ci.helloworld.gt,
org.emoflon.ibex.ci.helloworld.gt.api,
org.emoflon.ibex.ci.helloworld.gt.api.matches,
org.emoflon.ibex.ci.helloworld.gt.api.rules
Require-Bundle: org.emoflon.ibex.ci.helloworld;bundle-version="0.0.1",
org.emoflon.ibex.gt;bundle-version="1.0.0",
org.emoflon.ibex.gt.hipe;bundle-version="1.0.0",
org.emoflon.ibex.gt.democles;bundle-version="1.0.0",
org.emoflon.ibex.common,
org.emoflon.ibex.patternmodel

4 changes: 2 additions & 2 deletions org.emoflon.ibex.ci.helloworld.tests/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<classpathentry exported="true" kind="lib" path="lib/html-report-generator/lombok-1.18.12.jar"/>
<classpathentry exported="true" kind="lib" path="lib/html-report-generator/reactive-streams-1.0.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/html-report-generator/rxjava-3.0.4.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
</classpath>
6 changes: 3 additions & 3 deletions org.emoflon.ibex.ci.helloworld.tests/.settings/org.eclipse.jdt.core.prefs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=16
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=16
org.eclipse.jdt.core.compiler.compliance=21
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand All @@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=16
org.eclipse.jdt.core.compiler.source=21
2 changes: 1 addition & 1 deletion org.emoflon.ibex.ci.helloworld.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Tests
Bundle-SymbolicName: org.emoflon.ibex.ci.helloworld.tests;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-16
Bundle-RequiredExecutionEnvironment: JavaSE-21
Automatic-Module-Name: org.emoflon.ibex.ci.helloworld.tests
Require-Bundle: org.emoflon.ibex.ci.helloworld,
org.emoflon.ibex.patternmodel,
Expand Down
2 changes: 1 addition & 1 deletion org.emoflon.ibex.ci.helloworld/.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="gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
9 changes: 9 additions & 0 deletions org.emoflon.ibex.ci.helloworld/.settings/org.eclipse.jdt.core.prefs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
org.eclipse.jdt.core.compiler.compliance=21
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=21
35 changes: 18 additions & 17 deletions org.emoflon.ibex.ci.helloworld/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.emoflon.ibex.ci.helloworld;singleton:=true
Bundle-Version: 0.0.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-16
Automatic-Module-Name: org.emoflon.ibex.ci.helloworld
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi,
org.emoflon.smartemf
Export-Package: helloworld,
helloworld.impl
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.emoflon.ibex.ci.helloworld;singleton:=true
Bundle-Version: 0.0.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-21
Automatic-Module-Name: org.emoflon.ibex.ci.helloworld
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi,
org.emoflon.smartemf
Export-Package: helloworld,
helloworld.impl

0 comments on commit c564d8c

Please sign in to comment.