Skip to content

Commit 667b010

Browse files
committed
chore: update of docker and test script for Java 11
1 parent 760a0ae commit 667b010

File tree

19 files changed

+142
-194
lines changed

19 files changed

+142
-194
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# License along with Runway SDK(tm). If not, see <http://www.gnu.org/licenses/>.
1818
#
1919

20-
FROM maven:3-openjdk-8
20+
FROM maven:3-openjdk-11
2121

2222
ENV DATA_ACCESS=true
2323
ENV BUSINESS=true

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
101101
<maven.compiler.source>11</maven.compiler.source>
102102
<maven.compiler.target>11</maven.compiler.target>
103-
<aspectj.version>1.9.4</aspectj.version>
104-
<aspectj.plugin.version>1.14.0</aspectj.plugin.version>
103+
<aspectj.version>1.9.7</aspectj.version>
104+
<aspectj.plugin.version>1.13.1</aspectj.plugin.version>
105105
<junit.version>4.13.1</junit.version>
106106
<runway.url>http://www.terraframe.com</runway.url>
107107
</properties>

runwaysdk-archetype/.project

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
3-
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
4-
<stringAttribute key="M2_GOALS" value="install"/>
5-
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
6-
<booleanAttribute key="M2_OFFLINE" value="false"/>
7-
<stringAttribute key="M2_PROFILES" value="rebuild-database"/>
8-
<listAttribute key="M2_PROPERTIES"/>
9-
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
10-
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
11-
<intAttribute key="M2_THREADS" value="1"/>
12-
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
13-
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
14-
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
15-
<mapEntry key="MAVEN_OPTS" value="-Xms512m -Xmx2048m -XX:MaxPermSize=256m"/>
16-
</mapAttribute>
17-
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
18-
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m&#10;-Xmx2048m&#10;-XX:MaxPermSize=256m"/>
19-
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/${artifactId}"/>
3+
<intAttribute key="M2_COLORS" value="0"/>
4+
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
5+
<stringAttribute key="M2_GOALS" value="install"/>
6+
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
7+
<booleanAttribute key="M2_OFFLINE" value="false"/>
8+
<stringAttribute key="M2_PROFILES" value="rebuild-database"/>
9+
<listAttribute key="M2_PROPERTIES"/>
10+
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
11+
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
12+
<intAttribute key="M2_THREADS" value="1"/>
13+
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
14+
<stringAttribute key="M2_USER_SETTINGS" value=""/>
15+
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
16+
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
17+
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
18+
<mapEntry key="MAVEN_OPTS" value="-Xms512m -Xmx2048m -XX:MaxPermSize=256m"/>
19+
</mapAttribute>
20+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
21+
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m&#10;-Xmx2048m&#10;-XX:MaxPermSize=256m"/>
22+
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/${artifactId}"/>
2023
</launchConfiguration>

runwaysdk-client/.project

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,19 @@
55
<projects>
66
</projects>
77
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.wst.common.project.facet.core.builder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
138
<buildCommand>
149
<name>org.eclipse.jdt.core.javabuilder</name>
1510
<arguments>
1611
</arguments>
1712
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.wst.validation.validationbuilder</name>
20-
<arguments>
21-
</arguments>
22-
</buildCommand>
2313
<buildCommand>
2414
<name>org.eclipse.m2e.core.maven2Builder</name>
2515
<arguments>
2616
</arguments>
2717
</buildCommand>
2818
</buildSpec>
2919
<natures>
30-
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
31-
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
3220
<nature>org.eclipse.jdt.core.javanature</nature>
3321
<nature>org.eclipse.m2e.core.maven2Nature</nature>
34-
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
3522
</natures>
3623
</projectDescription>

runwaysdk-common/.project

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,19 @@
55
<projects>
66
</projects>
77
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.wst.common.project.facet.core.builder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
138
<buildCommand>
149
<name>org.eclipse.jdt.core.javabuilder</name>
1510
<arguments>
1611
</arguments>
1712
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.wst.validation.validationbuilder</name>
20-
<arguments>
21-
</arguments>
22-
</buildCommand>
2313
<buildCommand>
2414
<name>org.eclipse.m2e.core.maven2Builder</name>
2515
<arguments>
2616
</arguments>
2717
</buildCommand>
2818
</buildSpec>
2919
<natures>
30-
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
31-
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
3220
<nature>org.eclipse.jdt.core.javanature</nature>
3321
<nature>org.eclipse.m2e.core.maven2Nature</nature>
34-
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
3522
</natures>
3623
</projectDescription>

runwaysdk-gis/.project

Lines changed: 0 additions & 17 deletions
This file was deleted.

runwaysdk-gis/runwaysdk-gis-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181

8282
<plugins>
8383
<plugin>
84-
<groupId>org.codehaus.mojo</groupId>
84+
<groupId>dev.aspectj</groupId>
8585
<artifactId>aspectj-maven-plugin</artifactId>
8686
<version>${aspectj.plugin.version}</version>
8787
<dependencies>

runwaysdk-localization/server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</plugin>
5252
<!-- Weave Aspects -->
5353
<plugin>
54-
<groupId>org.codehaus.mojo</groupId>
54+
<groupId>dev.aspectj</groupId>
5555
<artifactId>aspectj-maven-plugin</artifactId>
5656
<version>${aspectj.plugin.version}</version>
5757
<dependencies>

runwaysdk-manager/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<build>
185185
<plugins>
186186
<plugin>
187-
<groupId>org.codehaus.mojo</groupId>
187+
<groupId>dev.aspectj</groupId>
188188
<artifactId>aspectj-maven-plugin</artifactId>
189189
<version>${aspectj.plugin.version}</version>
190190
<dependencies>

0 commit comments

Comments
 (0)