Skip to content
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

Jump to bottom

Fixes for AsTeRICS running with Java 11 #323

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fixes for AsTeRICS running with Java 11 #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1748e34
Upgrade of Eclipse Equinox OSGI engine to version 3.14
deinhofer Aug 13, 2019
da9be4e
Manually added JAXB debendency as Java 11 does not ship it any more
deinhofer Aug 13, 2019
e3db9ec
removed Java-SE 1.6 requirement, as it was not actually needed and is…
deinhofer Aug 13, 2019
26f9b48
fixed compilation error due to new equinox osgi version and jar name
deinhofer Aug 14, 2019
6a4ba6e
fixed name of osgi jar name to new version 3.14
deinhofer Aug 15, 2019
f128f11
Fixed crash of rxtx library (cimcommunication) with Java 11 on Windows
deinhofer Aug 19, 2019
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
6 changes: 3 additions & 3 deletions ARE/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<property name="debug" value="true"/>
<property name="dist" location=".."/>
<property name="runtime" location="../bin/ARE"/>
<property name="osgi" location="osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="web.docroot" location="${runtime}/web/"/>
<property name="WebACS.bin" location="${web.docroot}/webapps/WebACS"/>

Expand Down Expand Up @@ -79,7 +79,7 @@
</target>

<target name="run" depends="buildAllNoClean" description="Peforms buildAllNoClean and starts the ARE.">
<java jar="${runtime}/org.eclipse.osgi_3.6.0.v20100517.jar" dir="${runtime}" fork="true" failonerror="true">
<java jar="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar" dir="${runtime}" fork="true" failonerror="true">
<sysproperty key="osgi.configuration.area" value="profile" />
<sysproperty key="osgi.clean" value="true" />
<sysproperty key="org.osgi.framework.bootdelegation" value="*" />
Expand All @@ -99,7 +99,7 @@
</target>

<target name="run-quick" description="Starts the ARE with debug options without compiling.">
<java jar="${runtime}/org.eclipse.osgi_3.6.0.v20100517.jar" dir="${runtime}" fork="true" failonerror="true">
<java jar="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar" dir="${runtime}" fork="true" failonerror="true">
<sysproperty key="osgi.configuration.area" value="profile" />
<sysproperty key="osgi.clean" value="true" />
<sysproperty key="org.osgi.framework.bootdelegation" value="*" />
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.GSMModem/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
</path>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.analogout/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.systemstatechange.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.androidphonecontrol/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
</path>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.angularcursorcontrol/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.systemstatechange.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.applicationlauncher/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
</path>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.arewindow/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.systemstatechange.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.bardisplay/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
</path>

Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.crosshaircursorcontrol/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.systemstatechange.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.dialogbox/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.systemstatechange.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.digitalout/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.systemstatechange.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.dotmeter/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
</path>

Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.easyhomecontrol/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="resources" location="src/main/resources"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<!-- <pathelement location="${services}/asterics.mw.systemstatechange.jar"/> -->
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.emulatefaultyplugin/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.systemstatechange.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.enobiodisplay/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="src/main/lib/starlab.enobiodisplay.jar"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
</path>

Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.enocean/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
Expand All @@ -15,7 +15,7 @@
<pathelement location="src/main/resources/lib/PriscillaCore.jar"/>
<!-- <pathelement location="src/main/resources/lib/nrjavaserial-3.8.8.jar"/>-->
<pathelement location="src/main/resources/lib/log4j-1.2.17.jar"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.systemstatechange.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion ARE/components/actuator.event_visualizer/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="classpath" location=".."/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="runtime" location="../../../bin/ARE"/>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.filewriter/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
</path>

Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.flickeringlightstimulator/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.systemstatechange.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.fs20sender/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="resources" location="src/main/resources"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
<pathelement location="${resources}/lib/jna-4.2.2.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.gmailshortcuts/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
<pathelement location="${services}/asterics.mw.systemstatechange.jar"/>
<pathelement location="${services}/asterics.mw.cimcommunication.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions ARE/components/actuator.gui_tester/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<property name="src.java" location="src/main/java"/>
<property name="dist" location=".."/>
<property name="runtime" location="../../../bin/ARE"/>
<property name="osgi" location="../../osgi"/>
<property name="osgi" location="${runtime}/org.eclipse.osgi_3.14.0.v20190517-1309.jar"/>
<property name="middleware" location="../../middleware"/>
<property name="services" location="../../services"/>
<property name="classpath" location=".."/>
<path id="asterics.classpath">
<pathelement location="bin"/>
<pathelement location="${osgi}/org.eclipse.osgi_3.6.0.v20100517.jar"/>
<pathelement location="${osgi}"/>
<pathelement location="${middleware}/asterics.ARE.jar"/>
</path>

Expand Down
Loading