Skip to content

Commit

Permalink
chore: Update Jython dependency to 2.7.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
rhwood committed Mar 25, 2020
1 parent da16a7e commit 54e4899
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .factorypath
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/commons-io/commons-io/2.6/commons-io-2.6.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-text/1.2/commons-text-1.2.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/python/jython-standalone/2.7.1/jython-standalone-2.7.1.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/python/jython-standalone/2.7.2/jython-standalone-2.7.2.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/jmdns/jmdns/3.5.5/jmdns-3.5.5.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/jogamp/gluegen/gluegen-rt-main/2.3.2/gluegen-rt-main-2.3.2.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/jogamp/gluegen/gluegen-rt/2.3.2/gluegen-rt-2.3.2.jar" enabled="true" runInBatchMode="false"/>
Expand Down
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<pathelement location="${libdir}/openlcb.jar"/>
<pathelement location="${libdir}/jlfgr-1_0.jar"/>
<pathelement location="${libdir}/joal.jar"/>
<pathelement location="${libdir}/jython-standalone-2.7.1.jar"/>
<pathelement location="${libdir}/jython-standalone-2.7.2.jar"/>
<pathelement location="${libdir}/log4j-1.2.17.jar"/>
<pathelement location="${libdir}/javax.servlet-api-3.1.0.jar"/>
<pathelement location="${libdir}/vecmath-1.5.2.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion help/en/releasenotes/current-draft-note.shtml
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@
<h3>Scripting</h3>
<a id="Scripting" name="Scripting"></a>
<ul>
<li></li>
<li>Jython has been updated to version 2.7.2</li>
</ul>

<h3>Signals</h3>
Expand Down
7 changes: 4 additions & 3 deletions lib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,10 @@ bluecove-gpl-2.1.1-SNAPSHOT.jar
lib/windows/x64/intelbth_x64.dll
lib/windows/x86/intelbth.dll

##### jython-standalone-2.7.1.jar
- from http://repo1.maven.org/maven2/org/python/jython-standalone/2.7.1/
- unlike jython-2.7.1.jar, includes embedded standard python libs
##### jython-standalone-2.7.2.jar
- from http://repo1.maven.org/maven2/org/python/jython-standalone/2.7.2/
- unlike jython-2.7.2.jar, includes embedded standard python libs
- unlike jython-slim-2.7.2.jar, includes embedded Java dependencies

##### jinput (including jinput.jar, three jinput DLLs, and two libjinputs)
- from <https://jinput.dev.java.net/> jinput_dist_20090401
Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -297,15 +297,15 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4">
<compilation-unit>
<package-root>java/src</package-root>
<classpath mode="compile">target/generated-sources/javacc:target/generated-sources/jjtree:target/classes:lib/xercesImpl.jar:lib/gluegen-rt.jar:lib/commons-csv-1.7.jar:lib/jdom2-2.0.6.jar:lib/jhall.jar:lib/jinput.jar:lib/jmdns-3.5.5.jar:lib/joal.jar:lib/openlcb.jar:lib/jlfgr-1_0.jar:lib/junit-4.12.jar:lib/jython-standalone-2.7.1.jar:lib/log4j-1.2.17.jar:lib/purejavacomm-1.0.1.jar:lib/vecmath-1.5.2.jar:lib/mailapi.jar:lib/spotbugs-annotations.jar:lib/jsr305.jar:lib/WinRegistry-4.4.jar:lib/AppleJavaExtensions.jar:lib/jackson-annotations-2.10.0.jar:lib/jackson-core-2.10.0.jar:lib/jackson-databind-2.10.0.jar:lib/i18nchecker.jar:lib/xercesImpl.jar:lib/commons-lang3-3.7.jar:lib/commons-compress-1.18.jar:lib/slf4j-api-1.7.25.jar:lib/slf4j-log4j12-1.7.25.jar:lib/jul-to-slf4j-1.7.25.jar:lib/jetty-http-9.4.26.v20200117.jar:lib/jetty-io-9.4.26.v20200117.jar:lib/jetty-server-9.4.26.v20200117.jar:lib/jetty-util-9.4.26.v20200117.jar:lib/websocket-api-9.4.26.v20200117.jar:lib/websocket-servlet-9.4.26.v20200117.jar:lib/javax.servlet-api-3.1.0.jar:lib/jetty-security-9.4.26.v20200117.jar:lib/jetty-servlet-9.4.26.v20200117.jar:lib/websocket-client-9.4.26.v20200117.jar:lib/websocket-common-9.4.26.v20200117.jar:lib/websocket-server-9.4.26.v20200117.jar:lib/pi4j-core-1.2.jar:lib/commons-io-2.6.jar:lib/bluecove-2.1.1-SNAPSHOT.jar:lib/bluecove-bluez-2.1.1-SNAPSHOT.jar:lib/bluecove-gpl-2.1.1-SNAPSHOT.jar:lib/beansbinding-1.2.1.jar:lib/jna-4.4.0.jar:lib/jna-platform-4.4.0.jar:lib/xbee-java-library-1.2.1.jar:lib/usb-api-1.0.2.jar:lib/org-openide-util-lookup-RELEASE113.jar:lib/hid4java-0.5.0.jar:lib/jcip-annotations-1.0.jar:lib/commons-text-1.2.jar:lib/json-schema-validator-1.0.28.jar:lib/mqtt-client-0.4.0.jar:lib/jsplitbutton-1.3.1.jar:lib/thumbnailator-0.4.8.jar:lib/jinputvalidator-0.8.0.jar</classpath>
<classpath mode="compile">target/generated-sources/javacc:target/generated-sources/jjtree:target/classes:lib/xercesImpl.jar:lib/gluegen-rt.jar:lib/commons-csv-1.7.jar:lib/jdom2-2.0.6.jar:lib/jhall.jar:lib/jinput.jar:lib/jmdns-3.5.5.jar:lib/joal.jar:lib/openlcb.jar:lib/jlfgr-1_0.jar:lib/junit-4.12.jar:lib/jython-standalone-2.7.2.jar:lib/log4j-1.2.17.jar:lib/purejavacomm-1.0.1.jar:lib/vecmath-1.5.2.jar:lib/mailapi.jar:lib/spotbugs-annotations.jar:lib/jsr305.jar:lib/WinRegistry-4.4.jar:lib/AppleJavaExtensions.jar:lib/jackson-annotations-2.10.0.jar:lib/jackson-core-2.10.0.jar:lib/jackson-databind-2.10.0.jar:lib/i18nchecker.jar:lib/xercesImpl.jar:lib/commons-lang3-3.7.jar:lib/commons-compress-1.18.jar:lib/slf4j-api-1.7.25.jar:lib/slf4j-log4j12-1.7.25.jar:lib/jul-to-slf4j-1.7.25.jar:lib/jetty-http-9.4.26.v20200117.jar:lib/jetty-io-9.4.26.v20200117.jar:lib/jetty-server-9.4.26.v20200117.jar:lib/jetty-util-9.4.26.v20200117.jar:lib/websocket-api-9.4.26.v20200117.jar:lib/websocket-servlet-9.4.26.v20200117.jar:lib/javax.servlet-api-3.1.0.jar:lib/jetty-security-9.4.26.v20200117.jar:lib/jetty-servlet-9.4.26.v20200117.jar:lib/websocket-client-9.4.26.v20200117.jar:lib/websocket-common-9.4.26.v20200117.jar:lib/websocket-server-9.4.26.v20200117.jar:lib/pi4j-core-1.2.jar:lib/commons-io-2.6.jar:lib/bluecove-2.1.1-SNAPSHOT.jar:lib/bluecove-bluez-2.1.1-SNAPSHOT.jar:lib/bluecove-gpl-2.1.1-SNAPSHOT.jar:lib/beansbinding-1.2.1.jar:lib/jna-4.4.0.jar:lib/jna-platform-4.4.0.jar:lib/xbee-java-library-1.2.1.jar:lib/usb-api-1.0.2.jar:lib/org-openide-util-lookup-RELEASE113.jar:lib/hid4java-0.5.0.jar:lib/jcip-annotations-1.0.jar:lib/commons-text-1.2.jar:lib/json-schema-validator-1.0.28.jar:lib/mqtt-client-0.4.0.jar:lib/jsplitbutton-1.3.1.jar:lib/thumbnailator-0.4.8.jar:lib/jinputvalidator-0.8.0.jar</classpath>
<built-to>target/classes</built-to>
<javadoc-built-to>java/doc</javadoc-built-to>
<source-level>1.8</source-level>
</compilation-unit>
<compilation-unit>
<package-root>java/test</package-root>
<unit-tests/>
<classpath mode="compile">target/classes:target/generated-sources/javacc:target/generated-sources/jjtree:lib/junit-4.12.jar:lib/hamcrest-core-1.3.jar:lib/archunit-junit4-0.11.0.jar:lib/archunit-0.11.0.jar:lib/xercesImpl.jar:lib/gluegen-rt.jar:lib/jarchivelib-1.0.0.jar:lib/commons-csv-1.7.jar:lib/jdom2-2.0.6.jar:lib/jhall.jar:lib/jinput.jar:lib/jmdns-3.5.5.jar:lib/joal.jar:lib/openlcb.jar:lib/jlfgr-1_0.jar:lib/jython-standalone-2.7.1.jar:lib/log4j-1.2.17.jar:lib/mailapi.jar:lib/purejavacomm-1.0.1.jar:lib/servlet.jar:lib/vecmath-1.5.2.jar:lib/annotations.jar:lib/jsr305.jar:lib/i18nchecker.jar:lib/slf4j-api-1.7.25.jar:lib/slf4j-log4j12-1.7.25.jar:lib/jul-to-slf4j-1.7.25.jar:lib/pi4j-core-1.2.jar:lib/pi4j-service.jar:lib/commons-lang3-3.7.jar:lib/jackson-core-2.10.0.jar:lib/jackson-databind-2.10.0.jar:lib/websocket-api-9.4.26.v20200117.jar:lib/javax.servlet-api-3.1.0.jar:lib/xbjlib-1.1.1.jar:lib/mockito-core-3.3.0.jar:lib/jemmy-22-00c9f753cd0a.jar:lib/jetty-util-9.4.26.v20200117.jar:lib/xbee-java-library-1.2.0.jar:lib/org-openide-util-lookup-RELEASE113.jar:lib/commons-io-2.6.jar:lib/usb-api-1.0.2.jar:lib/cucumber-core-4.3.1.jar:lib/cucumber-java-4.3.1.jar:lib/cucumber-java8-4.3.1.jar:lib/cucumber-junit-4.3.1.jar:lib/cucumber-jvm-deps-1.0.6.jar:lib/cucumber-picocontainer-4.3.1.jar:lib/gherkin-5.1.0.jar:lib/gherkin-jvm-deps-1.0.4.jar:lib/picocontainer-2.15.jar:lib/tag-expressions-1.1.1.jar:lib/typetools-0.5.0.jar:lib/cucumber-html-0.2.7.jar:lib/cucumber-expressions-6.2.2.jar:lib/datatable-1.1.12.jar:lib/datatable-dependencies-1.1.12.jar:lib/webdrivermanager-3.4.0.jar:lib/json-schema-validator-1.0.28.jar:lib/selenium-server-standalone-3.6.0.jar:lib/spring-test-5.1.3.RELEASE.jar:lib/websocket-servlet-9.4.26.v20200117.jar:lib/xbee-java-library-1.2.1.jar:lib/jinputvalidator-0.8.0.jar:lib/assertj-core-3.12.0.jar:lib/junit-jupiter-api-5.6.0.jar:lib/junit-platform-runner-1.6.0.jar:lib/junit-platform-suite-api-1.6.0.jar:lib/junit-platform-launcher-1.6.0.jar:lib/junit-platform-engine-1.6.0.jar</classpath>
<classpath mode="compile">target/classes:target/generated-sources/javacc:target/generated-sources/jjtree:lib/junit-4.12.jar:lib/hamcrest-core-1.3.jar:lib/archunit-junit4-0.11.0.jar:lib/archunit-0.11.0.jar:lib/xercesImpl.jar:lib/gluegen-rt.jar:lib/jarchivelib-1.0.0.jar:lib/commons-csv-1.7.jar:lib/jdom2-2.0.6.jar:lib/jhall.jar:lib/jinput.jar:lib/jmdns-3.5.5.jar:lib/joal.jar:lib/openlcb.jar:lib/jlfgr-1_0.jar:lib/jython-standalone-2.7.2.jar:lib/log4j-1.2.17.jar:lib/mailapi.jar:lib/purejavacomm-1.0.1.jar:lib/servlet.jar:lib/vecmath-1.5.2.jar:lib/annotations.jar:lib/jsr305.jar:lib/i18nchecker.jar:lib/slf4j-api-1.7.25.jar:lib/slf4j-log4j12-1.7.25.jar:lib/jul-to-slf4j-1.7.25.jar:lib/pi4j-core-1.2.jar:lib/pi4j-service.jar:lib/commons-lang3-3.7.jar:lib/jackson-core-2.10.0.jar:lib/jackson-databind-2.10.0.jar:lib/websocket-api-9.4.26.v20200117.jar:lib/javax.servlet-api-3.1.0.jar:lib/xbjlib-1.1.1.jar:lib/mockito-core-3.3.0.jar:lib/jemmy-22-00c9f753cd0a.jar:lib/jetty-util-9.4.26.v20200117.jar:lib/xbee-java-library-1.2.0.jar:lib/org-openide-util-lookup-RELEASE113.jar:lib/commons-io-2.6.jar:lib/usb-api-1.0.2.jar:lib/cucumber-core-4.3.1.jar:lib/cucumber-java-4.3.1.jar:lib/cucumber-java8-4.3.1.jar:lib/cucumber-junit-4.3.1.jar:lib/cucumber-jvm-deps-1.0.6.jar:lib/cucumber-picocontainer-4.3.1.jar:lib/gherkin-5.1.0.jar:lib/gherkin-jvm-deps-1.0.4.jar:lib/picocontainer-2.15.jar:lib/tag-expressions-1.1.1.jar:lib/typetools-0.5.0.jar:lib/cucumber-html-0.2.7.jar:lib/cucumber-expressions-6.2.2.jar:lib/datatable-1.1.12.jar:lib/datatable-dependencies-1.1.12.jar:lib/webdrivermanager-3.4.0.jar:lib/json-schema-validator-1.0.28.jar:lib/selenium-server-standalone-3.6.0.jar:lib/spring-test-5.1.3.RELEASE.jar:lib/websocket-servlet-9.4.26.v20200117.jar:lib/xbee-java-library-1.2.1.jar:lib/jinputvalidator-0.8.0.jar:lib/assertj-core-3.12.0.jar:lib/junit-jupiter-api-5.6.0.jar:lib/junit-platform-runner-1.6.0.jar:lib/junit-platform-suite-api-1.6.0.jar:lib/junit-platform-launcher-1.6.0.jar:lib/junit-platform-engine-1.6.0.jar</classpath>
<built-to>target/classes</built-to>
<source-level>1.8</source-level>
</compilation-unit>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,7 @@
<dependency>
<groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId>
<version>2.7.1</version>
<version>2.7.2</version>
</dependency>
<!--
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions scripts/diskimage-sign.sh
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ signJarMember $tmpoutdir/JMRI/lib/bluecove-2.1.1-SNAPSHOT.jar libbluecove.jnilib
signJarMember $tmpoutdir/JMRI/lib/jna-4.4.0.jar com/sun/jna/darwin/libjnidispatch.jnilib
signJarMember $tmpoutdir/JMRI/lib/hid4java-0.5.0.jar darwin/libhidapi.dylib
# signJarMember $tmpoutdir/JMRI/lib/selenium-server-standalone-3.6.0.jar com/sun/jna/darwin/libjnidispatch.jnilib # OMITTED DUE TO TOC ISSUE
signJarMember $tmpoutdir/JMRI/lib/jython-standalone-2.7.1.jar META-INF/native/osx/libjansi.jnilib
signJarMember $tmpoutdir/JMRI/lib/jython-standalone-2.7.1.jar jni/Darwin/libjffi-1.2.jnilib
signJarMember $tmpoutdir/JMRI/lib/jython-standalone-2.7.2.jar META-INF/native/osx/libjansi.jnilib
signJarMember $tmpoutdir/JMRI/lib/jython-standalone-2.7.2.jar jni/Darwin/libjffi-1.2.jnilib

# add an Applications icon
$SUDO ln -s /Applications "$tmpoutdir"
Expand Down

0 comments on commit 54e4899

Please sign in to comment.