[plexus-archiver] 22/44: Depend on libplexus-io-java (>= 3.0) and patched the incompatibilities
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jul 20 23:30:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository plexus-archiver.
commit cb7d826cfe91fbbc103746ddd08e00521410a95b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jul 20 12:53:12 2017 +0200
Depend on libplexus-io-java (>= 3.0) and patched the incompatibilities
---
debian/changelog | 2 +-
debian/control | 2 +-
debian/patches/01-plexus-io-compatibility.patch | 265 ++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 268 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 71828a0..65f0327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ plexus-archiver (3.0-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
- - Depend on libplexus-io-java (>= 2.4) and removed the plexus-io patch
+ - Depend on libplexus-io-java (>= 3.0) and patched the incompatibilities
- New dependency on libsnappy-java and libcommons-compress-java
- New build dependency on libplexus-component-metadata-java and junit4
- Depend on libplexus-utils2-java instead of libplexus-utils-java
diff --git a/debian/control b/debian/control
index 1bbeebe..e10a723 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends-Indep: junit4,
libcommons-compress-java (>= 1.9),
libplexus-component-metadata-java,
libplexus-containers-java,
- libplexus-io-java (>= 2.4),
+ libplexus-io-java (>= 3.0),
libplexus-utils2-java,
libsnappy-java,
maven-debian-helper (>= 2.2)
diff --git a/debian/patches/01-plexus-io-compatibility.patch b/debian/patches/01-plexus-io-compatibility.patch
new file mode 100644
index 0000000..273d61a
--- /dev/null
+++ b/debian/patches/01-plexus-io-compatibility.patch
@@ -0,0 +1,265 @@
+Description: Fixes the compatibility issues with the version of plexus-io in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/main/java/org/codehaus/plexus/archiver/bzip2/PlexusIoBzip2ResourceCollection.java
++++ b/src/main/java/org/codehaus/plexus/archiver/bzip2/PlexusIoBzip2ResourceCollection.java
+@@ -6,7 +6,7 @@
+ import java.io.InputStream;
+ import java.util.HashMap;
+
+-import org.codehaus.plexus.components.io.attributes.Java7FileAttributes;
++import org.codehaus.plexus.components.io.attributes.FileAttributes;
+ import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+ import org.codehaus.plexus.components.io.resources.PlexusIoCompressedFileResourceCollection;
+ import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
+@@ -42,7 +42,7 @@
+
+
+ @Override protected PlexusIoResourceAttributes getAttributes(File file) throws IOException {
+- return new Java7FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
++ return new FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
+ }
+
+ protected String getDefaultExtension()
+--- a/src/main/java/org/codehaus/plexus/archiver/gzip/PlexusIoGzipResourceCollection.java
++++ b/src/main/java/org/codehaus/plexus/archiver/gzip/PlexusIoGzipResourceCollection.java
+@@ -7,7 +7,7 @@
+ import java.util.HashMap;
+ import java.util.zip.GZIPInputStream;
+
+-import org.codehaus.plexus.components.io.attributes.Java7FileAttributes;
++import org.codehaus.plexus.components.io.attributes.FileAttributes;
+ import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+ import org.codehaus.plexus.components.io.resources.PlexusIoCompressedFileResourceCollection;
+ import org.codehaus.plexus.util.IOUtil;
+@@ -45,6 +45,6 @@
+ }
+
+ @Override protected PlexusIoResourceAttributes getAttributes(File file) throws IOException {
+- return new Java7FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
++ return new FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
+ }
+ }
+--- a/src/main/java/org/codehaus/plexus/archiver/snappy/PlexusIoSnappyResourceCollection.java
++++ b/src/main/java/org/codehaus/plexus/archiver/snappy/PlexusIoSnappyResourceCollection.java
+@@ -1,6 +1,6 @@
+ package org.codehaus.plexus.archiver.snappy;
+
+-import org.codehaus.plexus.components.io.attributes.Java7FileAttributes;
++import org.codehaus.plexus.components.io.attributes.FileAttributes;
+ import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+ import org.codehaus.plexus.components.io.resources.PlexusIoCompressedFileResourceCollection;
+ import org.codehaus.plexus.util.IOUtil;
+@@ -40,7 +40,7 @@
+
+
+ @Override protected PlexusIoResourceAttributes getAttributes(File file) throws IOException {
+- return new Java7FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
++ return new FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
+ }
+
+ protected String getDefaultExtension()
+--- a/src/test/java/org/codehaus/plexus/archiver/util/ArchiveEntryUtilsTest.java
++++ b/src/test/java/org/codehaus/plexus/archiver/util/ArchiveEntryUtilsTest.java
+@@ -4,8 +4,7 @@
+ import java.io.IOException;
+ import java.util.HashMap;
+
+-import org.codehaus.plexus.components.io.attributes.Java7FileAttributes;
+-import org.codehaus.plexus.components.io.attributes.Java7Reflector;
++import org.codehaus.plexus.components.io.attributes.FileAttributes;
+ import org.codehaus.plexus.logging.console.ConsoleLogger;
+
+ import junit.framework.TestCase;
+@@ -24,7 +23,7 @@
+
+ public void testChmodWithJava7() throws Exception
+ {
+- if (!Java7Reflector.isAtLeastJava7()) return; // Require at least java7
++ if (false) return; // Require at least java7
+ if ( Os.isFamily( Os.FAMILY_WINDOWS )) return;
+
+
+@@ -34,7 +33,7 @@
+ }
+
+ private void assert0770(File temp) throws IOException {
+- Java7FileAttributes j7 = new Java7FileAttributes(temp, new HashMap<Integer, String>(), new HashMap<Integer, String>());
++ FileAttributes j7 = new FileAttributes(temp, new HashMap<Integer, String>(), new HashMap<Integer, String>());
+ assertTrue(j7.isGroupExecutable());
+ assertTrue(j7.isGroupReadable());
+ assertTrue(j7.isGroupWritable());
+--- a/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java
++++ b/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java
+@@ -38,7 +38,7 @@
+ import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet;
+ import org.codehaus.plexus.archiver.util.DefaultFileSet;
+ import org.codehaus.plexus.archiver.util.Streams;
+-import org.codehaus.plexus.components.io.attributes.Java7FileAttributes;
++import org.codehaus.plexus.components.io.attributes.FileAttributes;
+ import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils;
+ import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+ import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
+@@ -500,7 +500,7 @@
+ zipUnArchiver.setDestFile( output );
+ zipUnArchiver.extract();
+ File symDir = new File( "target/output/unzipped/plexus/src/symDir" );
+- PlexusIoResourceAttributes fa = Java7FileAttributes.uncached( symDir );
++ PlexusIoResourceAttributes fa = FileAttributes.uncached( symDir );
+ assertTrue( fa.isSymbolicLink() );
+ }
+
+@@ -522,7 +522,7 @@
+ zipUnArchiver.setDestFile( output );
+ zipUnArchiver.extract();
+ File symDir = new File( output, "bzz/symDir" );
+- PlexusIoResourceAttributes fa = Java7FileAttributes.uncached( symDir );
++ PlexusIoResourceAttributes fa = FileAttributes.uncached( symDir );
+ assertTrue( fa.isSymbolicLink() );
+ }
+
+--- a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
+@@ -40,7 +40,6 @@
+ import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
+ import org.codehaus.plexus.archiver.util.FilterSupport;
+ import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+-import org.codehaus.plexus.components.io.attributes.Java7Reflector;
+ import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+ import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
+ import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResourceCollection;
+@@ -328,7 +327,7 @@
+
+ private boolean isSymlinkSupported()
+ {
+- return Os.isFamily( Os.FAMILY_UNIX ) && Java7Reflector.isAtLeastJava7();
++ return Os.isFamily( Os.FAMILY_UNIX );
+ }
+
+ public void addFile( @Nonnull final File inputFile, @Nonnull final String destFileName )
+--- a/src/main/java/org/codehaus/plexus/archiver/resources/PlexusIoVirtualFileResource.java
++++ b/src/main/java/org/codehaus/plexus/archiver/resources/PlexusIoVirtualFileResource.java
+@@ -21,8 +21,7 @@
+ import java.io.InputStream;
+ import java.net.URL;
+
+-import org.codehaus.plexus.components.io.attributes.Java7AttributeUtils;
+-import org.codehaus.plexus.components.io.attributes.Java7Reflector;
++import org.codehaus.plexus.components.io.attributes.AttributeUtils;
+ import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+ import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
+ import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResource;
+@@ -104,8 +103,8 @@
+ public long getLastModified()
+ {
+ if (file.exists()) {
+- if (Java7Reflector.isAtLeastJava7()) {
+- return Java7AttributeUtils.getLastModified(getFile());
++ if (true) {
++ return AttributeUtils.getLastModified(getFile());
+ } else {
+ return getFile().lastModified();
+ }
+@@ -115,4 +114,4 @@
+ @Override public boolean isSymbolicLink() {
+ return getAttributes().isSymbolicLink();
+ }
+-}
+\ No newline at end of file
++}
+--- a/src/main/java/org/codehaus/plexus/archiver/util/ArchiveEntryUtils.java
++++ b/src/main/java/org/codehaus/plexus/archiver/util/ArchiveEntryUtils.java
+@@ -16,8 +16,7 @@
+ * limitations under the License.
+ */
+ import org.codehaus.plexus.archiver.ArchiverException;
+-import org.codehaus.plexus.components.io.attributes.Java7AttributeUtils;
+-import org.codehaus.plexus.components.io.attributes.Java7Reflector;
++import org.codehaus.plexus.components.io.attributes.AttributeUtils;
+ import org.codehaus.plexus.logging.Logger;
+ import org.codehaus.plexus.util.Os;
+ import org.codehaus.plexus.util.cli.CommandLineException;
+@@ -68,11 +67,11 @@
+ return;
+ }
+
+- if (Java7Reflector.isAtLeastJava7())
++ if (true)
+ {
+ try
+ {
+- Java7AttributeUtils.chmod(file, mode);
++ AttributeUtils.chmod(file, mode);
+ return;
+ } catch (IOException e)
+ {
+--- a/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java
++++ b/src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java
+@@ -63,4 +63,9 @@
+ }
+ };
+ }
++
++ public boolean isConcurrentAccessSupported()
++ {
++ return false;
++ }
+ }
+--- a/src/main/java/org/codehaus/plexus/archiver/zip/PlexusIoZipFileResourceCollection.java
++++ b/src/main/java/org/codehaus/plexus/archiver/zip/PlexusIoZipFileResourceCollection.java
+@@ -48,4 +48,9 @@
+ }
+ };
+ }
++
++ public boolean isConcurrentAccessSupported()
++ {
++ return false;
++ }
+ }
+--- a/src/test/java/org/codehaus/plexus/archiver/tar/TarFileAttributesTest.java
++++ b/src/test/java/org/codehaus/plexus/archiver/tar/TarFileAttributesTest.java
+@@ -10,7 +10,6 @@
+ import org.codehaus.plexus.archiver.Archiver;
+ import org.codehaus.plexus.archiver.UnArchiver;
+ import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet;
+-import org.codehaus.plexus.components.io.attributes.Java7Reflector;
+ import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils;
+ import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+ import org.codehaus.plexus.util.FileUtils;
+@@ -139,7 +138,7 @@
+ PlexusIoResourceAttributes fileAttributes =
+ PlexusIoResourceAttributeUtils.getFileAttributes( new File( tempTarDir, tempFile.getName() ) );
+
+- final int expected = Java7Reflector.isAtLeastJava7() ? 0660 : 0644;
++ final int expected = true ? 0660 : 0644;
+
+ assertEquals( "This test will fail if your umask is not X2X (or more)",
+ expected, fileAttributes.getOctalMode() );
+@@ -202,7 +201,7 @@
+
+ fileAttributes = PlexusIoResourceAttributeUtils.getFileAttributes( new File( tempTarDir, tempFile.getName() ) );
+
+- final int expected = Java7Reflector.isAtLeastJava7() ? 0440 : 0444;
++ final int expected = true ? 0440 : 0444;
+
+ assertEquals( "This test will fail if your umask is not X2X (or more)",
+ expected, fileAttributes.getOctalMode() );
+@@ -267,7 +266,7 @@
+ PlexusIoResourceAttributes fileAttributes =
+ PlexusIoResourceAttributeUtils.getFileAttributes( new File( tempTarDir, tempFile.getName() ) );
+
+- final int expected = Java7Reflector.isAtLeastJava7() ? 0660 : 0644;
++ final int expected = true ? 0660 : 0644;
+
+ assertEquals( "This test will fail if your umask is not X2X (or more)",
+ expected, fileAttributes.getOctalMode() );
+@@ -333,7 +332,7 @@
+ PlexusIoResourceAttributes fileAttributes =
+ PlexusIoResourceAttributeUtils.getFileAttributes( new File( tempTarDir, tempFile.getName() ) );
+
+- final int expected = Java7Reflector.isAtLeastJava7() ? 0660 : 0644;
++ final int expected = true ? 0660 : 0644;
+ assertEquals( "This test will fail if your umask is not X2X (or more)",
+ expected, fileAttributes.getOctalMode() );
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e631fd7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-plexus-io-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-archiver.git
More information about the pkg-java-commits
mailing list