Author: jgallimore
Date: Sun Oct 23 16:28:38 2011
New Revision: 1187917
URL: http://svn.apache.org/viewvc?rev=1187917&view=rev
Log:
Updated maven resolver arquillian artifacts to 1.0.0-beta-5 to match Arquillian
showcase
Modified:
openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml
openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/pom.xml
Modified: openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml?rev=1187917&r1=1187916&r2=1187917&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-common/pom.xml Sun Oct 23
16:28:38 2011
@@ -271,7 +271,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
- <version>1.0.0-alpha-12</version>
+ <version>1.0.0-beta-5</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -279,7 +279,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>1.0.0-alpha-12</version>
+ <version>1.0.0-beta-5</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified:
openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java?rev=1187917&r1=1187916&r2=1187917&view=diff
==============================================================================
---
openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
(original)
+++
openejb/trunk/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
Sun Oct 23 16:28:38 2011
@@ -26,13 +26,14 @@ import org.apache.maven.repository.inter
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.jboss.shrinkwrap.resolver.impl.maven.MavenRepositorySettings;
+import
org.jboss.shrinkwrap.resolver.impl.maven.MavenDependencyResolverSettings;
import org.sonatype.aether.RepositorySystem;
import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.graph.Dependency;
import org.sonatype.aether.installation.InstallRequest;
import org.sonatype.aether.installation.InstallationException;
+import org.sonatype.aether.repository.LocalRepository;
import org.sonatype.aether.resolution.ArtifactRequest;
import org.sonatype.aether.resolution.ArtifactResolutionException;
import org.sonatype.aether.resolution.ArtifactResult;
@@ -48,21 +49,20 @@ import org.sonatype.aether.util.artifact
*/
public class MavenCache {
- private final MavenRepositorySettings settings;
+ private final MavenDependencyResolverSettings settings;
private final RepositorySystem system;
private final RepositorySystemSession session;
public MavenCache() {
- this.settings = new MavenRepositorySettings();
+ this.settings = new MavenDependencyResolverSettings();
this.system = getRepositorySystem();
this.session = getSession();
}
public RepositorySystemSession getSession() {
MavenRepositorySystemSession session = new
MavenRepositorySystemSession();
-
session.setLocalRepositoryManager(system.newLocalRepositoryManager(settings.getLocalRepository()));
- session.setTransferListener(settings.getTransferListener());
- session.setRepositoryListener(settings.getRepositoryListener());
+ LocalRepository localRepository = new
LocalRepository(settings.getSettings().getLocalRepository());
+
session.setLocalRepositoryManager(system.newLocalRepositoryManager(localRepository));
return session;
}
Modified: openejb/trunk/arquillian-tomee/arquillian-tomee-remote/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-remote/pom.xml?rev=1187917&r1=1187916&r2=1187917&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-remote/pom.xml (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-remote/pom.xml Sun Oct 23
16:28:38 2011
@@ -303,14 +303,14 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
- <version>1.0.0-alpha-12</version>
+ <version>1.0.0-beta-5</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>1.0.0-alpha-12</version>
+ <version>1.0.0-beta-5</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
