Skip to content

Commit 144e537

Browse files
tcornerstonetcornerstone
committed
Merge remote-tracking branch 'github/master'
2 parents 11ef931 + d758c4e commit 144e537

File tree

38 files changed

+79
-497
lines changed

38 files changed

+79
-497
lines changed

‎.github/workflows/maven-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
jobs:
1616
build:
1717

18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-24.04
1919

2020
steps:
2121
- uses: actions/checkout@v4

‎.github/workflows/maven.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
jobs:
1616
build:
1717

18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-24.04
1919

2020
steps:
2121
- uses: actions/checkout@v4

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.ser
88
Thumbs.db
99
*.swp
10+
*.xml_gen
1011

1112
**/src/gen
1213
**/target/*

‎com.wamas.ide.launching.feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="com.wamas.ide.launching.feature"
44
label="Launch Configuration DSL"
5-
version="0.7.0.qualifier"
5+
version="0.8.0.qualifier"
66
provider-name="SSI Schaefer IT Solutions GmbH">
77

88
<description>

‎com.wamas.ide.launching.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>com.wamas.ide.launching-parent</artifactId>
77
<groupId>com.wamas.ide.launching</groupId>
8-
<version>0.7.0-SNAPSHOT</version>
8+
<version>0.8.0-SNAPSHOT</version>
99
</parent>
1010
<artifactId>com.wamas.ide.launching.feature</artifactId>
1111
<packaging>eclipse-feature</packaging>

‎com.wamas.ide.launching.ide/.classpath

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
4+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
35
<classpathentry kind="src" path="src"/>
46
<classpathentry kind="src" path="src-gen"/>
57
<classpathentry kind="src" path="xtend-gen"/>
6-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
7-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
88
<classpathentry kind="output" path="bin"/>
99
</classpath>

‎com.wamas.ide.launching.ide/.settings/org.eclipse.jdt.core.prefs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
4-
org.eclipse.jdt.core.compiler.compliance=11
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4+
org.eclipse.jdt.core.compiler.compliance=17
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
6+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
67
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=11
8+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
9+
org.eclipse.jdt.core.compiler.release=enabled
10+
org.eclipse.jdt.core.compiler.source=17

‎com.wamas.ide.launching.ide/META-INF/MANIFEST.MF

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: LcDsl IDE Support
44
Bundle-Vendor: SSI Schaefer IT Solutions GmbH
5-
Bundle-Version: 0.7.0.qualifier
5+
Bundle-Version: 0.8.0.qualifier
66
Bundle-SymbolicName: com.wamas.ide.launching.ide; singleton:=true
77
Bundle-ActivationPolicy: lazy
88
Require-Bundle: com.wamas.ide.launching,
99
org.eclipse.xtext.ide,
1010
org.eclipse.xtext.xbase.ide,
1111
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
12-
Bundle-RequiredExecutionEnvironment: JavaSE-11
12+
Bundle-RequiredExecutionEnvironment: JavaSE-17
1313
Export-Package: com.wamas.ide.launching.ide.contentassist.antlr,
1414
com.wamas.ide.launching.ide.contentassist.antlr.internal
1515
Automatic-Module-Name: com.wamas.ide.launching.ide

‎com.wamas.ide.launching.ide/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>com.wamas.ide.launching-parent</artifactId>
77
<groupId>com.wamas.ide.launching</groupId>
8-
<version>0.7.0-SNAPSHOT</version>
8+
<version>0.8.0-SNAPSHOT</version>
99
</parent>
1010
<artifactId>com.wamas.ide.launching.ide</artifactId>
1111
<packaging>eclipse-plugin</packaging>

‎com.wamas.ide.launching.ide/src/main/java/com/wamas/ide/launching/ide/LcDslIdeModule.xtend

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*
2-
* generated by Xtext 2.12.0
2+
* generated by Xtext 2.36.0
33
*/
44
package com.wamas.ide.launching.ide
55

6+
67
/**
78
* Use this class to register ide components.
89
*/

‎com.wamas.ide.launching.ide/src/main/java/com/wamas/ide/launching/ide/LcDslIdeSetup.xtend

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.12.0
2+
* generated by Xtext 2.36.0
33
*/
44
package com.wamas.ide.launching.ide
55

‎com.wamas.ide.launching.ui/.classpath

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
4+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
35
<classpathentry kind="src" path="src"/>
46
<classpathentry kind="src" path="src-gen"/>
57
<classpathentry kind="src" path="xtend-gen"/>
6-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
7-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
88
<classpathentry kind="output" path="bin"/>
99
</classpath>

‎com.wamas.ide.launching.ui/.settings/org.eclipse.jdt.core.prefs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
4-
org.eclipse.jdt.core.compiler.compliance=11
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4+
org.eclipse.jdt.core.compiler.compliance=17
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
7+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
78
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
8-
org.eclipse.jdt.core.compiler.source=11
9+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
10+
org.eclipse.jdt.core.compiler.release=enabled
11+
org.eclipse.jdt.core.compiler.source=17

‎com.wamas.ide.launching.ui/META-INF/MANIFEST.MF

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: LcDsl IDE UI
44
Bundle-Vendor: SSI Schaefer IT Solutions GmbH
5-
Bundle-Version: 0.7.0.qualifier
5+
Bundle-Version: 0.8.0.qualifier
66
Bundle-SymbolicName: com.wamas.ide.launching.ui; singleton:=true
77
Bundle-ActivationPolicy: lazy
88
Require-Bundle: com.wamas.ide.launching,
@@ -27,7 +27,7 @@ Require-Bundle: com.wamas.ide.launching,
2727
org.eclipse.core.variables,
2828
org.eclipse.pde.ui
2929
Import-Package: org.apache.log4j
30-
Bundle-RequiredExecutionEnvironment: JavaSE-11
30+
Bundle-RequiredExecutionEnvironment: JavaSE-17
3131
Export-Package: com.wamas.ide.launching.ui,
3232
com.wamas.ide.launching.ui.contentassist,
3333
com.wamas.ide.launching.ui.internal,

‎com.wamas.ide.launching.ui/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ bin.includes = .,\
77
icons/,\
88
OSGI-INF/
99
javacDefaultEncoding.. = UTF-8
10-
output.. = bin/
10+
output.. = target/classes

0 commit comments

Comments
 (0)