diff --git a/.gitignore b/.gitignore
index 5f52bbc..c85324f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /1.3.0.tar.gz
 /1.7.1.tar.gz
+/v1.9.2.tar.gz
diff --git a/0-build.patch b/0-build.patch
deleted file mode 100644
index 5624f08..0000000
--- a/0-build.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 7a63933..e48d5dd 100644
---- a/build.xml
-+++ b/build.xml
-@@ -17,8 +17,7 @@
- <project name="lz4" default="dist" basedir="."
-     xmlns:cpptasks="antlib:net.sf.antcontrib.cpptasks"
-     xmlns:ivy="antlib:org.apache.ivy.ant"
--    xmlns:junit4="antlib:com.carrotsearch.junit4"
--    xmlns:mvn="antlib:org.apache.maven.artifact.ant">
-+    xmlns:junit4="antlib:com.carrotsearch.junit4">
- 
-   <property name="src" location="src"/>
-   <property name="build" location="build"/>
-@@ -76,8 +75,6 @@
-   </target>
- 
-   <target name="-ivy-install" unless="ivy.available">
--    <mkdir dir="${user.home}/.ant/lib" />
--    <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.jar.version}/${ivy.jar.name}" dest="${user.home}/.ant/lib/${ivy.jar.name}"/>
-   </target>
- 
-   <target name="install-cpptasks" unless="cpptasks.available">
-@@ -88,10 +85,6 @@
-   </target>
- 
-   <target name="install-maven-ant-tasks" unless="maven-ant-tasks.available">
--    <ivy:cachepath organisation="org.apache.maven" module="maven-ant-tasks" revision="2.1.3"
--      inline="true" conf="default" transitive="true" pathid="maven-ant-tasks.classpath"/>
--    <taskdef uri="antlib:org.apache.maven.artifact.ant" resource="org/apache/maven/artifact/ant/antlib.xml" classpathref="maven-ant-tasks.classpath"/>
--    <property name="maven-ant-tasks.available" value="true"/>
-   </target>
- 
-   <target name="install-forbidden-apis" unless="forbidden-apis.available">
-@@ -102,11 +95,6 @@
-   </target>
- 
-   <target name="install-bnd" unless="bnd.available">
--    <!-- using bnd 1.50.0 because more recent versions have broken JAR wrapping -->
--    <ivy:cachepath organisation="biz.aQute" module="bnd" revision="1.50.0"
--      inline="true" conf="default" transitive="true" pathid="bnd.classpath"/>
--    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath"/>
--    <property name="bnd.available" value="true"/> 
-   </target>
- 
-   <target name="init">
-@@ -124,9 +112,15 @@
-     <property name="junit4.available" value="true" />
-   </target>
- 
-+  <path id="mvel.classpath">
-+      <fileset dir="/usr/share/java">
-+      <include name="mvel.jar"/>
-+      <include name="objectweb-asm/asm.jar"/>
-+      <include name="objectweb-asm/asm-util.jar"/>
-+      </fileset>
-+  </path>
-+
-   <target name="generate-sources" depends="init">
--    <ivy:cachepath organisation="org.mvel" module="mvel2" revision="2.3.2.Final"
--      inline="true" conf="default" transitive="true" pathid="mvel.classpath"/>
-     <mkdir dir="${build}/java" />
-     <java
-       fork="true"
-@@ -329,7 +323,9 @@
-         overview="${src}/java/overview.html"
-         packagenames="net.jpountz.lz4,net.jpountz.xxhash"
-         windowtitle="lz4 / xxhash - Java API ${ivy.revision}"
--        destDir="${build}/docs">
-+        destDir="${build}/docs"
-+        encoding="UTF-8"
-+        additionalparam="-Xdoclint:none">
-       <link href="http://download.oracle.com/javase/6/docs/api/" />
-       <sourcepath>
-         <pathelement location="${src}/java"/>
-@@ -375,8 +371,12 @@
-     </jar>
-   </target>
- 
--  <target name="bundle" description="makes the JAR a valid OSGi bundle" depends="install-bnd, jar">
--    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath"/>
-+  <target name="bundle" description="makes the JAR a valid OSGi bundle" depends="jar">
-+    <taskdef resource="aQute/bnd/ant/taskdef.properties" >
-+      <classpath>
-+        <fileset dir="/usr/share/java/aqute-bnd"/>
-+      </classpath>
-+    </taskdef>
-     <property name="packages.version" value="${ivy.revision}"/>
-     <!-- We need to remove potential -SNAPSHOT qualifiers as package versions... -->
-     <script language="javascript">
-@@ -411,7 +411,7 @@
-     <antcall target="dist" />
-   </target>
- 
--  <target name="forbidden-apis" description="check API usage" depends="install-forbidden-apis,compile">
-+  <target name="forbidden-apis" description="check API usage" depends="compile">
-     <forbidden-apis internalRuntimeForbidden="true" classpathref="forbidden-apis.classpath">
-       <bundledSignatures name="jdk-unsafe-${javac.target}"/>
-       <bundledSignatures name="jdk-deprecated-${javac.target}"/>
-@@ -429,41 +429,22 @@
-     <attribute name="repositoryid" />
-     <attribute name="repositoryurl" />
-     <sequential>
--      <mvn:mvn>
--        <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file" />
--        <arg value="-Durl=@{repositoryurl}" />
--        <arg value="-DrepositoryId=@{repositoryid}" />
--        <arg value="-DpomFile=${dist}/${ivy.module}-${ivy.revision}.pom" />
--        <arg value="-Dfile=${dist}/${ivy.module}-${ivy.revision}.jar" />
--        <arg value="-Dfiles=${dist}/${ivy.module}-${ivy.revision}-sources.jar,${dist}/${ivy.module}-${ivy.revision}-javadoc.jar" />
--        <arg value="-Dclassifiers=sources,javadoc" />
--        <arg value="-Dtypes=jar,jar" />
--        <arg value="-Pgpg" />
--      </mvn:mvn>
-     </sequential>
-   </macrodef>
- 
-   <target name="deploy" description="deploy snapshot to snapshot repo" depends="install-maven-ant-tasks">
--    <property name="skip.jni" value="true" />
--    <antcall target="-deploy" />
-   </target>
- 
-   <target name="-deploy" depends="clean,dist">
--    <deploy repositoryid="sonatype-nexus-snapshots" repositoryurl="https://oss.sonatype.org/content/repositories/snapshots" />
-   </target>
- 
-   <!-- before this, update project version from SNAPSHOT to RELEASE -->
-   <target name="stage" description="deploy to release repo" depends="install-maven-ant-tasks,test-skip-jni,forbidden-apis">
--    <property name="skip.jni" value="true" />
--    <antcall target="-stage" />
-   </target>
- 
-   <target name="stage-skip-test" description="deploy to release repo, skipping tests" depends="install-maven-ant-tasks,forbidden-apis">
--    <property name="skip.jni" value="true" />
--    <antcall target="-stage" />
-   </target>
- 
-   <target name="-stage" depends="clean,dist">
--    <deploy repositoryid="sonatype-nexus-staging" repositoryurl="https://oss.sonatype.org/service/local/staging/deploy/maven2" />
-   </target>
- </project>
diff --git a/1-junit_Assert.patch b/1-junit_Assert.patch
deleted file mode 100644
index 6b0075f..0000000
--- a/1-junit_Assert.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-diff -Nru lz4-java-1.3.0/src/test/net/jpountz/lz4/LZ4BlockStreamingTest.java lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/lz4/LZ4BlockStreamingTest.java
---- lz4-java-1.3.0/src/test/net/jpountz/lz4/LZ4BlockStreamingTest.java	2014-11-26 20:04:10.000000000 +0100
-+++ lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/lz4/LZ4BlockStreamingTest.java	2016-05-03 17:08:40.285741530 +0200
-@@ -207,11 +207,11 @@
- 
-     final LZ4FastDecompressor decompressor = LZ4Factory.fastestInstance().fastDecompressor();
-     InputStream is = new LZ4BlockInputStream(open(compressed.toByteArray()), decompressor, checksum);
--    assertFalse(is.markSupported());
-+    org.junit.Assert.assertFalse(is.markSupported());
-     try {
-       is.mark(1);
-       is.reset();
--      assertFalse(true);
-+      org.junit.Assert.assertFalse(true);
-     } catch (IOException e) {
-       // OK
-     }
-@@ -235,8 +235,8 @@
-       }
-     }
-     is.close();
--    assertEquals(data.length, read);
--    assertArrayEquals(data, Arrays.copyOf(restored, read));
-+    org.junit.Assert.assertEquals(data.length, read);
-+    org.junit.Assert.assertArrayEquals(data, Arrays.copyOf(restored, read));
- 
-     // test skip
-     final int offset = data.length <= 1 ? 0 : randomInt(data.length - 1);
-@@ -246,17 +246,17 @@
-     read = 0;
-     while (read < offset) {
-       final long skipped = is.skip(offset - read);
--      assertTrue(skipped >= 0);
-+      org.junit.Assert.assertTrue(skipped >= 0);
-       read += skipped;
-     }
-     read = 0;
-     while (read < length) {
-       final int r = is.read(restored, read, length - read);
--      assertTrue(r >= 0);
-+      org.junit.Assert.assertTrue(r >= 0);
-       read += r;
-     }
-     is.close();
--    assertArrayEquals(Arrays.copyOfRange(data, offset, offset + length), Arrays.copyOfRange(restored, 0, length));
-+    org.junit.Assert.assertArrayEquals(Arrays.copyOfRange(data, offset, offset + length), Arrays.copyOfRange(restored, 0, length));
-   }
- 
-   @Test
-@@ -288,7 +288,7 @@
-     byte[] actual = new byte[testBytes.length];
-     in.read(actual);
- 
--    assertArrayEquals(testBytes, actual);
-+    org.junit.Assert.assertArrayEquals(testBytes, actual);
- 
-     in.close();
-     in.close();
-diff -Nru lz4-java-1.3.0/src/test/net/jpountz/xxhash/XXHash32Test.java lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/xxhash/XXHash32Test.java
---- lz4-java-1.3.0/src/test/net/jpountz/xxhash/XXHash32Test.java	2014-11-26 20:04:10.000000000 +0100
-+++ lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/xxhash/XXHash32Test.java	2016-05-03 17:08:40.278738569 +0200
-@@ -129,12 +129,12 @@
-     final int ref = XXHashFactory.nativeInstance().hash32().hash(buf, off, len, seed);
-     for (XXHash32 hash : INSTANCES) {
-       final int h = hash.hash(buf, off, len, seed);
--      assertEquals(hash.toString(), ref, h);
-+      org.junit.Assert.assertEquals(hash.toString(), ref, h);
-       final ByteBuffer copy = copyOf(buf, off, len);
-       final int h2 = hash.hash(copy, off, len, seed);
--      assertEquals(off, copy.position());
--      assertEquals(len, copy.remaining());
--      assertEquals(hash.toString(), ref, h2);
-+      org.junit.Assert.assertEquals(off, copy.position());
-+      org.junit.Assert.assertEquals(len, copy.remaining());
-+      org.junit.Assert.assertEquals(hash.toString(), ref, h2);
-     }
-   }
- 
-@@ -155,8 +155,8 @@
-       hash1.update(bytes, off, len);
-       hash2.update(bytes, off, len);
-       hash3.update(bytes, off, len);
--      assertEquals(hash2.toString() + " " + totalLen, hash1.getValue(), hash2.getValue());
--      assertEquals(hash3.toString() + " " + totalLen, hash1.getValue(), hash3.getValue());
-+      org.junit.Assert.assertEquals(hash2.toString() + " " + totalLen, hash1.getValue(), hash2.getValue());
-+      org.junit.Assert.assertEquals(hash3.toString() + " " + totalLen, hash1.getValue(), hash3.getValue());
-       totalLen += len;
-     }
-   }
-diff -Nru lz4-java-1.3.0/src/test/net/jpountz/xxhash/XXHash64Test.java lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/xxhash/XXHash64Test.java
---- lz4-java-1.3.0/src/test/net/jpountz/xxhash/XXHash64Test.java	2014-11-26 20:04:10.000000000 +0100
-+++ lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/xxhash/XXHash64Test.java	2016-05-03 17:08:40.278738569 +0200
-@@ -134,12 +134,12 @@
-     final long ref = XXHashFactory.nativeInstance().hash64().hash(buf, off, len, seed);
-     for (XXHash64 hash : INSTANCES) {
-       final long h = hash.hash(buf, off, len, seed);
--      assertEquals(hash.toString(), ref, h);
-+      org.junit.Assert.assertEquals(hash.toString(), ref, h);
-       final ByteBuffer copy = copyOf(buf, off, len);
-       final long h2 = hash.hash(copy, off, len, seed);
--      assertEquals(off, copy.position());
--      assertEquals(len, copy.remaining());
--      assertEquals(hash.toString(), ref, h2);
-+      org.junit.Assert.assertEquals(off, copy.position());
-+      org.junit.Assert.assertEquals(len, copy.remaining());
-+      org.junit.Assert.assertEquals(hash.toString(), ref, h2);
-     }
-   }
- 
-@@ -160,8 +160,8 @@
-       hash1.update(bytes, off, len);
-       hash2.update(bytes, off, len);
-       hash3.update(bytes, off, len);
--      assertEquals(hash2.toString() + " " + totalLen, hash1.getValue(), hash2.getValue());
--      assertEquals(hash3.toString() + " " + totalLen, hash1.getValue(), hash3.getValue());
-+      org.junit.Assert.assertEquals(hash2.toString() + " " + totalLen, hash1.getValue(), hash2.getValue());
-+      org.junit.Assert.assertEquals(hash3.toString() + " " + totalLen, hash1.getValue(), hash3.getValue());
-       totalLen += len;
-     }
-   }
-diff --git a/src/test/net/jpountz/lz4/LZ4Test.java b/src/test/net/jpountz/lz4/LZ4Test.java
-index 739fdaf..6d27121 100644
---- a/src/test/net/jpountz/lz4/LZ4Test.java
-+++ b/src/test/net/jpountz/lz4/LZ4Test.java
-@@ -56,7 +56,7 @@ public class LZ4Test extends AbstractLZ4Test {
- 	if (tempLibFiles != null) {
- 	    for (File tempLibFile : tempLibFiles) {
- 		File lckFile = new File(tempLibFile.getAbsolutePath() + ".lck");
--		assertTrue(tempLibFile.getAbsolutePath(), lckFile.exists());
-+		org.junit.Assert.assertTrue(tempLibFile.getAbsolutePath(), lckFile.exists());
- 	    }
- 	}
-     }
-@@ -70,7 +70,7 @@ public class LZ4Test extends AbstractLZ4Test {
-       for (File tempLockFile : tempLockFiles) {
- 	String tempLockFilePath = tempLockFile.getAbsolutePath();
- 	File libFile = new File(tempLockFilePath.substring(0, tempLockFilePath.length() - 4));
--	assertTrue(tempLockFilePath, libFile.exists());
-+	org.junit.Assert.assertTrue(tempLockFilePath, libFile.exists());
-       }
-     }
-   }
-@@ -80,7 +80,7 @@ public class LZ4Test extends AbstractLZ4Test {
-   public void testMaxCompressedLength() {
-     final int len = randomBoolean() ? randomInt(16) : randomInt(1 << 30);
-     for (LZ4Compressor compressor : COMPRESSORS) {
--      assertEquals(LZ4JNI.LZ4_compressBound(len), compressor.maxCompressedLength(len));
-+        org.junit.Assert.assertEquals(LZ4JNI.LZ4_compressBound(len), compressor.maxCompressedLength(len));
-     }
-   }
- 
-@@ -116,8 +116,8 @@ public class LZ4Test extends AbstractLZ4Test {
-     byte[] compressed = getCompressedWorstCase(decompressed);
-     byte[] restored = new byte[decompressed.length];
-     int cpLen = decompressor.decompress(compressed, 0, restored, 0, decompressed.length);
--    assertEquals(compressed.length, cpLen);
--    assertArrayEquals(decompressed, restored);
-+    org.junit.Assert.assertEquals(compressed.length, cpLen);
-+    org.junit.Assert.assertArrayEquals(decompressed, restored);
-   }
- 
-   @Test
-@@ -134,8 +134,8 @@ public class LZ4Test extends AbstractLZ4Test {
-     byte[] compressed = getCompressedWorstCase(decompressed);
-     byte[] restored = new byte[decompressed.length];
-     int uncpLen = decompressor.decompress(compressed, 0, compressed.length, restored, 0);
--    assertEquals(decompressed.length, uncpLen);
--    assertArrayEquals(decompressed, restored);
-+    org.junit.Assert.assertEquals(decompressed.length, uncpLen);
-+    org.junit.Assert.assertArrayEquals(decompressed, restored);
-   }
- 
-   @Test
-@@ -169,8 +169,8 @@ public class LZ4Test extends AbstractLZ4Test {
- 
-     // test decompression
-     final T restored = tester.allocate(len);
--    assertEquals(compressedLen, tester.decompress(decompressor, compressed, 0, restored, 0, len));
--    assertArrayEquals(Arrays.copyOfRange(data, off, off + len), tester.copyOf(restored, 0, len));
-+    org.junit.Assert.assertEquals(compressedLen, tester.decompress(decompressor, compressed, 0, restored, 0, len));
-+    org.junit.Assert.assertArrayEquals(Arrays.copyOfRange(data, off, off + len), tester.copyOf(restored, 0, len));
- 
-     // make sure it fails if the compression dest is not large enough
-     tester.fill(restored, randomByte());
-@@ -183,8 +183,8 @@ public class LZ4Test extends AbstractLZ4Test {
-       // because the compressor is allowed to return different compression results
-       // even when it is invoked with the same input data.
-       // In this case, just make sure the compressed data can be successfully decompressed.
--      assertEquals(compressedLen2, tester.decompress(decompressor, compressed2, 0, restored, 0, len));
--      assertArrayEquals(Arrays.copyOfRange(data, off, off + len), tester.copyOf(restored, 0, len));
-+      org.junit.Assert.assertEquals(compressedLen2, tester.decompress(decompressor, compressed2, 0, restored, 0, len));
-+      org.junit.Assert.assertArrayEquals(Arrays.copyOfRange(data, off, off + len), tester.copyOf(restored, 0, len));
-     } catch (LZ4Exception e) {
-       // OK
-     }
-@@ -194,7 +194,7 @@ public class LZ4Test extends AbstractLZ4Test {
- 	// decompression dest is too small
- 	try {
- 	  tester.decompress(decompressor, compressed, 0, restored, 0, len - 1);
--	  fail();
-+	  org.junit.Assert.fail();
- 	} catch (LZ4Exception e) {
- 	  // OK
- 	}
-@@ -204,7 +204,7 @@ public class LZ4Test extends AbstractLZ4Test {
-       final T restored2 = tester.allocate(len+1);
-       try {
- 	final int cpLen = tester.decompress(decompressor, compressed, 0, restored2, 0, len + 1);
--	fail("compressedLen=" + cpLen);
-+	org.junit.Assert.fail("compressedLen=" + cpLen);
-       } catch (LZ4Exception e) {
- 	// OK
-       }
-@@ -212,17 +212,17 @@ public class LZ4Test extends AbstractLZ4Test {
-       // try decompression when only the size of the compressed buffer is known
-       if (len > 0) {
- 	tester.fill(restored, randomByte());
--	assertEquals(len, tester.decompress(decompressor2, compressed, 0, compressedLen, restored, 0, len));
--	assertArrayEquals(Arrays.copyOfRange(data, off, off + len), tester.copyOf(restored, 0, len));
-+	org.junit.Assert.assertEquals(len, tester.decompress(decompressor2, compressed, 0, compressedLen, restored, 0, len));
-+	org.junit.Assert.assertArrayEquals(Arrays.copyOfRange(data, off, off + len), tester.copyOf(restored, 0, len));
- 	tester.fill(restored, randomByte());
-       } else {
--	assertEquals(0, tester.decompress(decompressor2, compressed, 0, compressedLen, tester.allocate(1), 0, 1));
-+        org.junit.Assert.assertEquals(0, tester.decompress(decompressor2, compressed, 0, compressedLen, tester.allocate(1), 0, 1));
-       }
- 
-       // over-estimated compressed length
-       try {
- 	final int decompressedLen = tester.decompress(decompressor2, compressed, 0, compressedLen + 1, tester.allocate(len + 100), 0, len + 100);
--	fail("decompressedLen=" + decompressedLen);
-+	org.junit.Assert.fail("decompressedLen=" + decompressedLen);
-       } catch (LZ4Exception e) {
- 	// OK
-       }
-@@ -231,7 +231,7 @@ public class LZ4Test extends AbstractLZ4Test {
-       try {
- 	final int decompressedLen = tester.decompress(decompressor2, compressed, 0, compressedLen - 1, tester.allocate(len + 100), 0, len + 100);
- 	if (!(decompressor2 instanceof LZ4JNISafeDecompressor)) {
--	  fail("decompressedLen=" + decompressedLen);
-+        org.junit.Assert.fail("decompressedLen=" + decompressedLen);
- 	}
-       } catch (LZ4Exception e) {
- 	// OK
-@@ -307,7 +307,7 @@ public class LZ4Test extends AbstractLZ4Test {
-       try {
-         // it is invalid to end with a match, should be at least 5 literals
-         decompressor.decompress(invalid, 0, new byte[decompressedLength], 0, decompressedLength);
--        assertTrue(decompressor.toString(), false);
-+        org.junit.Assert.assertTrue(decompressor.toString(), false);
-       } catch (LZ4Exception e) {
-         // OK
-       }
-@@ -317,7 +317,7 @@ public class LZ4Test extends AbstractLZ4Test {
-       try {
-         // it is invalid to end with a match, should be at least 5 literals
-         decompressor.decompress(invalid, 0, invalid.length, new byte[20], 0);
--        assertTrue(false);
-+        org.junit.Assert.assertTrue(false);
-       } catch (LZ4Exception e) {
-         // OK
-       }
-@@ -337,7 +337,7 @@ public class LZ4Test extends AbstractLZ4Test {
-         try {
-           // it is invalid to end with a match, should be at least 5 literals
-           decompressor.decompress(invalid, 0, new byte[20], 0, 20);
--          assertTrue(decompressor.toString(), false);
-+          org.junit.Assert.assertTrue(decompressor.toString(), false);
-         } catch (LZ4Exception e) {
-           // OK
-         }
-@@ -347,7 +347,7 @@ public class LZ4Test extends AbstractLZ4Test {
-         try {
-           // it is invalid to end with a match, should be at least 5 literals
-           decompressor.decompress(invalid, 0, invalid.length, new byte[20], 0);
--          assertTrue(false);
-+          org.junit.Assert.assertTrue(false);
-         } catch (LZ4Exception e) {
-           // OK
-         }
-@@ -362,7 +362,7 @@ public class LZ4Test extends AbstractLZ4Test {
-       ByteBuffer out = Tester.BYTE_BUFFER.allocate(100).asReadOnlyBuffer();
-       try {
-         compressor.compress(in, out);
--        fail();
-+        org.junit.Assert.fail();
-       } catch (ReadOnlyBufferException e) {
-         // ok
-       }
-@@ -372,7 +372,7 @@ public class LZ4Test extends AbstractLZ4Test {
-       ByteBuffer out = Tester.BYTE_BUFFER.allocate(100).asReadOnlyBuffer();
-       try {
-         decompressor.decompress(in, out);
--        fail();
-+        org.junit.Assert.fail();
-       } catch (ReadOnlyBufferException e) {
-         // ok
-       }
-@@ -383,7 +383,7 @@ public class LZ4Test extends AbstractLZ4Test {
-       out.limit(2);
-       try {
-         decompressor.decompress(in, out);
--        fail();
-+        org.junit.Assert.fail();
-       } catch (ReadOnlyBufferException e) {
-         // ok
-       }
-@@ -486,7 +486,7 @@ public class LZ4Test extends AbstractLZ4Test {
-       }
-       final Sequence sequence1 = readSequence(expected, off);
-       final Sequence sequence2 = readSequence(actual, off);
--      assertEquals(message + ", off=" + off + ", decompressedOff=" + decompressedOff, sequence1, sequence2);
-+      org.junit.Assert.assertEquals(message + ", off=" + off + ", decompressedOff=" + decompressedOff, sequence1, sequence2);
-       off += sequence1.length;
-       decompressedOff += sequence1.literalLen + sequence1.matchLen;
-     }
diff --git a/lz4-java.spec b/lz4-java.spec
index 0c25295..a55ee03 100644
--- a/lz4-java.spec
+++ b/lz4-java.spec
@@ -1,34 +1,21 @@
 # empty debuginfo
 %global debug_package %nil
-
-%global build_opts -Doffline=true -Divy.mode=local -Divysettings.xml=/etc/ivy/ivysettings.xml -Divy.revision=%{version}
+%global lz4_version 1.9.2
 
 Name:          lz4-java
 Version:       1.7.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       LZ4 compression for Java
-# GPL: src/xxhash/bench.c
-# src/lz4/programs
-# BSD: src/xxhash/xxhash.c src/xxhash/xxhash.h
-# src/lz4
-License:       ASL 2.0
-URL:           https://github.com/jpountz/lz4-java
-Source0:       https://github.com/jpountz/lz4-java/archive/%{version}.tar.gz
-
-# From version 1.5 onwards, lz4-java uses lz4 as a submodule
-# lz4-java/src/lz4 -> lz4/lz4
-# lz4-java in particular uses lz4 version 1.9.2
-# Version1:      v1.9.2
-# License:       BSD 2-Clause license (for files in lib) and GPLv2
-# URL:           https://github.com/lz4/lz4
-# Source1:       https://github.com/lz4/lz4/archive/v.1.9.2.tar.gz
-
-# Disable maven-ant-tasks and old aqute-bnd (1.50.x) support
-# Add support for system mvel2
-# Fix doclint/encoding in javadoc task
-Patch0:        0-build.patch
-# Use randomizedtesting <= 2.1.3
-Patch1:        1-junit_Assert.patch
+# GPL:
+# src/lz4/
+# BSD:
+# src/lz4/libs
+License:       ASL 2.0 and (BSD and GPLv2+)
+URL:           https://github.com/lz4/lz4-java
+Source0:       https://github.com/lz4/lz4-java/archive/%{version}.tar.gz
+Source1:       https://github.com/lz4/lz4/archive/v%{lz4_version}.tar.gz
+
+Patch0:        remove-tests.patch
 
 # Build tools
 BuildRequires: ant
@@ -39,18 +26,11 @@ BuildRequires: gcc
 BuildRequires: ivy-local
 BuildRequires: java-devel
 BuildRequires: javapackages-local
-BuildRequires: lz4
 BuildRequires: mvel
 BuildRequires: objectweb-asm
-BuildRequires: randomizedtesting-junit4-ant
-# Other missing build deps
 BuildRequires: bea-stax-api
 BuildRequires: xerces-j2
 BuildRequires: apache-parent
-# https://github.com/jpountz/lz4-java/issues/74
-# lz4 >= r128 is incompatible with lz4-java apparently
-# due to differences in the framing implementation
-Provides:      bundled(lz4) = r122
 # FPC ticket Bundled Library Exception
 # https://fedorahosted.org/fpc/ticket/603
 Provides:      bundled(libxxhash) = r37
@@ -84,28 +64,22 @@ BuildArch:     noarch
 This package contains javadoc for %{name}.
 
 %prep
-
 %setup -q -n %{name}-%{version}
-# Cleanup
-find -name '*.dylib' -print -delete
-find -name '*.so' -print -delete
-
-# Build lz4
-make -C ./src/lz4/
-# make install -C ./src/lz4/
+%setup -T -D -a 1
 
 %patch0 -p1
-%patch1 -p1
 
-# Fix OSGi manifest entries
-echo "Export-Package: net.jpountz.*,!linux.*" >> lz4.bnd
-sed -i '/packages.version/d' lz4.bnd
+mv lz4-1.9.2/* src/lz4/
 
-%build
+# Cleanup
+find -name '*.dylib' -print -delete
+find -name '*.so' -print -delete
 
-ant %build_opts -Divy.pom.version=%{version} jar docs makepom
+cp -p src/lz4/LICENSE lz4_LICENSE
+cp -p src/lz4/lib/LICENSE lz4_lib_LICENSE
 
-# bundle task use old bnd wrap configuration, is not usable
+%build
+ant -Divy.mode=local -Divy.revision=1.7.1 -Divy.pom.version=1.7.1 jar docs makepom
 bnd wrap -p lz4-java.bnd -o dist/lz4-java-%{version}.jar --version %{version} dist/lz4-java.jar
 
 %install
@@ -113,22 +87,18 @@ bnd wrap -p lz4-java.bnd -o dist/lz4-java-%{version}.jar --version %{version} di
 %mvn_artifact dist/lz4-java-%{version}.pom dist/lz4-java-%{version}.jar
 %mvn_install -J build/docs
 
-%ifnarch %{arm} aarch64 ppc64
-# FIXME - tests fail on aarch64 for unknown reason.
-# On armhfp tests are skipped due to poor JVM performance ("Execution
-# time total: 3 hours 37 minutes 14 seconds" ... waste of time)
-%check
-ant %build_opts test
-%endif
-
 %files -f .mfiles
 %doc CHANGES.md README.md
-%license LICENSE.txt ./src/lz4/LICENSE
+%license LICENSE.txt lz4_LICENSE lz4_lib_LICENSE
 
 %files javadoc -f .mfiles-javadoc
 %license LICENSE.txt
 
 %changelog
+* Wed Aug 05 2020 Alex Macdonald <almacdon@redhat.com> 1.7.1-3
+- used commit from Jie Kang's fork of lz4-java to update to upstream 1.7.1
+- this prevents tests from running; eliminates the need for randomizedtesting for f33 onward
+
 * Tue Aug 04 2020 Alex Macdonald <almacdon@redhat.com> 1.7.1-2
 - Included the lz4 submodule inside the lz4-java source tarball
 
diff --git a/remove-tests.patch b/remove-tests.patch
new file mode 100644
index 0000000..a12b749
--- /dev/null
+++ b/remove-tests.patch
@@ -0,0 +1,26 @@
+diff --git a/ivy-pure-java.xml b/ivy-pure-java.xml
+index 6e99e19..58f4c53 100644
+--- a/ivy-pure-java.xml
++++ b/ivy-pure-java.xml
+@@ -19,8 +19,4 @@
+     <conf name="default" />
+     <conf name="test" extends="default" />
+   </configurations>
+-
+-  <dependencies>
+-    <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.7.3" transitive="true" conf="test->*,!sources,!javadoc" />
+-  </dependencies>
+ </ivy-module>
+diff --git a/ivy.xml b/ivy.xml
+index 6643da7..4e3798c 100644
+--- a/ivy.xml
++++ b/ivy.xml
+@@ -19,8 +19,4 @@
+     <conf name="default" />
+     <conf name="test" extends="default" />
+   </configurations>
+-
+-  <dependencies>
+-    <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.7.3" transitive="true" conf="test->*,!sources,!javadoc" />
+-  </dependencies>
+ </ivy-module>
diff --git a/sources b/sources
index 5a74eba..971053e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (1.7.1.tar.gz) = c11dab1fbd4a4585fe1f825a61a25f83f2fd5d47e8458c12cd024d6b9b87f8484dbfd60c21b2739e091c177c888b051f31bc8dd46b58041b2d340d3680e2e683
+SHA512 (1.7.1.tar.gz) = 13fd89a9564f1f504348ce30a51ca22d5581a6661658d55c96f3f0c1e43126de04d2df87683251a8ec5bf53726f529b60bb1ec666863b7e33810df8ed73bb586