You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/06/15 12:47:46 UTC
tomee git commit: fixing tests using resolvable deps
Repository: tomee
Updated Branches:
refs/heads/master b2c00f037 -> d92264d1b
fixing tests using resolvable deps
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d92264d1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d92264d1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d92264d1
Branch: refs/heads/master
Commit: d92264d1b6586a78db375b6e80a04aec4a36a768
Parents: b2c00f0
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Wed Jun 15 14:44:26 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Wed Jun 15 14:44:26 2016 +0200
----------------------------------------------------------------------
maven/tomee-maven-plugin/pom.xml | 25 ++++++++++++++++++++
.../maven/plugin/TomEEMavenPluginRule.java | 2 +-
.../maven/plugin/test/StripVersionTest.java | 2 +-
3 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d92264d1/maven/tomee-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/pom.xml b/maven/tomee-maven-plugin/pom.xml
index b45bc46..a86ee74 100644
--- a/maven/tomee-maven-plugin/pom.xml
+++ b/maven/tomee-maven-plugin/pom.xml
@@ -83,6 +83,12 @@
<scope>test</scope>
<classifier>webprofile</classifier>
<type>zip</type>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.sirona</groupId>
@@ -90,6 +96,25 @@
<version>0.2-incubating</version>
<scope>test</scope>
<classifier>shaded</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>tomee-webaccess</artifactId>
+ <version>7.0.0</version>
+ <type>war</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/d92264d1/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java b/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
index 2bf5e3e..588e223 100644
--- a/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
+++ b/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
@@ -197,7 +197,7 @@ public class TomEEMavenPluginRule implements MethodRule {
}
tomEEMojo.settings.setOffline(true);
if (tomEEMojo.settings.getLocalRepository() == null || "".equals(tomEEMojo.settings.getLocalRepository())) {
- tomEEMojo.settings.setLocalRepository(System.getProperty("user.home") + "/.m2/repository");
+ tomEEMojo.settings.setLocalRepository(System.getProperty("openejb.m2.home", System.getProperty("user.home") + "/.m2/repository"));
}
// we don't deploy anything by default
http://git-wip-us.apache.org/repos/asf/tomee/blob/d92264d1/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/StripVersionTest.java
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/StripVersionTest.java b/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/StripVersionTest.java
index 8be39c4..7395fb7 100644
--- a/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/StripVersionTest.java
+++ b/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/StripVersionTest.java
@@ -37,7 +37,7 @@ public class StripVersionTest {
private final List<String> javaagents = singletonList("org.apache.sirona:sirona-javaagent:0.2-incubating:jar:shaded");
@Config
- private final List<String> libs = singletonList("org.apache.tomee:log4j2-tomee:7.0.0" /*use release to avoid nasty deps*/);
+ private final List<String> libs = singletonList("org.codehaus.plexus:plexus-utils:3.0.17");
@Config
private final List<String> webapps = singletonList("org.apache.tomee:tomee-webaccess:7.0.0" /*use release to avoid nasty deps*/);