[tycho] 01/12: Revert changes made by Christopher Hoskin on master and move them to the
Markus Koschany
apo at moszumanska.debian.org
Sat Sep 2 01:49:47 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository tycho.
commit a562016337e5d6873d2cf5fc442d6dfd0da40962
Author: Markus Koschany <apo at debian.org>
Date: Sat Sep 2 02:18:13 2017 +0200
Revert changes made by Christopher Hoskin on master and move them to the
experimental branch
---
debian/changelog | 1 -
debian/control | 2 +-
debian/libtycho-java.poms | 2 +-
debian/maven.ignoreRules | 8 +--
debian/patches/fix-sonatype-bug.patch | 15 -----
debian/patches/series | 1 -
debian/patches/testing-harness.patch | 107 ----------------------------------
debian/rules | 6 +-
8 files changed, 9 insertions(+), 133 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dcb4412..03e05b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,6 @@ tycho (0.25.0-2) UNRELEASED; urgency=medium
* Update fix-sonatype-bug.patch to add missing version to tycho-core dependency
* Set --no-unapply-patches to avoid unapplying patches before mh_unpatchpoms
(run debclean && quilt pop -a to clean)
- * Build with tests (currently failing)
-- Emmanuel Bourg <ebourg at apache.org> Tue, 10 Jan 2017 14:51:11 +0100
diff --git a/debian/control b/debian/control
index 19cb89e..6c4df82 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends:
libmaven-resources-plugin-java,
libmaven-site-plugin-java,
libmaven-source-plugin-java,
- libmaven-verifier-java (>= 1.6),
+ libmaven-verifier-java,
libmockito-java,
libplexus-compiler-java (>=2.0),
libplexus-component-metadata-java (>=1.5),
diff --git a/debian/libtycho-java.poms b/debian/libtycho-java.poms
index 6ff27ed..6aa418b 100644
--- a/debian/libtycho-java.poms
+++ b/debian/libtycho-java.poms
@@ -76,7 +76,7 @@ tycho-p2/tycho-p2-plugin/pom.xml --has-package-version --java-lib
tycho-compiler-jdt/pom.xml --has-package-version --java-lib
tycho-compiler-plugin/pom.xml --has-package-version --java-lib
-tycho-testing-harness/pom.xml --has-package-version
+tycho-testing-harness/pom.xml --has-package-version --ignore
tycho-source-plugin/pom.xml --has-package-version --ignore
tycho-pomgenerator-plugin/pom.xml --has-package-version --ignore
tycho-surefire/pom.xml --has-package-version --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 9dbf82f..bb7ec37 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -19,7 +19,7 @@ org.sonatype.plugins maven-properties-plugin * * * *
org.fedoraproject.p2 xmvn-p2-installer-plugin * * * *
-##THESE ARE TO SKIP TESTS
-#org.eclipse.tycho tycho-testing-harness * * * *
-#org.fedoraproject.p2 org.fedoraproject.p2.tests * * * *
-#* * * * * test
+#THESE ARE TO SKIP TESTS
+org.eclipse.tycho tycho-testing-harness * * * *
+org.fedoraproject.p2 org.fedoraproject.p2.tests * * * *
+* * * * * test
diff --git a/debian/patches/fix-sonatype-bug.patch b/debian/patches/fix-sonatype-bug.patch
index 9668524..a7699b7 100644
--- a/debian/patches/fix-sonatype-bug.patch
+++ b/debian/patches/fix-sonatype-bug.patch
@@ -22,18 +22,3 @@ Last-Update: 2017-07-18
</dependency>
</dependencies>
---- a/tycho-testing-harness/pom.xml
-+++ b/tycho-testing-harness/pom.xml
-@@ -63,6 +63,12 @@
- <artifactId>org.eclipse.tycho.core.shared</artifactId>
- <version>${project.version}</version>
- </dependency>
-+ <dependency>
-+ <groupId>org.sonatype.aether</groupId>
-+ <artifactId>aether-util</artifactId>
-+ <version>debian</version>
-+ </dependency>
-+
- </dependencies>
-
- <build>
diff --git a/debian/patches/series b/debian/patches/series
index 0329dd8..7632e85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-testing-harness.patch
eclipse-bootstrap.patch
fix-osgi-runtime.patch
fedora-project.patch
diff --git a/debian/patches/testing-harness.patch b/debian/patches/testing-harness.patch
deleted file mode 100644
index a7e2bd8..0000000
--- a/debian/patches/testing-harness.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/AbstractTychoMojoTestCase.java
-+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/AbstractTychoMojoTestCase.java
-@@ -37,7 +37,7 @@
- import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
- import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
- import org.codehaus.plexus.util.xml.Xpp3Dom;
--import org.sonatype.aether.util.DefaultRepositorySystemSession;
-+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
-
- public class AbstractTychoMojoTestCase extends AbstractMojoTestCase {
-
-@@ -144,7 +144,8 @@
- protected MavenSession newMavenSession(MavenProject project, List<MavenProject> projects) throws Exception {
- MavenExecutionRequest request = newMavenExecutionRequest(new File(project.getBasedir(), "pom.xml"));
- MavenExecutionResult result = new DefaultMavenExecutionResult();
-- DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
-+
-+ org.eclipse.aether.DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
- MavenSession session = new MavenSession(getContainer(), repositorySession, request, result);
- session.setProjects(projects);
- session.setCurrentProject(project);
---- 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
-@@ -21,7 +21,7 @@
- import java.io.StringWriter;
-
- import org.apache.maven.it.Verifier;
--import org.apache.maven.it.util.DirectoryScanner;
-+import org.apache.maven.shared.utils.io.DirectoryScanner;
- import org.codehaus.plexus.util.FileUtils;
- import org.codehaus.plexus.util.IOUtil;
- import org.eclipse.tycho.test.util.EnvironmentUtil;
---- a/tycho-core/src/test/java/org/eclipse/tycho/core/test/LocalDependencyResolverTest.java
-+++ b/tycho-core/src/test/java/org/eclipse/tycho/core/test/LocalDependencyResolverTest.java
-@@ -31,7 +31,7 @@
- import org.eclipse.tycho.core.osgitools.DefaultReactorProject;
- import org.eclipse.tycho.core.osgitools.targetplatform.LocalDependencyResolver;
- import org.eclipse.tycho.testing.AbstractTychoMojoTestCase;
--import org.sonatype.aether.util.DefaultRepositorySystemSession;
-+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
-
- public class LocalDependencyResolverTest extends AbstractTychoMojoTestCase {
- public void testBundleIdParsing() throws Exception {
-@@ -53,7 +53,7 @@
- MavenExecutionRequest request = new DefaultMavenExecutionRequest();
- request.setLocalRepository(new StubArtifactRepository(location.getAbsolutePath()));
- MavenExecutionResult result = new DefaultMavenExecutionResult();
-- DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
-+ org.eclipse.aether.DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
- MavenSession session = new MavenSession(getContainer(), repositorySession, request, result);
- session.setProjects(new ArrayList<MavenProject>());
- lookup(LegacySupport.class).setSession(session);
---- a/tycho-core/src/test/java/org/eclipse/tycho/core/test/ArtifactDependencyWalkerTest.java
-+++ b/tycho-core/src/test/java/org/eclipse/tycho/core/test/ArtifactDependencyWalkerTest.java
-@@ -34,7 +34,7 @@
- import org.eclipse.tycho.core.osgitools.targetplatform.LocalDependencyResolver;
- import org.eclipse.tycho.model.ProductConfiguration;
- import org.eclipse.tycho.testing.AbstractTychoMojoTestCase;
--import org.sonatype.aether.util.DefaultRepositorySystemSession;
-+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
-
- public class ArtifactDependencyWalkerTest extends AbstractTychoMojoTestCase {
- public void testProductDepdendencies() throws Exception {
-@@ -95,7 +95,7 @@
- MavenExecutionRequest request = new DefaultMavenExecutionRequest();
- request.setLocalRepository(new StubArtifactRepository(System.getProperty("java.io.tmpdir")));
- MavenExecutionResult result = new DefaultMavenExecutionResult();
-- DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
-+ org.eclipse.aether.DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
- MavenSession session = new MavenSession(getContainer(), repositorySession, request, result);
- session.setProjects(new ArrayList<MavenProject>());
- lookup(LegacySupport.class).setSession(session);
---- a/tycho-packaging-plugin/src/test/java/org/eclipse/tycho/buildnumber/test/PackageFeatureMojoTest.java
-+++ b/tycho-packaging-plugin/src/test/java/org/eclipse/tycho/buildnumber/test/PackageFeatureMojoTest.java
-@@ -17,7 +17,7 @@
- import java.util.zip.ZipFile;
-
- import org.apache.maven.execution.MavenSession;
--import org.apache.maven.it.util.IOUtil;
-+import org.codehaus.plexus.util.IOUtil;
- import org.apache.maven.project.MavenProject;
- import org.eclipse.tycho.model.Feature;
- import org.eclipse.tycho.packaging.PackageFeatureMojo;
---- a/tycho-packaging-plugin/pom.xml
-+++ b/tycho-packaging-plugin/pom.xml
-@@ -79,6 +79,10 @@
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- </dependency>
-+ <dependency>
-+ <groupId>org.codehaus.plexus</groupId>
-+ <artifactId>plexus-utils</artifactId>
-+ </dependency>
- </dependencies>
-
- <build>
---- a/tycho-packaging-plugin/src/test/java/org/eclipse/tycho/buildnumber/test/PackageUpdateSiteMojoTest.java
-+++ b/tycho-packaging-plugin/src/test/java/org/eclipse/tycho/buildnumber/test/PackageUpdateSiteMojoTest.java
-@@ -19,7 +19,7 @@
- import junit.framework.Assert;
-
- import org.apache.maven.artifact.Artifact;
--import org.apache.maven.it.util.FileUtils;
-+import org.codehaus.plexus.util.FileUtils;
- import org.apache.maven.project.MavenProject;
- import org.eclipse.tycho.packaging.PackageUpdateSiteMojo;
- import org.eclipse.tycho.testing.AbstractTychoMojoTestCase;
diff --git a/debian/rules b/debian/rules
index eefc41d..80805e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,10 +21,10 @@ override_dh_auto_configure:
./debian/eclipse-bootstrap.sh $(CURDIR)
dh_auto_configure
-#override_dh_auto_build:
-# dh_auto_build -- package -Dmaven.test.skip=true
+override_dh_auto_build:
+ dh_auto_build -- package -Dmaven.test.skip=true
-#override_dh_auto_test:
+override_dh_auto_test:
override_dh_auto_install:
dh_auto_install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tycho.git
More information about the pkg-java-commits
mailing list