[tycho] Fix hamcrest library issues in bootstrapped/non-bootstrapped builds.
Roland Grunberg
rgrunber at fedoraproject.org
Wed Apr 17 19:54:26 UTC 2013
commit 48f67805c35e0872d8bb250cf5723f78ae44ac38
Author: Roland Grunberg <rgrunber at redhat.com>
Date: Tue Apr 16 10:22:48 2013 -0400
Fix hamcrest library issues in bootstrapped/non-bootstrapped builds.
tycho-fix-bootstrap-build.patch | 109 +--------------------------------
tycho-fix-build.patch | 127 ++++++---------------------------------
2 files changed, 20 insertions(+), 216 deletions(-)
---
diff --git a/tycho-fix-bootstrap-build.patch b/tycho-fix-bootstrap-build.patch
index 46b80c7..8007f6b 100644
--- a/tycho-fix-bootstrap-build.patch
+++ b/tycho-fix-bootstrap-build.patch
@@ -1,4 +1,4 @@
-From 6716c4da7fb5fae69f35ebfe72b23ed2e40899f1 Mon Sep 17 00:00:00 2001
+From 58236a7ae06bbc09625398d6a4b369f7f74d57b3 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber at redhat.com>
Date: Mon, 19 Nov 2012 10:33:43 -0500
Subject: [PATCH] Minor fixes of limited scope to get a Tycho bootstrapped
@@ -18,52 +18,12 @@ the same.
Change-Id: Ib8f471e5df40eb06da4f2d4ca6c2d3ab14f5dc99
---
- .../repository/local/TemporaryLocalMavenRepository.java | 6 +++++-
- .../tycho/p2/resolver/ProjectorResolutionStrategyTest.java | 4 ++--
.../main/java/org/eclipse/tycho/test/util/HttpServer.java | 5 ++---
- .../main/java/org/eclipse/tycho/test/util/LogVerifier.java | 4 ++--
- .../src/main/java/org/eclipse/tycho/test/util/P2Context.java | 8 +++++++-
- .../main/java/org/eclipse/tycho/test/util/TychoMatchers.java | 5 ++---
.../tycho-bundles-target/tycho-bundles-target.target | 12 ++++++------
.../java/org/eclipse/tycho/core/osgitools/OsgiManifest.java | 12 ++++++------
tycho-surefire/pom.xml | 2 +-
- 9 files changed, 33 insertions(+), 25 deletions(-)
+ 4 files changed, 15 insertions(+), 16 deletions(-)
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java
-index c344056..40c5fc0 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java
-@@ -53,7 +53,11 @@ public class TemporaryLocalMavenRepository extends ExternalResource {
-
- public File getLocalRepositoryRoot() {
- if (repoRoot == null) {
-- repoRoot = tempManager.newFolder("repository");
-+ try {
-+ repoRoot = tempManager.newFolder("repository");
-+ } catch (IOException e) {
-+ throw new RuntimeException(e);
-+ }
- }
- return repoRoot;
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java
-index ee27774..e39ae93 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java
-@@ -11,11 +11,11 @@
-
- package org.eclipse.tycho.p2.resolver;
-
-+import static org.hamcrest.CoreMatchers.containsString;
-+import static org.hamcrest.CoreMatchers.hasItem;
- import static org.hamcrest.core.Is.is;
- import static org.junit.Assert.assertThat;
- import static org.junit.Assert.fail;
--import static org.junit.internal.matchers.IsCollectionContaining.hasItem;
--import static org.junit.matchers.JUnitMatchers.containsString;
-
- import java.util.ArrayList;
- import java.util.Collection;
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java
index 47423e5..4b4c600 100644
--- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java
@@ -89,71 +49,6 @@ index 47423e5..4b4c600 100644
connector.setPort(port);
jetty.addConnector(connector);
-diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java
-index 414d155..e1bae59 100644
---- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java
-+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java
-@@ -70,9 +70,9 @@ public class LogVerifier extends Verifier {
- MemoryLog logger;
-
- boolean expectNoErrors = true;
-- List<Matcher<? extends String>> loggedErrorsMatchers = new ArrayList<Matcher<? extends String>>();
-+ List<Matcher<? super String>> loggedErrorsMatchers = new ArrayList<Matcher<? super String>>();
- boolean expectNoWarnings = false;
-- List<Matcher<? extends String>> loggedWarningsMatchers = new ArrayList<Matcher<? extends String>>();
-+ List<Matcher<? super String>> loggedWarningsMatchers = new ArrayList<Matcher<? super String>>();
-
- MemoryLog getInitializedLogger() {
- if (logger == null) {
-diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java
-index ac34dda..283f9d0 100644
---- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java
-+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java
-@@ -10,6 +10,8 @@
- *******************************************************************************/
- package org.eclipse.tycho.test.util;
-
-+import java.io.IOException;
-+
- import org.eclipse.equinox.p2.core.IProvisioningAgent;
- import org.eclipse.equinox.p2.core.ProvisionException;
- import org.junit.Rule;
-@@ -43,7 +45,11 @@ public final class P2Context extends ExternalResource {
- */
- public IProvisioningAgent getAgent() throws ProvisionException {
- if (agent == null) {
-- agent = Activator.createProvisioningAgent(tempManager.newFolder("p2agent").toURI());
-+ try {
-+ agent = Activator.createProvisioningAgent(tempManager.newFolder("p2agent").toURI());
-+ } catch (IOException e) {
-+ throw new RuntimeException(e);
-+ }
- }
- return agent;
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
-index 6526bf1..9454823 100644
---- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
-+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
-@@ -16,8 +16,8 @@ import java.util.List;
- import org.hamcrest.CoreMatchers;
- import org.hamcrest.Description;
- import org.hamcrest.Matcher;
--import org.junit.internal.matchers.SubstringMatcher;
--import org.junit.internal.matchers.TypeSafeMatcher;
-+import org.hamcrest.TypeSafeMatcher;
-+import org.hamcrest.core.SubstringMatcher;
- import org.junit.matchers.JUnitMatchers;
-
- /**
-@@ -26,7 +26,6 @@ import org.junit.matchers.JUnitMatchers;
- * @see CoreMatchers
- * @see JUnitMatchers
- */
-- at SuppressWarnings("restriction")
- public class TychoMatchers {
-
- /**
diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
index a014278..a6ddfed 100644
--- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index f101889..2736683 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -1,4 +1,4 @@
-From d5cf464057b6b835847732bad53f401c847e7533 Mon Sep 17 00:00:00 2001
+From 215b49c4e389f6317726cf1f233ec7d654ef2965 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber at redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400
Subject: [PATCH] Fix the Tycho build to work on Fedora.
@@ -21,19 +21,12 @@ Update to using Jetty 9 API.
Fix to build with Plexus Compiler 2.2 API.
-Use Hamcrest 1.1 API only.
-
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
---
pom.xml | 9 ++---
tycho-artifactcomparator/pom.xml | 4 +--
- .../local/TemporaryLocalMavenRepository.java | 6 +---
- .../resolver/ProjectorResolutionStrategyTest.java | 4 +--
.../p2/target/ee/CustomEEResolutionHandler.java | 2 +-
.../org/eclipse/tycho/test/util/HttpServer.java | 8 +++--
- .../org/eclipse/tycho/test/util/LogVerifier.java | 4 +--
- .../org/eclipse/tycho/test/util/P2Context.java | 8 +----
- .../org/eclipse/tycho/test/util/TychoMatchers.java | 5 +--
.../tycho-bundles-external.product | 1 -
.../p2 Director.product | 1 -
tycho-compiler-jdt/pom.xml | 4 ---
@@ -42,8 +35,9 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
.../maven/plugin/CompilationFailureException.java | 4 +--
.../core/maven/TychoMavenLifecycleParticipant.java | 4 ++-
.../tycho/test/AbstractTychoIntegrationTest.java | 11 +++---
+ .../org/eclipse/tycho/test/util/TychoMatchers.java | 4 +--
.../tycho/testing/EmptyLifecycleExecutor.java | 8 +++++
- 18 files changed, 62 insertions(+), 67 deletions(-)
+ 14 files changed, 55 insertions(+), 51 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2822951..fd9920b 100644
@@ -96,41 +90,6 @@ index cd0fb9a..01815d8 100644
-</project>
\ No newline at end of file
+</project>
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java
-index 40c5fc0..c344056 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java
-@@ -53,11 +53,7 @@ public class TemporaryLocalMavenRepository extends ExternalResource {
-
- public File getLocalRepositoryRoot() {
- if (repoRoot == null) {
-- try {
-- repoRoot = tempManager.newFolder("repository");
-- } catch (IOException e) {
-- throw new RuntimeException(e);
-- }
-+ repoRoot = tempManager.newFolder("repository");
- }
- return repoRoot;
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java
-index e39ae93..ee27774 100644
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java
-@@ -11,11 +11,11 @@
-
- package org.eclipse.tycho.p2.resolver;
-
--import static org.hamcrest.CoreMatchers.containsString;
--import static org.hamcrest.CoreMatchers.hasItem;
- import static org.hamcrest.core.Is.is;
- import static org.junit.Assert.assertThat;
- import static org.junit.Assert.fail;
-+import static org.junit.internal.matchers.IsCollectionContaining.hasItem;
-+import static org.junit.matchers.JUnitMatchers.containsString;
-
- import java.util.ArrayList;
- import java.util.Collection;
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java
index 87c9e11..927cea5 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java
@@ -172,71 +131,6 @@ index 57b4e10..47423e5 100644
connector.setPort(port);
jetty.addConnector(connector);
-diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java
-index e1bae59..414d155 100644
---- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java
-+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java
-@@ -70,9 +70,9 @@ public class LogVerifier extends Verifier {
- MemoryLog logger;
-
- boolean expectNoErrors = true;
-- List<Matcher<? super String>> loggedErrorsMatchers = new ArrayList<Matcher<? super String>>();
-+ List<Matcher<? extends String>> loggedErrorsMatchers = new ArrayList<Matcher<? extends String>>();
- boolean expectNoWarnings = false;
-- List<Matcher<? super String>> loggedWarningsMatchers = new ArrayList<Matcher<? super String>>();
-+ List<Matcher<? extends String>> loggedWarningsMatchers = new ArrayList<Matcher<? extends String>>();
-
- MemoryLog getInitializedLogger() {
- if (logger == null) {
-diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java
-index 283f9d0..ac34dda 100644
---- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java
-+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java
-@@ -10,8 +10,6 @@
- *******************************************************************************/
- package org.eclipse.tycho.test.util;
-
--import java.io.IOException;
--
- import org.eclipse.equinox.p2.core.IProvisioningAgent;
- import org.eclipse.equinox.p2.core.ProvisionException;
- import org.junit.Rule;
-@@ -45,11 +43,7 @@ public final class P2Context extends ExternalResource {
- */
- public IProvisioningAgent getAgent() throws ProvisionException {
- if (agent == null) {
-- try {
-- agent = Activator.createProvisioningAgent(tempManager.newFolder("p2agent").toURI());
-- } catch (IOException e) {
-- throw new RuntimeException(e);
-- }
-+ agent = Activator.createProvisioningAgent(tempManager.newFolder("p2agent").toURI());
- }
- return agent;
- }
-diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
-index 9454823..6526bf1 100644
---- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
-+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
-@@ -16,8 +16,8 @@ import java.util.List;
- import org.hamcrest.CoreMatchers;
- import org.hamcrest.Description;
- import org.hamcrest.Matcher;
--import org.hamcrest.TypeSafeMatcher;
--import org.hamcrest.core.SubstringMatcher;
-+import org.junit.internal.matchers.SubstringMatcher;
-+import org.junit.internal.matchers.TypeSafeMatcher;
- import org.junit.matchers.JUnitMatchers;
-
- /**
-@@ -26,6 +26,7 @@ import org.junit.matchers.JUnitMatchers;
- * @see CoreMatchers
- * @see JUnitMatchers
- */
-+ at SuppressWarnings("restriction")
- public class TychoMatchers {
-
- /**
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
index 9bc34bb..f22a55c 100644
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
@@ -499,6 +393,21 @@ index df63b2f..510db0a 100644
}
return verifier;
+diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
+index 6526bf1..421794d 100644
+--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
++++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
+@@ -16,8 +16,8 @@ import java.util.List;
+ import org.hamcrest.CoreMatchers;
+ import org.hamcrest.Description;
+ import org.hamcrest.Matcher;
+-import org.junit.internal.matchers.SubstringMatcher;
+-import org.junit.internal.matchers.TypeSafeMatcher;
++import org.hamcrest.core.SubstringMatcher;
++import org.hamcrest.TypeSafeMatcher;
+ import org.junit.matchers.JUnitMatchers;
+
+ /**
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
index a9d80d3..3ddbe9c 100644
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
More information about the scm-commits
mailing list