mirror of
https://github.com/Minres/RDL-Editor.git
synced 2024-12-30 17:57:50 +01:00
Merge branch 'release/1.4.1'
This commit is contained in:
commit
f7c2614e8a
@ -13,11 +13,11 @@ proc ModulesHelp { } {
|
||||
# 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} {
|
||||
puts stderr "Please install java via 'sdk install java 11.0.9.hs-adpt'!"
|
||||
prereq java/11.0.9
|
||||
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 17.0.2-open'!"
|
||||
prereq java/17.0.2
|
||||
} 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
|
||||
|
@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="com.minres.rdl.feature"
|
||||
label="RDL Feature "
|
||||
version="1.4.0"
|
||||
version="1.4.1"
|
||||
provider-name="MINRES Technologies GmbH">
|
||||
|
||||
<plugin
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl.feature</artifactId>
|
||||
<packaging>eclipse-feature</packaging>
|
||||
|
@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.ide
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: com.minres.rdl.ide
|
||||
Bundle-Vendor: My Company
|
||||
Bundle-Version: 1.4.0
|
||||
Bundle-Version: 1.4.1
|
||||
Bundle-SymbolicName: com.minres.rdl.ide; singleton:=true
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Require-Bundle: com.minres.rdl,
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl.ide</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="com.minres.rdl.platform.feature"
|
||||
label="Xtext Platform Feature"
|
||||
version="1.4.0"
|
||||
version="1.4.1"
|
||||
provider-name="MINRES Technologies GmbH">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl.platform.feature</artifactId>
|
||||
<packaging>eclipse-feature</packaging>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="com.minres.rdl.product.feature"
|
||||
label="RDL Feature "
|
||||
version="1.4.0"
|
||||
version="1.4.1"
|
||||
provider-name="MINRES Technologies GmbH">
|
||||
|
||||
<requires>
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl.product.feature</artifactId>
|
||||
<packaging>eclipse-feature</packaging>
|
||||
|
@ -7,7 +7,7 @@
|
||||
<name>RDL Editor</name>
|
||||
|
||||
<parent>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
</parent>
|
||||
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: RDL Editor
|
||||
Bundle-SymbolicName: com.minres.rdl.product;singleton:=true
|
||||
Bundle-Version: 1.4.0
|
||||
Bundle-Version: 1.4.1
|
||||
Bundle-Vendor: MINRES Technologies GmbH
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0"
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl.product</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl.repository</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl.standalone</artifactId>
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl.target</artifactId>
|
||||
<packaging>eclipse-target-definition</packaging>
|
||||
|
@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.tests
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: com.minres.rdl.tests
|
||||
Bundle-Vendor: My Company
|
||||
Bundle-Version: 1.4.0
|
||||
Bundle-Version: 1.4.1
|
||||
Bundle-SymbolicName: com.minres.rdl.tests; singleton:=true
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Require-Bundle: com.minres.rdl,
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl.tests</artifactId>
|
||||
<packaging>eclipse-test-plugin</packaging>
|
||||
|
@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.ui.tests
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: com.minres.rdl.ui.tests
|
||||
Bundle-Vendor: My Company
|
||||
Bundle-Version: 1.4.0
|
||||
Bundle-Version: 1.4.1
|
||||
Bundle-SymbolicName: com.minres.rdl.ui.tests; singleton:=true
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Require-Bundle: com.minres.rdl.ui,
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl.ui.tests</artifactId>
|
||||
<packaging>eclipse-test-plugin</packaging>
|
||||
|
@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl.ui
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: com.minres.rdl.ui
|
||||
Bundle-Vendor: MINRES Technologies GmbH
|
||||
Bundle-Version: 1.4.0
|
||||
Bundle-Version: 1.4.1
|
||||
Bundle-SymbolicName: com.minres.rdl.ui; singleton:=true
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Require-Bundle: com.minres.rdl,
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl.ui</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl.web</artifactId>
|
||||
<packaging>war</packaging>
|
||||
|
@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: com.minres.rdl
|
||||
Bundle-Vendor: MINRES Technologies GmbH
|
||||
Bundle-Version: 1.4.0
|
||||
Bundle-Version: 1.4.1
|
||||
Bundle-SymbolicName: com.minres.rdl; singleton:=true
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Require-Bundle: org.eclipse.xtext,
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</parent>
|
||||
<artifactId>com.minres.rdl</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
@ -2,7 +2,7 @@
|
||||
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>
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
<artifactId>com.minres.rdl.parent</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
@ -108,7 +108,7 @@
|
||||
<groupId>com.minres.rdl</groupId>
|
||||
<artifactId>com.minres.rdl.target</artifactId>
|
||||
<!-- <version>${project.version}</version> -->
|
||||
<version>1.4.0</version>
|
||||
<version>1.4.1</version>
|
||||
</artifact>
|
||||
</target>
|
||||
<environments>
|
||||
|
Loading…
Reference in New Issue
Block a user