commit 389b9b86dd163d9281ff513c971e54980751432d
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Thu Oct 2 12:14:02 2014 -0400
Update to build against plexus-archiver 2.6.
tycho-fix-build.patch | 35 +++++++++++++++++++++++++++++++++--
tycho.spec | 15 ++++++++++++++-
2 files changed, 47 insertions(+), 3 deletions(-)
---
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index 36a5fa1..c6d15a5 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -1,4 +1,4 @@
-From f515e677ed605c6fe02842334de19304b8497144 Mon Sep 17 00:00:00 2001
+From bdadf5704a5459c0fb42334c66d617015eab19ea Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400
Subject: [PATCH] Fix the Tycho build to work on Fedora.
@@ -18,6 +18,8 @@ Update to using Jetty 9 API.
Add support for compact profiles (
http://openjdk.java.net/jeps/161).
+Update to using plexus-archiver 2.6.
+
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
---
.../META-INF/MANIFEST.MF | 2 +-
@@ -27,8 +29,9 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
.../tycho-standalone-p2-director/p2 Director.product | 1 -
.../src/main/java/org/eclipse/tycho/core/ee/EEVersion.java | 13 ++++++++++++-
.../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++-
+ .../tycho/plugins/p2/director/ProductArchiverMojo.java | 9 +++------
.../eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
- 8 files changed, 28 insertions(+), 14 deletions(-)
+ 9 files changed, 31 insertions(+), 20 deletions(-)
diff --git
a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
index f59f155..6d3813b 100644
@@ -154,6 +157,34 @@ index 4cc937c..59335b9 100644
validateUniqueBaseDirs(projects);
}
+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 6a5c967..957b737 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.facade.TargetEnvironment;
+ import org.eclipse.tycho.plugins.tar.TarGzArchiver;
+@@ -98,13 +99,9 @@ public final class ProductArchiverMojo extends AbstractProductMojo {
+ productArchivers.put("tar.gz", 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;
+ }
+ });
diff --git
a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
index a8173df..cf2cf57 100644
---
a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
diff --git a/tycho.spec b/tycho.spec
index 67cef4a..18c00a7 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -23,7 +23,7 @@
Name: tycho
Version: 0.21.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with
Maven
Group: Development/Libraries
@@ -208,6 +208,16 @@ sed -i '/^<unit id=.*$/d'
tycho-bundles/tycho-bundles-target/tycho-bundles-targe
# org.hamcrest -> org.hamcrest.core
%pom_xpath_set "pom:requirement[pom:id='org.hamcrest']/pom:id"
"org.hamcrest.core" tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests
+# Build against plexus-archiver 2.6
+pushd tycho-its/src/test/java/org/eclipse/tycho/test/
+for f in TYCHO0439repositoryCategories/RepositoryCategoriesTest.java \
+ product/Util.java; do
+sed -i
's/org.codehaus.plexus.archiver.zip.ZipEntry/org.apache.commons.compress.archivers.zip.ZipArchiveEntry/g
+
s/org.codehaus.plexus.archiver.zip.ZipFile/org.apache.commons.compress.archivers.zip.ZipFile/g
+ s/ZipEntry/ZipArchiveEntry/g' $f
+done
+popd
+
# we don't have org.apache.commons:commons-compress:jar:sources
%pom_xpath_remove "pom:dependency[pom:classifier='sources' and
pom:artifactId='commons-compress']" tycho-p2/tycho-p2-director-plugin
@@ -403,6 +413,9 @@ ln -s %{_javadir}/%{name}/org.fedoraproject.p2.jar
%{buildroot}%{_datadir}/xmvn/
%{_javadocdir}/%{name}
%changelog
+* Thu Oct 02 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-15
+- Update to build against plexus-archiver 2.6.
+
* Thu Sep 25 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.21.0-14
- fedoraproject-p2: Fix requires generation bug