Author: rmannibucau
Date: Mon Mar 31 05:27:11 2014
New Revision: 1583237
URL: http://svn.apache.org/r1583237
Log:
TOMEE-1158 arquillian 1.1.4.Final + removing tomcat staging mvn repo
Modified:
tomee/tomee/trunk/arquillian/pom.xml
tomee/tomee/trunk/arquillian/ziplock/pom.xml
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java
tomee/tomee/trunk/examples/rest-example/pom.xml
tomee/tomee/trunk/pom.xml
Modified: tomee/tomee/trunk/arquillian/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/pom.xml?rev=1583237&r1=1583236&r2=1583237&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/pom.xml Mon Mar 31 05:27:11 2014
@@ -32,7 +32,7 @@
<name>OpenEJB :: Arquillian Adaptors Parent</name>
<properties>
- <version.arquillian>1.1.1.Final</version.arquillian>
+ <version.arquillian>1.1.4.Final</version.arquillian>
<version.shrinkwrap.descriptor>2.0.0-alpha-5</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.1.2</version.shrinkwrap.shrinkwrap>
</properties>
Modified: tomee/tomee/trunk/arquillian/ziplock/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/ziplock/pom.xml?rev=1583237&r1=1583236&r2=1583237&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/ziplock/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/ziplock/pom.xml Mon Mar 31 05:27:11 2014
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>2.0.0</version>
+ <version>2.1.0</version>
<scope>provided</scope>
</dependency>
Modified:
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java?rev=1583237&r1=1583236&r2=1583237&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java
(original)
+++
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java
Mon Mar 31 05:27:11 2014
@@ -133,7 +133,7 @@ public final class Mvn {
if (LibraryContainer.class.isInstance(webArchive)) {
try {
- final File[] deps =
Maven.resolver().offline().loadPomFromFile(new File(basedir, "pom.xml"))
+ final File[] deps =
Maven.configureResolver().workOffline().loadPomFromFile(new File(basedir,
"pom.xml"))
.importDependencies(scopes).resolve().withTransitivity().asFile();
if (deps.length > 0) {
LibraryContainer.class.cast(webArchive).addAsLibraries(deps);
Modified: tomee/tomee/trunk/examples/rest-example/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/pom.xml?rev=1583237&r1=1583236&r2=1583237&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-example/pom.xml (original)
+++ tomee/tomee/trunk/examples/rest-example/pom.xml Mon Mar 31 05:27:11 2014
@@ -109,7 +109,7 @@
<plugin> <!-- needed otherwise it will not work at runtime -->
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.2.0</version>
+ <version>2.3.0</version>
<configuration>
<includes>org/superbiz/rest/model/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.0</version>
+ <version>2.3.0</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1583237&r1=1583236&r2=1583237&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Mon Mar 31 05:27:11 2014
@@ -178,9 +178,8 @@
<version.eclipselink>2.4.2</version.eclipselink>
<!-- arquillian related -->
- <version.arquillian.bom>1.1.2.Final</version.arquillian.bom>
- <version.shrinkwrap.resolver.bom>2.0.1</version.shrinkwrap.resolver.bom>
- <version.shrinkwrap.resolvers>2.0.2</version.shrinkwrap.resolvers>
+ <version.arquillian.bom>1.1.4.Final</version.arquillian.bom>
+ <version.shrinkwrap.resolver.bom>2.1.0</version.shrinkwrap.resolver.bom>
</properties>
<build>
@@ -561,17 +560,6 @@
<!--</repository>-->
<!-- Apache snapshots -->
<repository>
- <id>tomcat-rc</id>
- <name>Tomcat RC Repository</name>
-
<url>https://repository.apache.org/content/repositories/orgapachetomcat-1010/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
<id>apache-snapshots</id>
<name>Apache Snapshots Repository</name>
<url>http://repository.apache.org/content/groups/snapshots-group</url>
