Skip to content

Issue 43 - Support JDKs beyond 8 #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 4, 2023
Merged

Issue 43 - Support JDKs beyond 8 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bdcdbd
Issue #43 - Added support for JDKs 9 through 11.
seidewitz Mar 31, 2023
6d139b5
Issue #43 - Updated setup and licensing information.
seidewitz Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions org.modeldriven.fuml/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,23 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
Expand All @@ -30,12 +31,7 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="target/generated-sources/java">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
Expand Down
14 changes: 11 additions & 3 deletions org.modeldriven.fuml/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
20 changes: 12 additions & 8 deletions org.modeldriven.fuml/.settings/org.eclipse.wst.common.component
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="fuml">
<wb-resource deploy-path="/" source-path="/src/main/java"/>
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
<wb-resource deploy-path="/" source-path="/target/generated-sources/java"/>
</wb-module>
</project-modules>
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

<wb-module deploy-name="fuml">

<wb-resource deploy-path="/" source-path="/src/main/java"/>

<wb-resource deploy-path="/" source-path="/src/main/resources"/>
<wb-resource deploy-path="/" source-path="/target/generated-sources/java"/>

</wb-module>

</project-modules>
2 changes: 1 addition & 1 deletion org.modeldriven.fuml/.settings/org.eclipse.wst.common.project.facet.core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="jst.utility" version="1.0"/>
<installed facet="java" version="1.6"/>
<installed facet="java" version="1.8"/>
</faceted-project>
10 changes: 5 additions & 5 deletions org.modeldriven.fuml/CommandLine-Setup-Instructions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
1.) Download and install Java 1.6.x JDK and set your JAVA_HOME
environment variable to the JDK root diretory.
1.) Download and install Java JDK 8 or 11 and set your JAVA_HOME
environment variable to the JDK root directory.

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

2.) Download and install Maven 2.2.1 (not 3). Make sure the
Maven 'bin' directory is part of you system path.

Maven 'bin' directory is part of your system path.

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

Expand Down
11 changes: 5 additions & 6 deletions org.modeldriven.fuml/Licensing-Information.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,11 @@ Apache log4j, http://logging.apache.org/, AL v2.0
Apache commons logging, http://commons.apache.org/logging/, AL v2.0
Apache Xerces, http://xerces.apache.org/, AL v2.0

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

Note to anyone further modifying or adding software to a release of the
Reference Implementation: do not include any software that is licensed under
Expand Down
6 changes: 3 additions & 3 deletions org.modeldriven.fuml/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ associated files [Common-Public-License-1.0.txt](https://github.com/ModelDriven/

The implementation build requires the following to be installed:

* Oracle Java Version 8 or above - see http://java.oracle.com/
* Apache Maven Version 2.2 or above - see http://maven.apache.org/
* 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)
* Apache Maven Version 2.2 or above – see http://maven.apache.org/

To build from the command line:

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

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

1. Start Eclipse

Expand Down
Loading