Skip to content

Commit 39a5934

Browse files
seidewitzseidewitz
authored
Merge pull request #49 from ModelDriven/Issue-43
Issue 43 - Support JDKs beyond 8
2 parents 8f92ce7 + 6d139b5 commit 39a5934

20 files changed

+302
-258
lines changed

‎org.modeldriven.fuml/.classpath‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,23 @@
66
<attribute name="maven.pomderived" value="true"/>
77
</attributes>
88
</classpathentry>
9+
<classpathentry kind="src" path="target/generated-sources/java"/>
910
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
1011
<attributes>
1112
<attribute name="maven.pomderived" value="true"/>
1213
</attributes>
1314
</classpathentry>
1415
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
1516
<attributes>
17+
<attribute name="test" value="true"/>
1618
<attribute name="optional" value="true"/>
1719
<attribute name="maven.pomderived" value="true"/>
18-
<attribute name="test" value="true"/>
1920
</attributes>
2021
</classpathentry>
2122
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
2223
<attributes>
23-
<attribute name="maven.pomderived" value="true"/>
2424
<attribute name="test" value="true"/>
25+
<attribute name="maven.pomderived" value="true"/>
2526
</attributes>
2627
</classpathentry>
2728
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
@@ -30,12 +31,7 @@
3031
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
3132
</attributes>
3233
</classpathentry>
33-
<classpathentry kind="src" output="target/classes" path="target/generated-sources/java">
34-
<attributes>
35-
<attribute name="optional" value="true"/>
36-
</attributes>
37-
</classpathentry>
38-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
34+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
3935
<attributes>
4036
<attribute name="maven.pomderived" value="true"/>
4137
</attributes>

‎org.modeldriven.fuml/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4-
org.eclipse.jdt.core.compiler.compliance=1.6
3+
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
5+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6+
org.eclipse.jdt.core.compiler.compliance=1.8
7+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
510
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
612
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
713
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
8-
org.eclipse.jdt.core.compiler.source=1.6
14+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
15+
org.eclipse.jdt.core.compiler.release=disabled
16+
org.eclipse.jdt.core.compiler.source=1.8

‎org.modeldriven.fuml/.settings/org.eclipse.wst.common.component‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project-modules id="moduleCoreId" project-version="1.5.0">
3-
<wb-module deploy-name="fuml">
4-
<wb-resource deploy-path="/" source-path="/src/main/java"/>
5-
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
6-
<wb-resource deploy-path="/" source-path="/target/generated-sources/java"/>
7-
</wb-module>
8-
</project-modules>
1+
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
2+
3+
<wb-module deploy-name="fuml">
4+
5+
<wb-resource deploy-path="/" source-path="/src/main/java"/>
6+
7+
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
8+
<wb-resource deploy-path="/" source-path="/target/generated-sources/java"/>
9+
10+
</wb-module>
11+
12+
</project-modules>

‎org.modeldriven.fuml/.settings/org.eclipse.wst.common.project.facet.core.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<faceted-project>
33
<installed facet="jst.utility" version="1.0"/>
4-
<installed facet="java" version="1.6"/>
4+
<installed facet="java" version="1.8"/>
55
</faceted-project>

‎org.modeldriven.fuml/CommandLine-Setup-Instructions.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
1.) Download and install Java 1.6.x JDK and set your JAVA_HOME
2-
environment variable to the JDK root diretory.
1+
1.) Download and install Java JDK 8 or 11 and set your JAVA_HOME
2+
environment variable to the JDK root directory.
33

4-
See http://www.oracle.com/technetwork/java/javaee/downloads/java-ee-sdk-6u3-jdk-6u29-downloads-523388.html
4+
See https://www.oracle.com/java/technologies/downloads
5+
See https://adoptium.net/temurin/releases
56

67
2.) Download and install Maven 2.2.1 (not 3). Make sure the
7-
Maven 'bin' directory is part of you system path.
8-
8+
Maven 'bin' directory is part of your system path.
99

1010
See http://maven.apache.org/download.cgi
1111

‎org.modeldriven.fuml/Licensing-Information.txt‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@ Apache log4j, http://logging.apache.org/, AL v2.0
3535
Apache commons logging, http://commons.apache.org/logging/, AL v2.0
3636
Apache Xerces, http://xerces.apache.org/, AL v2.0
3737

38-
The official baseline for the Software is maintained by ModelDriven.org, a
39-
division of Data Access Technologies, Inc. The copyright owner of all
40-
modifications to the Software in releases after the initial release is Data
41-
Access Technologies, Inc. Such subsequent releases are also licensed to you
42-
under the Academic Free License version 3.0, except for the software programs
43-
listed above.
38+
The official baseline for the Software is maintained by Model Driven Solutions,
39+
Inc., the successor to Data Access Technologies, Inc., and the copyright owner
40+
of all modifications to the Software in releases after the initial release. Such
41+
subsequent releases are also licensed to you under the Academic Free License
42+
version 3.0, except for the software programs listed above.
4443

4544
Note to anyone further modifying or adding software to a release of the
4645
Reference Implementation: do not include any software that is licensed under

‎org.modeldriven.fuml/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ associated files [Common-Public-License-1.0.txt](https://github.com/ModelDriven/
3434

3535
The implementation build requires the following to be installed:
3636

37-
* Oracle Java Version 8 or above - see http://java.oracle.com/
38-
* Apache Maven Version 2.2 or above - see http://maven.apache.org/
37+
* Java Version 8 or 11 – see [http://java.oracle.com/downloads](http://java.oracle.com/downloads) or [https://adoptium.net/temurin/releases](http://java.oracle.com/downloads)
38+
* Apache Maven Version 2.2 or above – see http://maven.apache.org/
3939

4040
To build from the command line:
4141

@@ -52,7 +52,7 @@ be displayed. Generated and compiled code can be found under the 'target'
5252
directory.
5353

5454
To build using Eclipse:
55-
The implementation build requires Eclipse Mars or above with the M2E plugin and dependencies:
55+
The implementation build requires Eclipse 4.16 (2020-06) or above with the M2E plugin and dependencies:
5656

5757
1. Start Eclipse
5858

0 commit comments

Comments
 (0)