Skip to content

Commit

Permalink
issue JPPF-541 upgraded versions of Looks, RSyntaxTextArea
Browse files Browse the repository at this point in the history
  • Loading branch information
@lolocohen
lolocohen committed Aug 2, 2018
1 parent 62a8d5d commit 63a40cb
Show file tree
Hide file tree
Showing 8 changed files with 287 additions and 279 deletions.
10 changes: 0 additions & 10 deletions JPPF/.classpath
View file
Expand Up @@ -7,23 +7,13 @@
<attribute name="javadoc_location" value="http://docs.oracle.com/javaee/5/api/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/JFreeChart/jcommon-1.0.15.jar"/>
<classpathentry kind="lib" path="lib/JFreeChart/jfreechart-1.0.12.jar"/>
<classpathentry exported="true" kind="lib" path="lib/log4j/log4j-1.2.15.jar">
<attributes>
<attribute name="javadoc_location" value="file:/C:/ftp/dev/Apache/apache-log4j-1.2.15/site/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/JGoodies/looks-2.2.2.jar"/>
<classpathentry kind="lib" path="lib/Groovy/groovy-all-1.6.5.jar"/>
<classpathentry kind="var" path="JDK_HOME/lib/tools.jar"/>
<classpathentry kind="lib" path="lib/Jung/collections-generic-4.01.jar"/>
<classpathentry kind="lib" path="lib/Jung/colt-1.2.0.jar"/>
<classpathentry kind="lib" path="lib/Jung/concurrent-1.3.4.jar"/>
<classpathentry kind="lib" path="lib/Jung/jung-algorithms-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/Jung/jung-api-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/Jung/jung-graph-impl-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/Jung/jung-visualization-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/JUnit/junit-4.10.jar"/>
<classpathentry exported="true" kind="lib" path="lib/LZ4/lz4-1.3.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/HikariCP/HikariCP-java7-2.4.11.jar"/>
Expand Down
14 changes: 9 additions & 5 deletions JPPF/bin/build-dependencies.xml
View file
Expand Up @@ -67,9 +67,13 @@
<get.maven.lib g="org.apache.geronimo.specs" a="geronimo-j2ee-connector_1.5_spec" v="2.0.0" dest="${lib}/J2EE"/>
<get.maven.lib g="jfree" a="jcommon" v="1.0.15" dest="${lib}/JFreeChart"/>
<get.maven.lib g="jfree" a="jfreechart" v="1.0.12" dest="${lib}/JFreeChart"/>
<get.maven.lib g="com.jgoodies" a="looks" v="2.2.2" dest="${lib}/JGoodies"/>
<get.maven.lib g="net.java.dev.jna" a="jna" v="4.5.1" dest="${lib}/JNA"/>
<get.maven.lib g="net.java.dev.jna" a="jna-platform" v="4.5.1" dest="${lib}/JNA"/>
<!--
<get.maven.lib g="com.jgoodies" a="looks" v="${looks.version}" dest="${lib}/JGoodies"/>
-->
<get.maven.lib g="com.jgoodies" a="jgoodies-looks" v="${looks.version}" dest="${lib}/JGoodies"/>
<get.maven.lib g="com.jgoodies" a="jgoodies-common" v="1.8.1" dest="${lib}/JGoodies"/>
<get.maven.lib g="net.java.dev.jna" a="jna" v="${jna.version}" dest="${lib}/JNA"/>
<get.maven.lib g="net.java.dev.jna" a="jna-platform" v="${jna.version}" dest="${lib}/JNA"/>
<get.maven.lib g="net.sourceforge.collections" a="collections-generic" v="4.01" dest="${lib}/Jung"/>
<get.maven.lib g="colt" a="colt" v="1.2.0" dest="${lib}/Jung"/>
<get.maven.lib g="concurrent" a="concurrent" v="1.3.4" dest="${lib}/Jung"/>
Expand All @@ -83,11 +87,11 @@
<get.maven.lib g="org.apache.maven" a="maven-ant-tasks" v="2.1.3" dest="${lib}/maven"/>
<get.maven.lib g="com.miglayout" a="miglayout-core" v="${miglayout.version}" dest="${lib}/MigLayout"/>
<get.maven.lib g="com.miglayout" a="miglayout-swing" v="${miglayout.version}" dest="${lib}/MigLayout"/>
<get.maven.lib g="com.github.oshi" a="oshi-core" v="3.5.0" dest="${lib}/oshi"/>
<get.maven.lib g="com.github.oshi" a="oshi-core" v="${oshi.version}" dest="${lib}/oshi"/>
<get.maven.lib g="org.threeten" a="threetenbp" v="1.3.6" dest="${lib}/oshi"/>
<get.maven.lib g="org.slf4j" a="slf4j-api" v="${slf4j.version}" dest="${lib}/slf4j"/>
<get.maven.lib g="org.slf4j" a="slf4j-log4j12" v="${slf4j.version}" dest="${lib}/slf4j"/>
<get.maven.lib g="com.fifesoft" a="rsyntaxtextarea" v="2.5.7" dest="${lib}/RSyntaxTextArea"/>
<get.maven.lib g="com.fifesoft" a="rsyntaxtextarea" v="${rsta.version}" dest="${lib}/RSyntaxTextArea"/>
</target>

</project>
10 changes: 7 additions & 3 deletions JPPF/bin/build-libs.xml
View file
Expand Up @@ -22,10 +22,14 @@
<!-- Properties and macrodefs to download dependencies -->
<!-- ========================================================================= -->

<property name="slf4j.version" value="1.7.25"/>
<property name="log4j.version" value="1.2.15"/>
<property name="jung.version" value="2.0.1"/>
<property name="slf4j.version" value="1.7.25"/>
<property name="log4j.version" value="1.2.15"/>
<property name="jung.version" value="2.0.1"/>
<property name="miglayout.version" value="4.2"/>
<property name="jna.version" value="4.5.1"/>
<property name="oshi.version" value="3.5.0"/>
<property name="looks.version" value="2.7.0"/>
<property name="rsta.version" value="2.6.1"/>

<!-- =============================================================================
Download a file from Maven Central to a specified folder
Expand Down
8 changes: 6 additions & 2 deletions JPPF/bin/build-samples.xml
View file
Expand Up @@ -146,10 +146,14 @@
<get.maven.lib g="com.zaxxer" a="HikariCP-java7" v="2.4.11" dest="${samples-pack}/shared/lib"/>
<get.maven.lib g="log4j" a="log4j" v="1.2.15" dest="${samples-pack}/shared/lib"/>
<get.maven.lib g="net.jpountz.lz4" a="lz4" v="1.3.0" dest="${samples-pack}/shared/lib"/>
<get.maven.lib g="com.jgoodies" a="looks" v="2.2.2" dest="${samples-pack}/shared/lib"/>
<!--
<get.maven.lib g="com.jgoodies" a="looks" v="${looks.version}" dest="${lib}/JGoodies"/>
-->
<get.maven.lib g="com.jgoodies" a="jgoodies-looks" v="${looks.version}" dest="${lib}/JGoodies"/>
<get.maven.lib g="com.jgoodies" a="jgoodies-common" v="1.8.1" dest="${lib}/JGoodies"/>
<get.maven.lib g="com.miglayout" a="miglayout-core" v="${miglayout.version}" dest="${samples-pack}/shared/lib"/>
<get.maven.lib g="com.miglayout" a="miglayout-swing" v="${miglayout.version}" dest="${samples-pack}/shared/lib"/>
<get.maven.lib g="com.fifesoft" a="rsyntaxtextarea" v="2.5.7" dest="${samples-pack}/shared/lib"/>
<get.maven.lib g="com.fifesoft" a="rsyntaxtextarea" v="${rsta.version}" dest="${samples-pack}/shared/lib"/>
<get.maven.lib g="org.slf4j" a="slf4j-api" v="${slf4j.version}" dest="${samples-pack}/shared/lib"/>
<get.maven.lib g="org.slf4j" a="slf4j-log4j12" v="${slf4j.version}" dest="${samples-pack}/shared/lib"/>
<get.maven.lib g="commons-codec" a="commons-codec" v="1.3" dest="${samples-pack}/shared/lib"/>
Expand Down
5 changes: 3 additions & 2 deletions admin/.classpath
View file
Expand Up @@ -15,9 +15,10 @@
<classpathentry kind="lib" path="/JPPF/lib/Jung/jung-graph-impl-2.0.1.jar"/>
<classpathentry kind="lib" path="/JPPF/lib/Jung/jung-visualization-2.0.1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="/JPPF/lib/JGoodies/looks-2.2.2.jar"/>
<classpathentry kind="lib" path="/JPPF/lib/RSyntaxTextArea/rsyntaxtextarea-2.5.7.jar"/>
<classpathentry kind="lib" path="/JPPF/lib/MigLayout/miglayout-core-4.2.jar"/>
<classpathentry kind="lib" path="/JPPF/lib/MigLayout/miglayout-swing-4.2.jar"/>
<classpathentry kind="lib" path="/JPPF/lib/JGoodies/jgoodies-common-1.8.1.jar"/>
<classpathentry kind="lib" path="/JPPF/lib/JGoodies/jgoodies-looks-2.7.0.jar"/>
<classpathentry kind="lib" path="/JPPF/lib/RSyntaxTextArea/rsyntaxtextarea-2.6.1.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>

0 comments on commit 63a40cb

Please sign in to comment.