release v2.3.2

jhipster · Oct 8, 2020 · ec42e4a · ec42e4a
1 parent 9cff9d9
commit ec42e4a
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 37 deletions.
diff --git a/jdl/io.github.jhipster.jdl.ide/pom.xml b/jdl/io.github.jhipster.jdl.ide/pom.xml
@@ -78,7 +78,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-dependency-plugin</artifactId>
-						<version>3.1.1</version>
+						<version>3.1.2</version>
 						<executions>
 							<execution>
 								<id>copy-dependencies</id>
@@ -149,7 +149,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-shade-plugin</artifactId>
-						<version>3.2.1</version>
+						<version>3.2.4</version>
 						<configuration>
 							<transformers>
 								<transformer
@@ -276,5 +276,4 @@
 			</build>
 		</profile>
 	</profiles>
-
 </project>
diff --git a/jdl/io.github.jhipster.jdl.target/io.github.jhipster.jdl.target.target b/jdl/io.github.jhipster.jdl.target/io.github.jhipster.jdl.target.target
@@ -21,12 +21,12 @@
 		<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.23.0/"/>
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
-		<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
-		<unit id="org.junit" version="4.12.0.v201504281640"/>
-		<unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/>
-		<unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/>
-		<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
+			<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
+			<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
+			<unit id="org.junit" version="4.12.0.v201504281640"/>
+			<unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/>
+			<unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/>
+			<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
 		<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-09"/>
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/jdl/io.github.jhipster.jdl.ui/META-INF/MANIFEST.MF b/jdl/io.github.jhipster.jdl.ui/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: jbase,
  org.eclipse.xtext.ui,
  org.eclipse.xtext.ui.shared,
  org.eclipse.xtext.ui.codetemplates.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.ide,
+ org.eclipse.ui.editors;bundle-version="3.5.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0",
  org.eclipse.ui,
  org.eclipse.compare,
  org.eclipse.xtext.builder,

diff --git a/jdl/io.github.jhipster.jdl.vscode/package.json b/jdl/io.github.jhipster.jdl.vscode/package.json
@@ -25,7 +25,7 @@
         "onCommand:plantuml.preview"
     ],
     "////main": "./out/src/extension-dev",
-    "///main": "./out/src/extension-jar",
+    "main": "./out/src/extension-jar",
     "//main": "./out/src/extension",
     "contributes": {
         "languages": [

diff --git a/jdl/io.github.jhipster.jdl/src/io/github/jhipster/jdl/JDLRuntimeModule.xtend b/jdl/io.github.jhipster.jdl/src/io/github/jhipster/jdl/JDLRuntimeModule.xtend
@@ -80,6 +80,5 @@ class JDLRuntimeModule extends AbstractJDLRuntimeModule {
 
 	def Class<? extends INamesAreUniqueValidationHelper> bindIINamesAreUniqueValidationHelper() {
 		return JDLNamesAreUniqueValidationHelper
-	}
-
+	}	
 }
diff --git a/jdl/pom.xml b/jdl/pom.xml
@@ -33,6 +33,7 @@
 		<launcher>org.eclipse.xtext.ide.server.ServerLauncher</launcher>
 		<pack>generated-sources/pack</pack>
 		<libs>generated-sources/libs</libs>
+		<moduleProperties>--add-modules=ALL-SYSTEM</moduleProperties>
 	</properties>
 
 	<dependencyManagement>
@@ -171,26 +172,6 @@
 					<configuration>
 						<lifecycleMappingMetadata>
 							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-resources-plugin
-										</artifactId>
-										<versionRange>
-											[2.4.3,)
-										</versionRange>
-										<goals>
-											<goal>resources</goal>
-											<goal>testResources</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
 								<pluginExecution>
 									<pluginExecutionFilter>
 										<groupId>

diff --git a/xdocker/io.github.jhipster.xdocker.dsl/xdockerdsl.parent/pom.xml b/xdocker/io.github.jhipster.xdocker.dsl/xdockerdsl.parent/pom.xml
@@ -9,7 +9,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<xtextVersion>2.22.0</xtextVersion>
+		<xtextVersion>2.23.0</xtextVersion>
 		<mwe2Version>2.11.3</mwe2Version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>11</maven.compiler.source>
@@ -24,6 +24,8 @@
 		<systemProperties></systemProperties>
 		<tycho.testArgLine></tycho.testArgLine>
 		<additionalTestArguments></additionalTestArguments>
+		<moduleProperties>--add-modules=ALL-SYSTEM</moduleProperties>
+		<platformSystemProperties>-XstartOnFirstThread</platformSystemProperties>
 	</properties>
 
 	<modules>

diff --git a/xdocker/io.github.jhipster.xdocker.dsl/xdockerdsl.ui/META-INF/MANIFEST.MF b/xdocker/io.github.jhipster.xdocker.dsl/xdockerdsl.ui/META-INF/MANIFEST.MF
@@ -12,8 +12,8 @@ Require-Bundle: xdockerdsl,
  org.eclipse.xtext.ui,
  org.eclipse.xtext.ui.shared,
  org.eclipse.xtext.ui.codetemplates.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.ide,
+ org.eclipse.ui.editors;bundle-version="3.5.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0",
  org.eclipse.ui,
  org.eclipse.compare,
  org.eclipse.xtext.builder,
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,6 +80,5 @@ class JDLRuntimeModule extends AbstractJDLRuntimeModule { @@
     	def Class<? extends INamesAreUniqueValidationHelper> bindIINamesAreUniqueValidationHelper() {
     		return JDLNamesAreUniqueValidationHelper
-    	}
+    	}
     }