Skip to content

Commit ca737d0

Browse files
committed
Updated POM to ensure java.home is used to exec xjc.
- java.home needs to be set no later than for Java 8. JDK 11 doesn't have xjc.
1 parent 9701c3a commit ca737d0

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

org.modeldriven.fuml/.classpath

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
<attributes>
1616
<attribute name="optional" value="true"/>
1717
<attribute name="maven.pomderived" value="true"/>
18+
<attribute name="test" value="true"/>
1819
</attributes>
1920
</classpathentry>
2021
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
2122
<attributes>
2223
<attribute name="maven.pomderived" value="true"/>
24+
<attribute name="test" value="true"/>
2325
</attributes>
2426
</classpathentry>
2527
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
@@ -33,7 +35,11 @@
3335
<attribute name="optional" value="true"/>
3436
</attributes>
3537
</classpathentry>
36-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
38+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
39+
<attributes>
40+
<attribute name="maven.pomderived" value="true"/>
41+
</attributes>
42+
</classpathentry>
3743
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
3844
<classpathentry kind="output" path="target/classes"/>
3945
</classpath>

org.modeldriven.fuml/Eclipse-Setup-Instructions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ environment variable to the JDK root directory.
1111

1212
See http://ant.apache.org/bindownload.cgi
1313

14-
4.) Download an Eclise version or derivitive with Maven 2 (M2)
14+
4.) Download an Eclise version or derivative with Maven 2 (M2)
1515
support. Recommend Spring Tools Suite (STS).
1616

1717
See http://www.springsource.org/sts
1818

19-
5.) Launch Eclipse (or derivitive) and import the
19+
5.) Launch Eclipse (or derivative) and import the
2020
fUML project.
2121

2222
File->Import->Maven->Existing Maven Projects

org.modeldriven.fuml/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
<target>
135135
<mkdir dir="${xjc.output.dir}" />
136136
<exec executable="xjc">
137+
<env key="JAVA_HOME" path="${java.home}/.." />
137138
<arg
138139
line="-d ${xjc.output.dir}
139140
-extension
@@ -153,6 +154,7 @@
153154
<target>
154155
<mkdir dir="${xjc.output.dir}" />
155156
<exec executable="xjc">
157+
<env key="JAVA_HOME" path="${java.home}/.." />
156158
<arg
157159
line="-d ${xjc.output.dir}
158160
-extension

0 commit comments

Comments
 (0)