chore: update of docker and test script for Java 11

jsmethie · jsmethie · commit 667b0102ecb8 · 2023-01-17T10:54:05.000-07:00
diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,7 @@
 # License along with Runway SDK(tm).  If not, see <http://www.gnu.org/licenses/>.
 #
 
-FROM maven:3-openjdk-8
+FROM maven:3-openjdk-11
 
 ENV DATA_ACCESS=true
 ENV BUSINESS=true
diff --git a/pom.xml b/pom.xml
@@ -100,8 +100,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <aspectj.version>1.9.4</aspectj.version>    
-    <aspectj.plugin.version>1.14.0</aspectj.plugin.version>    
+    <aspectj.version>1.9.7</aspectj.version>    
+    <aspectj.plugin.version>1.13.1</aspectj.plugin.version>    
     <junit.version>4.13.1</junit.version>
     <runway.url>http://www.terraframe.com</runway.url>
   </properties>
diff --git a/runwaysdk-archetype/.project b/runwaysdk-archetype/.project
diff --git a/runwaysdk-archetype/src/main/resources/archetype-resources/launches/domain/mvn install -P rebuild-database.launch b/runwaysdk-archetype/src/main/resources/archetype-resources/launches/domain/mvn install -P rebuild-database.launch
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="install"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="rebuild-database"/>
-<listAttribute key="M2_PROPERTIES"/>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<intAttribute key="M2_THREADS" value="1"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="MAVEN_OPTS" value="-Xms512m -Xmx2048m -XX:MaxPermSize=256m"/>
-</mapAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m&#10;-Xmx2048m&#10;-XX:MaxPermSize=256m"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/${artifactId}"/>
+    <intAttribute key="M2_COLORS" value="0"/>
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+    <stringAttribute key="M2_GOALS" value="install"/>
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+    <booleanAttribute key="M2_OFFLINE" value="false"/>
+    <stringAttribute key="M2_PROFILES" value="rebuild-database"/>
+    <listAttribute key="M2_PROPERTIES"/>
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+    <intAttribute key="M2_THREADS" value="1"/>
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+        <mapEntry key="MAVEN_OPTS" value="-Xms512m -Xmx2048m -XX:MaxPermSize=256m"/>
+    </mapAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m&#10;-Xmx2048m&#10;-XX:MaxPermSize=256m"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/${artifactId}"/>
 </launchConfiguration>
diff --git a/runwaysdk-client/.project b/runwaysdk-client/.project
@@ -5,32 +5,19 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/runwaysdk-common/.project b/runwaysdk-common/.project
@@ -5,32 +5,19 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/runwaysdk-gis/.project b/runwaysdk-gis/.project
diff --git a/runwaysdk-gis/runwaysdk-gis-server/pom.xml b/runwaysdk-gis/runwaysdk-gis-server/pom.xml
@@ -81,7 +81,7 @@
 
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
         <version>${aspectj.plugin.version}</version>
         <dependencies>
diff --git a/runwaysdk-localization/server/pom.xml b/runwaysdk-localization/server/pom.xml
@@ -51,7 +51,7 @@
       </plugin>
       <!-- Weave Aspects -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
         <version>${aspectj.plugin.version}</version>
         <dependencies>
diff --git a/runwaysdk-manager/pom.xml b/runwaysdk-manager/pom.xml
@@ -184,7 +184,7 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
+				<groupId>dev.aspectj</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
 				<version>${aspectj.plugin.version}</version>
 				<dependencies>
diff --git a/runwaysdk-server/.project b/runwaysdk-server/.project
@@ -5,21 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.ajdt.core.ajbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -28,10 +18,7 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.ajdt.ui.ajnature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/runwaysdk-server/pom.xml b/runwaysdk-server/pom.xml
@@ -201,7 +201,7 @@
       <version>3.2.1</version>
     </plugin>        
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
         <version>${aspectj.plugin.version}</version>
         <dependencies>
diff --git a/runwaysdk-server/src/main/java/com/runwaysdk/business/generation/AspectJCompiler.java b/runwaysdk-server/src/main/java/com/runwaysdk/business/generation/AspectJCompiler.java
@@ -45,6 +45,8 @@ public class AspectJCompiler extends AbstractCompiler
 
   private LinkedList<String> infos;
 
+  private LinkedList<String> usages;
+
   /**
    * Sets default values for the compiler (most notably -aspectpath)
    */
@@ -55,6 +57,7 @@ protected AspectJCompiler()
     errors = new LinkedList<String>();
     warnings = new LinkedList<String>();
     infos = new LinkedList<String>();
+    usages = new LinkedList<String>();
 
     if (LocalProperties.isRunwayEnvironment())
     {
@@ -121,7 +124,7 @@ private void callAJC(String args[])
     warnings.clear();
     infos.clear();
 
-    if (0 < Main.bareMain(args, false, fails, errors, warnings, infos))
+    if (0 < Main.bareMain(args, false, fails, errors, warnings, infos, usages))
     {
       // We have errors
       StringBuilder message = new StringBuilder();
diff --git a/runwaysdk-solr/.project b/runwaysdk-solr/.project
diff --git a/runwaysdk-test/launches/junit/JUnit Run UeberTestSuite.launch b/runwaysdk-test/launches/junit/JUnit Run UeberTestSuite.launch
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
         <listEntry value="/runwaysdk-test/src/main/java/com/runwaysdk/UeberTestSuite.java"/>
     </listAttribute>
@@ -10,6 +11,8 @@
     <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
     <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
     <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.runwaysdk.UeberTestSuite"/>
diff --git a/runwaysdk-test/pom.xml b/runwaysdk-test/pom.xml
@@ -230,7 +230,7 @@
 
       <!-- This plugin weaves aspects on build -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>dev.aspectj</groupId>        
         <artifactId>aspectj-maven-plugin</artifactId>
         <version>${aspectj.plugin.version}</version>
         <dependencies>
diff --git a/runwaysdk-test/src/main/java/com/runwaysdk/business/MultiThreadTestSuite.java b/runwaysdk-test/src/main/java/com/runwaysdk/business/MultiThreadTestSuite.java
diff --git a/runwaysdk-web/.project b/runwaysdk-web/.project
diff --git a/runwaysdk-web/runwaysdk-web-test/pom.xml b/runwaysdk-web/runwaysdk-web-test/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`# License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.`
`18`	`18`	`#`
`19`	`19`
`20`		`-FROM maven:3-openjdk-8`
	`20`	`+FROM maven:3-openjdk-11`
`21`	`21`
`22`	`22`	`ENV DATA_ACCESS=true`
`23`	`23`	`ENV BUSINESS=true`