Skip to content

Commit ceee190

Browse files
lolocohenlolocohen
committed
fixed bug JPPF-596
1 parent 676f6c2 commit ceee190

File tree

13 files changed

+26
-26
lines changed

13 files changed

+26
-26
lines changed

‎JPPF/bin/build-android.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<!-- ========================================================================= -->
3535

3636
<target name="update.android.dependencies" depends="build" description="update dependencies of the android projects" if="android.sdk.installed">
37-
<get.maven.lib g="net.jpountz.lz4" a="lz4" v="1.3.0" dest="${node-android}/events/libs"/>
37+
<get.maven.lib g="org.lz4" a="lz4-java" v="1.6.0" dest="${node-android}/events/libs"/>
3838
<get.maven.lib g="org.slf4j" a="slf4j-api" v="${slf4j.version}" dest="${node-android}/events/libs"/>
3939
<get.maven.lib g="org.slf4j" a="slf4j-android" v="${slf4j.version}" dest="${node-android}/events/libs"/>
4040
<jar destfile="${build}/jppf-node-android.jar">
@@ -65,7 +65,7 @@
6565
<copy tofile="${node-android}/events/libs/jppf-common.jar" file="${build}/jppf-common-${version.number}.jar"/>
6666
<copy tofile="${node-android}/events/libs/jppf-server.jar" file="${build}/jppf-server-${version.number}.jar"/>
6767
<copy tofile="${node-android}/events/libs/jppf-node-android.jar" file="${build}/jppf-node-android.jar"/>
68-
<copy tofile="${node-android}/events/libs/lz4-1.3.0.jar" file="${lib}/LZ4/lz4-1.3.0.jar"/>
68+
<copy tofile="${node-android}/events/libs/lz4-hava-1.6.0.jar" file="${lib}/LZ4/lz4-1.6.0.jar"/>
6969
</target>
7070

7171
<!-- ========================================================================= -->

‎JPPF/bin/build-dependencies.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<get.maven.lib g="net.sf.jung" a="jung-visualization" v="${jung.version}" dest="${lib}/Jung"/>
8181
<get.maven.lib g="junit" a="junit" v="4.10" dest="${lib}/JUnit"/>
8282
<get.maven.lib g="log4j" a="log4j" v="${log4j.version}" dest="${lib}/log4j"/>
83-
<get.maven.lib g="net.jpountz.lz4" a="lz4" v="1.3.0" dest="${lib}/LZ4"/>
83+
<get.maven.lib g="org.lz4" a="lz4-java" v="1.6.0" dest="${lib}/LZ4"/>
8484
<get.maven.lib g="org.apache.maven" a="maven-ant-tasks" v="2.1.3" dest="${lib}/maven"/>
8585
<get.maven.lib g="com.miglayout" a="miglayout-core" v="${miglayout.version}" dest="${lib}/MigLayout"/>
8686
<get.maven.lib g="com.miglayout" a="miglayout-swing" v="${miglayout.version}" dest="${lib}/MigLayout"/>

‎JPPF/bin/build-samples.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<get.maven.lib g="commons-io" a="commons-io" v="2.4" dest="${samples-pack}/shared/lib"/>
192192
<get.maven.lib g="com.zaxxer" a="HikariCP-java7" v="2.4.11" dest="${samples-pack}/shared/lib"/>
193193
<get.maven.lib g="log4j" a="log4j" v="1.2.15" dest="${samples-pack}/shared/lib"/>
194-
<get.maven.lib g="net.jpountz.lz4" a="lz4" v="1.3.0" dest="${samples-pack}/shared/lib"/>
194+
<get.maven.lib g="org.lz4" a="lz4-java" v="1.6.0" dest="${samples-pack}/shared/lib"/>
195195
<get.maven.lib g="com.jgoodies" a="jgoodies-looks" v="${looks.version}" dest="${samples-pack}/shared/lib"/>
196196
<get.maven.lib g="com.jgoodies" a="jgoodies-common" v="1.8.1" dest="${samples-pack}/shared/lib"/>
197197
<get.maven.lib g="com.miglayout" a="miglayout-core" v="${miglayout.version}" dest="${samples-pack}/shared/lib"/>

‎JPPF/bin/maven/jppf-common.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
<version>2.4</version>
4444
</dependency>
4545
<dependency>
46-
<groupId>net.jpountz.lz4</groupId>
47-
<artifactId>lz4</artifactId>
48-
<version>1.3.0</version>
46+
<groupId>org.lz4</groupId>
47+
<artifactId>lz4-java</artifactId>
48+
<version>1.6.0</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>com.github.oshi</groupId>

‎admin-web/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<classpathentry kind="lib" path="lib/wicket-util-7.4.0.jar"/>
2626
<classpathentry kind="lib" path="lib/wicket-velocity-7.4.0.jar"/>
2727
<classpathentry kind="lib" path="/JPPF/lib/log4j/log4j-1.2.15.jar"/>
28-
<classpathentry kind="lib" path="/JPPF/lib/LZ4/lz4-1.3.0.jar"/>
2928
<classpathentry combineaccessrules="false" kind="src" path="/admin"/>
3029
<classpathentry kind="lib" path="lib/commons-fileupload-1.3.2.jar"/>
3130
<classpathentry kind="lib" path="lib/javax.servlet-3.0.0.v201112011016.jar">
@@ -40,5 +39,6 @@
4039
<classpathentry kind="lib" path="lib/wicket-jquery-ui-theme-start-7.4.0.jar"/>
4140
<classpathentry kind="lib" path="/JPPF/lib/slf4j/slf4j-api-1.7.25.jar"/>
4241
<classpathentry kind="lib" path="/JPPF/lib/slf4j/slf4j-log4j12-1.7.25.jar"/>
42+
<classpathentry kind="lib" path="/JPPF/lib/LZ4/lz4-java-1.6.0.jar"/>
4343
<classpathentry kind="output" path="classes"/>
4444
</classpath>

‎admin-web/bin/build-libs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<get.maven.lib g="org.apache.maven" a="maven-ant-tasks" v="2.1.3" dest="${lib.dir}/build"/>
4040

4141
<get.maven.lib g="log4j" a="log4j" v="1.2.15" dest="${lib.dir}"/>
42-
<get.maven.lib g="net.jpountz.lz4" a="lz4" v="1.3.0" dest="${lib.dir}"/>
42+
<get.maven.lib g="org.lz4" a="lz4-java" v="1.6.0" dest="${lib.dir}"/>
4343
<get.maven.lib g="org.slf4j" a="slf4j-api" v="${slf4j.version}" dest="${lib.dir}"/>
4444
<get.maven.lib g="org.slf4j" a="slf4j-log4j12" v="${slf4j.version}" dest="${lib.dir}"/>
4545

‎common/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<attribute name="javadoc_location" value="file:/C:/ftp/dev/Apache/apache-log4j-1.2.15/site/apidocs/"/>
1212
</attributes>
1313
</classpathentry>
14-
<classpathentry kind="lib" path="/JPPF/lib/LZ4/lz4-1.3.0.jar"/>
14+
<classpathentry kind="lib" path="/JPPF/lib/LZ4/lz4-java-1.6.0.jar"/>
1515
<classpathentry kind="output" path="classes"/>
1616
</classpath>

‎jca-client/build-libs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<get.maven.lib g="org.apache.geronimo.specs" a="geronimo-j2ee-connector_1.5_spec" v="2.0.0" dest="${lib.dir}"/>
3838
<get.maven.lib g="org.apache.geronimo.specs" a="geronimo-servlet_2.5_spec" v="1.2" dest="${lib.dir}"/>
3939
<get.maven.lib g="log4j" a="log4j" v="1.2.15" dest="${lib.dir}"/>
40-
<get.maven.lib g="net.jpountz.lz4" a="lz4" v="1.3.0" dest="${lib.dir}"/>
40+
<get.maven.lib g="org.lz4" a="lz4-java" v="1.6.0" dest="${lib.dir}"/>
4141
<get.maven.lib g="org.slf4j" a="slf4j-api" v="${slf4j.version}" dest="${lib.dir}"/>
4242
<get.maven.lib g="org.slf4j" a="slf4j-log4j12" v="${slf4j.version}" dest="${lib.dir}"/>
4343
<get.maven.lib g="junit" a="junit" v="4.10" dest="${lib.dir}"/>

‎jca-client/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@
349349
<include name="jppf-common-${version.number}.jar" />
350350
<include name="jppf-client-${version.number}.jar" />
351351
<include name="jppf-jmxremote-nio-${version.number}.jar" />
352-
<include name="lz4-1.3.0.jar" />
352+
<include name="lz4-*.jar" />
353353
<include name="slf4j-api-*.jar" />
354354
<include name="slf4j-@{logging}-*.jar" />
355355
<jppflibs-patterns/>

‎jmxremote-nio/.classpath

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry kind="src" path="src/java"/>
4-
<classpathentry kind="src" path="src/resources"/>
5-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6-
<classpathentry combineaccessrules="false" kind="src" path="/common"/>
7-
<classpathentry kind="lib" path="/JPPF/lib/LZ4/lz4-1.3.0.jar"/>
8-
<classpathentry kind="lib" path="/JPPF/lib/slf4j/slf4j-api-1.7.25.jar" sourcepath="C:/Users/lcohen/AppData/Local/Temp/.org.sf.feeling.decompiler1527227744736/source/slf4j-api-1.7.25-sources.jar"/>
9-
<classpathentry kind="output" path="classes"/>
10-
</classpath>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src/java"/>
4+
<classpathentry kind="src" path="src/resources"/>
5+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6+
<classpathentry combineaccessrules="false" kind="src" path="/common"/>
7+
<classpathentry kind="lib" path="/JPPF/lib/slf4j/slf4j-api-1.7.25.jar" sourcepath="C:/Users/lcohen/AppData/Local/Temp/.org.sf.feeling.decompiler1527227744736/source/slf4j-api-1.7.25-sources.jar"/>
8+
<classpathentry kind="lib" path="/JPPF/lib/LZ4/lz4-java-1.6.0.jar"/>
9+
<classpathentry kind="output" path="classes"/>
10+
</classpath>

‎samples-pack/TomcatPort/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<include name="commons-logging-1.1.jar"/>
4545
<include name="slf4j-api-1.7.25.jar"/>
4646
<include name="slf4j-jdk14-1.7.25.jar"/>
47-
<include name="lz4-1.3.0.jar"/>
47+
<include name="lz4-*.jar"/>
4848
</fileset>
4949
</path>
5050

@@ -110,7 +110,7 @@
110110
<include name="commons-logging-1.1.jar"/>
111111
<include name="slf4j-api-1.7.25.jar"/>
112112
<include name="jppf-jmxremote-nio-*.jar"/>
113-
<include name="lz4-1.3.0.jar"/>
113+
<include name="lz4-*.jar"/>
114114
</lib>
115115
<lib dir="${basedir}/lib">
116116
<include name="slf4j-jdk14-1.7.25.jar"/>

‎tests/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<pathelement location="${jmxremote-nio}/classes"/>
6464
<pathelement location="${node}/classes"/>
6565
<pathelement location="${lib}/Groovy/groovy-all-1.6.5.jar"/>
66-
<pathelement location="${lib}/LZ4/lz4-1.3.0.jar"/>
66+
<pathelement location="${lib}/LZ4/lz4-java-1.6.0.jar"/>
6767
<pathelement location="${lib}/HikariCP/HikariCP-java7-2.4.11.jar"/>
6868
<pathelement location="${lib}/slf4j/slf4j-api-1.7.25.jar"/>
6969
<pathelement location="${lib}/slf4j/slf4j-log4j12-1.7.25.jar"/>

‎tests/src/framework/test/org/jppf/test/setup/GenericProcessLauncher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public GenericProcessLauncher(final int n, final String processType) {
135135
addCP(libDir + "slf4j/slf4j-api-" + BaseSetup.SLF4J_VERSION + ".jar");
136136
addCP(libDir + "slf4j/slf4j-log4j12-" + BaseSetup.SLF4J_VERSION + ".jar");
137137
addCP(libDir + "log4j/log4j-1.2.15.jar");
138-
addCP(libDir + "LZ4/lz4-1.3.0.jar");
138+
addCP(libDir + "LZ4/lz4-java-1.6.0.jar");
139139
addCP(libDir + "ApacheCommons/commons-io-2.4.jar");
140140
}
141141

0 commit comments

Comments
 (0)