Skip to content

Commit 6bdcdbd

Browse files
committed
Issue #43 - Added support for JDKs 9 through 11.
- Replaces the use of javax jaxb artifacts with jakarta jaxb and the jaxb2-maven plugin. - Removes tools.jar and other artifacts no longer available as of Java 9. - Replaces use of the antrun plugin with xml-maven-plugin.
1 parent 8f92ce7 commit 6bdcdbd

17 files changed

+289
-244
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>
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
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>
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>

0 commit comments

Comments
 (0)