Tools/RDL-Editor
8
0
Fork 0
mirror of https://github.com/Minres/RDL-Editor.git synced 2024-12-22 07:28:02 +01:00
Code Issues 1 Packages Releases Wiki Activity

Merge branch 'release/1.4.1' into develop

Browse Source
This commit is contained in:
Eyck Jentzsch 2023-01-05 16:18:00 +01:00
commit 97a40bc169
25 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modulefile
View File

@ -13,11 +13,11 @@ proc ModulesHelp { } {
# puts stderr "Don't forget to execute 'scl enable devtoolset-7 bash'" # puts stderr "Don't forget to execute 'scl enable devtoolset-7 bash'"
#} #}
if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt/] != 1} { if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidates/java/17.0.2-open/] != 1} {
puts stderr "Please install java via 'sdk install java 11.0.9.hs-adpt'!" puts stderr "Please install java via 'sdk install java 17.0.2-open'!"
prereq java/11.0.9 prereq java/17.0.2
} else { } else {
prepend-path PATH $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt/bin prepend-path PATH $::env(HOME)/.sdkman/candidates/java/17.0.2-open/bin
} }
setenv PROJECT RDL-Editor setenv PROJECT RDL-Editor

2
com.minres.rdl.parent/com.minres.rdl.feature/feature.xml
View File

@ -2,7 +2,7 @@
<feature <feature
id="com.minres.rdl.feature" id="com.minres.rdl.feature"
label="RDL Feature " label="RDL Feature "
version="1.4.0" version="1.4.1"
provider-name="MINRES Technologies GmbH"> provider-name="MINRES Technologies GmbH">
<plugin <plugin

2
com.minres.rdl.parent/com.minres.rdl.feature/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl.feature</artifactId> <artifactId>com.minres.rdl.feature</artifactId>
<packaging>eclipse-feature</packaging> <packaging>eclipse-feature</packaging>

2
com.minres.rdl.parent/com.minres.rdl.ide/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.ide
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: com.minres.rdl.ide Bundle-Name: com.minres.rdl.ide
Bundle-Vendor: My Company Bundle-Vendor: My Company
Bundle-Version: 1.4.0 Bundle-Version: 1.4.1
Bundle-SymbolicName: com.minres.rdl.ide; singleton:=true Bundle-SymbolicName: com.minres.rdl.ide; singleton:=true
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Require-Bundle: com.minres.rdl, Require-Bundle: com.minres.rdl,

2
com.minres.rdl.parent/com.minres.rdl.ide/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl.ide</artifactId> <artifactId>com.minres.rdl.ide</artifactId>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>

2
com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml
View File

@ -2,7 +2,7 @@
<feature <feature
id="com.minres.rdl.platform.feature" id="com.minres.rdl.platform.feature"
label="Xtext Platform Feature" label="Xtext Platform Feature"
version="1.4.0" version="1.4.1"
provider-name="MINRES Technologies GmbH"> provider-name="MINRES Technologies GmbH">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">

2
com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl.platform.feature</artifactId> <artifactId>com.minres.rdl.platform.feature</artifactId>
<packaging>eclipse-feature</packaging> <packaging>eclipse-feature</packaging>

2
com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml
View File

@ -2,7 +2,7 @@
<feature <feature
id="com.minres.rdl.product.feature" id="com.minres.rdl.product.feature"
label="RDL Feature " label="RDL Feature "
version="1.4.0" version="1.4.1"
provider-name="MINRES Technologies GmbH"> provider-name="MINRES Technologies GmbH">
<requires> <requires>

2
com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl.product.feature</artifactId> <artifactId>com.minres.rdl.product.feature</artifactId>
<packaging>eclipse-feature</packaging> <packaging>eclipse-feature</packaging>

2
com.minres.rdl.parent/com.minres.rdl.product.releng/pom.xml
View File

@ -7,7 +7,7 @@
<name>RDL Editor</name> <name>RDL Editor</name>
<parent> <parent>
<version>1.4.0</version> <version>1.4.1</version>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
</parent> </parent>

2
com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: RDL Editor Bundle-Name: RDL Editor
Bundle-SymbolicName: com.minres.rdl.product;singleton:=true Bundle-SymbolicName: com.minres.rdl.product;singleton:=true
Bundle-Version: 1.4.0 Bundle-Version: 1.4.1
Bundle-Vendor: MINRES Technologies GmbH Bundle-Vendor: MINRES Technologies GmbH
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0"

2
com.minres.rdl.parent/com.minres.rdl.product/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl.product</artifactId> <artifactId>com.minres.rdl.product</artifactId>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>

2
com.minres.rdl.parent/com.minres.rdl.repository/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl.repository</artifactId> <artifactId>com.minres.rdl.repository</artifactId>
<packaging>eclipse-repository</packaging> <packaging>eclipse-repository</packaging>

2
com.minres.rdl.parent/com.minres.rdl.standalone/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl.standalone</artifactId> <artifactId>com.minres.rdl.standalone</artifactId>

2
com.minres.rdl.parent/com.minres.rdl.target/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl.target</artifactId> <artifactId>com.minres.rdl.target</artifactId>
<packaging>eclipse-target-definition</packaging> <packaging>eclipse-target-definition</packaging>

2
com.minres.rdl.parent/com.minres.rdl.tests/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.tests
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: com.minres.rdl.tests Bundle-Name: com.minres.rdl.tests
Bundle-Vendor: My Company Bundle-Vendor: My Company
Bundle-Version: 1.4.0 Bundle-Version: 1.4.1
Bundle-SymbolicName: com.minres.rdl.tests; singleton:=true Bundle-SymbolicName: com.minres.rdl.tests; singleton:=true
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Require-Bundle: com.minres.rdl, Require-Bundle: com.minres.rdl,

2
com.minres.rdl.parent/com.minres.rdl.tests/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl.tests</artifactId> <artifactId>com.minres.rdl.tests</artifactId>
<packaging>eclipse-test-plugin</packaging> <packaging>eclipse-test-plugin</packaging>

2
com.minres.rdl.parent/com.minres.rdl.ui.tests/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.ui.tests
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: com.minres.rdl.ui.tests Bundle-Name: com.minres.rdl.ui.tests
Bundle-Vendor: My Company Bundle-Vendor: My Company
Bundle-Version: 1.4.0 Bundle-Version: 1.4.1
Bundle-SymbolicName: com.minres.rdl.ui.tests; singleton:=true Bundle-SymbolicName: com.minres.rdl.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Require-Bundle: com.minres.rdl.ui, Require-Bundle: com.minres.rdl.ui,

2
com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl.ui.tests</artifactId> <artifactId>com.minres.rdl.ui.tests</artifactId>
<packaging>eclipse-test-plugin</packaging> <packaging>eclipse-test-plugin</packaging>

2
com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.ui
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: com.minres.rdl.ui Bundle-Name: com.minres.rdl.ui
Bundle-Vendor: MINRES Technologies GmbH Bundle-Vendor: MINRES Technologies GmbH
Bundle-Version: 1.4.0 Bundle-Version: 1.4.1
Bundle-SymbolicName: com.minres.rdl.ui; singleton:=true Bundle-SymbolicName: com.minres.rdl.ui; singleton:=true
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Require-Bundle: com.minres.rdl, Require-Bundle: com.minres.rdl,

2
com.minres.rdl.parent/com.minres.rdl.ui/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl.ui</artifactId> <artifactId>com.minres.rdl.ui</artifactId>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>

2
com.minres.rdl.parent/com.minres.rdl.web/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl.web</artifactId> <artifactId>com.minres.rdl.web</artifactId>
<packaging>war</packaging> <packaging>war</packaging>

2
com.minres.rdl.parent/com.minres.rdl/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: com.minres.rdl Bundle-Name: com.minres.rdl
Bundle-Vendor: MINRES Technologies GmbH Bundle-Vendor: MINRES Technologies GmbH
Bundle-Version: 1.4.0 Bundle-Version: 1.4.1
Bundle-SymbolicName: com.minres.rdl; singleton:=true Bundle-SymbolicName: com.minres.rdl; singleton:=true
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext, Require-Bundle: org.eclipse.xtext,

2
com.minres.rdl.parent/com.minres.rdl/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<version>1.4.0</version> <version>1.4.1</version>
</parent> </parent>
<artifactId>com.minres.rdl</artifactId> <artifactId>com.minres.rdl</artifactId>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>

4
com.minres.rdl.parent/pom.xml
View File

@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<version>1.4.0</version> <version>1.4.1</version>
<artifactId>com.minres.rdl.parent</artifactId> <artifactId>com.minres.rdl.parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -108,7 +108,7 @@
<groupId>com.minres.rdl</groupId> <groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.target</artifactId> <artifactId>com.minres.rdl.target</artifactId>
<!-- <version>${project.version}</version> --> <!-- <version>${project.version}</version> -->
<version>1.4.0</version> <version>1.4.1</version>
</artifact> </artifact>
</target> </target>
<environments> <environments>