Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pom.xml10
-rw-r--r--tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0439repositoryCategories/RepositoryCategoriesTest.java8
-rw-r--r--tycho-its/src/test/java/org/eclipse/tycho/test/product/Util.java15
-rw-r--r--tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java9
4 files changed, 14 insertions, 28 deletions
diff --git a/pom.xml b/pom.xml
index b3d987140..e7da27649 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<junitVersion>3.8.2</junitVersion>
<plexusVersion>1.5.5</plexusVersion>
<plexusInterpolationVersion>1.14</plexusInterpolationVersion>
- <plexusUtilsVersion>3.0.7</plexusUtilsVersion>
+ <plexusUtilsVersion>3.0.20</plexusUtilsVersion>
<securityDispatcherVersion>1.3</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.4</modelloVersion>
@@ -173,19 +173,15 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
- <version>2.0.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>2.2</version>
+ <version>2.10.1</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0439repositoryCategories/RepositoryCategoriesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0439repositoryCategories/RepositoryCategoriesTest.java
index be5b03bf1..cac54a555 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0439repositoryCategories/RepositoryCategoriesTest.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0439repositoryCategories/RepositoryCategoriesTest.java
@@ -11,10 +11,10 @@
package org.eclipse.tycho.test.TYCHO0439repositoryCategories;
import java.io.File;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
import org.apache.maven.it.Verifier;
-import org.codehaus.plexus.archiver.zip.ZipEntry;
-import org.codehaus.plexus.archiver.zip.ZipFile;
import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
import org.junit.Assert;
import org.junit.Test;
@@ -44,8 +44,8 @@ public class RepositoryCategoriesTest extends AbstractTychoIntegrationTest {
Document document = null;
ZipFile contentJar = new ZipFile(content);
try {
- ZipEntry contentXmlEntry = contentJar.getEntry("content.xml");
- document = parser.parse(new XMLIOSource(contentJar.getInputStream(contentXmlEntry)));
+ ZipEntry entry = contentJar.getEntry("content.xml");
+ document = parser.parse(new XMLIOSource(contentJar.getInputStream(entry)));
} finally {
contentJar.close();
}
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/Util.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/Util.java
index 9fef6d3a7..8ebb92962 100644
--- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/Util.java
+++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/Util.java
@@ -12,13 +12,11 @@ package org.eclipse.tycho.test.product;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.util.HashSet;
import java.util.Set;
+import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
-
-import org.codehaus.plexus.archiver.zip.ZipEntry;
-import org.codehaus.plexus.archiver.zip.ZipFile;
+import java.util.zip.ZipFile;
import de.pdark.decentxml.Document;
import de.pdark.decentxml.Element;
@@ -34,13 +32,8 @@ class Util {
XMLParser parser = new XMLParser();
ZipFile zip = new ZipFile(zipFile);
try {
- ZipEntry contentXmlEntry = zip.getEntry(xmlFile);
- InputStream entryStream = zip.getInputStream(contentXmlEntry);
- try {
- return parser.parse(new XMLIOSource(entryStream));
- } finally {
- entryStream.close();
- }
+ ZipEntry entry = zip.getEntry(xmlFile);
+ return parser.parse(new XMLIOSource(zip.getInputStream(entry)));
} finally {
zip.close();
}
diff --git a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java
index bca1c0eb8..7164d66d1 100644
--- a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java
+++ b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java
@@ -26,6 +26,7 @@ import org.apache.maven.project.MavenProjectHelper;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.tar.TarArchiver;
+import org.codehaus.plexus.archiver.tar.TarArchiver.TarCompressionMethod;
import org.codehaus.plexus.archiver.tar.TarLongFileMode;
import org.eclipse.tycho.core.shared.TargetEnvironment;
import org.eclipse.tycho.plugins.tar.TarGzArchiver;
@@ -95,13 +96,9 @@ public final class ProductArchiverMojo extends AbstractProductMojo {
productArchivers.put(TAR_GZ_ARCHIVE_FORMAT, new ProductArchiver() {
@Override
Archiver getArchiver() throws ArchiverException {
- TarArchiver.TarCompressionMethod tarCompressionMethod = new TarArchiver.TarCompressionMethod();
- tarCompressionMethod.setValue("gzip"); // surprisingly, compression names are private in plexus
- tarArchiver.setCompression(tarCompressionMethod);
+ tarArchiver.setCompression(TarCompressionMethod.gzip);
// avoid lots of long file path (> 100 chars) warnings
- TarLongFileMode gnuMode = new TarLongFileMode();
- gnuMode.setValue(TarLongFileMode.GNU);
- tarArchiver.setLongfile(gnuMode);
+ tarArchiver.setLongfile(TarLongFileMode.gnu);
return tarArchiver;
}
});

Back to the top