rpms/maven
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Enable test skipping patch only for local mode (#869399)

Browse Source
This commit is contained in:
Stanislav Ochotnicky 2012-10-24 10:28:26 +02:00
parent 4ee764f3d3
commit 08f0efa43c
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0004-Fix-text-scope-skipping-with-maven.test.skip.patch
View File

@ -1,4 +1,4 @@
From c626f99ce509b9a505d2ced39efd7ae7c748d71e Mon Sep 17 00:00:00 2001 From ed8122f5538d9000cd8a8579be8a107249e7b022 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com> From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Tue, 30 Aug 2011 11:44:42 +0200 Date: Tue, 30 Aug 2011 11:44:42 +0200
Subject: [PATCH 4/6] Fix text scope skipping with maven.test.skip Subject: [PATCH 4/6] Fix text scope skipping with maven.test.skip
@ -18,17 +18,17 @@ this). But as a hack this works OK.
Main problem: Is using "maven.test.skip" string literally OK? Also, Main problem: Is using "maven.test.skip" string literally OK? Also,
literally referencing "test" scope is probably not 100% clean. literally referencing "test" scope is probably not 100% clean.
--- ---
.../artifact/resolver/DefaultArtifactResolver.java | 17 +++++ .../artifact/resolver/DefaultArtifactResolver.java | 18 ++++++
.../main/java/org/apache/maven/DefaultMaven.java | 3 +- .../main/java/org/apache/maven/DefaultMaven.java | 6 +-
.../maven/SkipTestScopeDependencySelector.java | 72 ++++++++++++++++++++ .../maven/SkipTestScopeDependencySelector.java | 72 ++++++++++++++++++++++
3 files changed, 91 insertions(+), 1 deletions(-) 3 files changed, 95 insertions(+), 1 deletion(-)
create mode 100644 maven-core/src/main/java/org/apache/maven/SkipTestScopeDependencySelector.java create mode 100644 maven-core/src/main/java/org/apache/maven/SkipTestScopeDependencySelector.java
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 9c8364d..6b3af89 100644 index 9c8364d..761ff92 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java --- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -460,6 +460,23 @@ public class DefaultArtifactResolver @@ -460,6 +460,24 @@ public class DefaultArtifactResolver
return result; return result;
} }
@ -36,7 +36,8 @@ index 9c8364d..6b3af89 100644
+ // with scope "test" from artifact set. Current implementation + // with scope "test" from artifact set. Current implementation
+ // of artifacts doesn't implement "remove" method so create a + // of artifacts doesn't implement "remove" method so create a
+ // new object and copy non-test artifacts there + // new object and copy non-test artifacts there
+ if (System.getProperty("maven.test.skip") != null) { + if (System.getProperty("maven.local.mode") != null &&
+ System.getProperty("maven.test.skip") != null) {
+ Set<Artifact> newArtifacts = new LinkedHashSet<Artifact>(); + Set<Artifact> newArtifacts = new LinkedHashSet<Artifact>();
+ for (Artifact artifact: artifacts) + for (Artifact artifact: artifacts)
+ { + {
@ -53,7 +54,7 @@ index 9c8364d..6b3af89 100644
result = result =
artifactCollector.collect( artifacts, rootArtifact, managedVersions, collectionRequest, source, artifactCollector.collect( artifacts, rootArtifact, managedVersions, collectionRequest, source,
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 7bff4a0..9b0da93 100644 index 7bff4a0..71bbd29 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -31,6 +31,7 @@ import java.util.List; @@ -31,6 +31,7 @@ import java.util.List;
@ -64,12 +65,15 @@ index 7bff4a0..9b0da93 100644
import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.eventspy.internal.EventSpyDispatcher; import org.apache.maven.eventspy.internal.EventSpyDispatcher;
@@ -449,7 +450,7 @@ public class DefaultMaven @@ -449,7 +450,10 @@ public class DefaultMaven
DependencySelector depFilter = DependencySelector depFilter =
new AndDependencySelector( new ScopeDependencySelector( "test", "provided" ), new OptionalDependencySelector(), new AndDependencySelector( new ScopeDependencySelector( "test", "provided" ), new OptionalDependencySelector(),
- new ExclusionDependencySelector() ); - new ExclusionDependencySelector() );
+ new ExclusionDependencySelector(), new SkipTestScopeDependencySelector() ); + new ExclusionDependencySelector());
+ if ( System.getProperty("maven.local.mode") != null) {
+ depFilter = new AndDependencySelector(depFilter, new SkipTestScopeDependencySelector() );
+ }
session.setDependencySelector( depFilter ); session.setDependencySelector( depFilter );
DependencyGraphTransformer transformer = DependencyGraphTransformer transformer =
@ -152,5 +156,5 @@ index 0000000..60be724
+ +
+} +}
-- --
1.7.7.6 1.7.11.7

5
maven.spec
View File

@ -2,7 +2,7 @@
Name: maven Name: maven
Version: 3.0.4 Version: 3.0.4
Release: 13%{?dist} Release: 14%{?dist}
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
Group: Development/Tools Group: Development/Tools
@ -377,6 +377,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog %changelog
* Wed Oct 24 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-14
- Enable test skipping patch only for local mode (#869399)
* Fri Oct 19 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-13 * Fri Oct 19 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-13
- Make sure we look for requested pom file and not resolved - Make sure we look for requested pom file and not resolved