Merge branch 'arqhelp' of git://github.com/maschmid/social into develop

Conflicts: impl/src/test/java/org/jboss/seam/social/test/TwitterTest.java
seam · Jun 2, 2011 · a2de437 · a2de437
2 parents 6ce2fa3 + d0fa58a
commit a2de437
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/impl/pom.xml b/impl/pom.xml
@@ -25,11 +25,6 @@
 	<packaging>jar</packaging>
 	<name>Seam Social Module Core Implementation</name>
 
-    <properties>
-        <jbossas.server.manager.version>1.0.3.GA</jbossas.server.manager.version>
-        <jbossas.client.version>6.0.0.20100911-M5</jbossas.client.version>
-    </properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.jboss.seam.social</groupId>
@@ -144,14 +139,12 @@
             <dependency>
                <groupId>org.jboss.jbossas</groupId>
                <artifactId>jboss-server-manager</artifactId>
-               <version>${jbossas.server.manager.version}</version>
                <scope>test</scope>
             </dependency>
             <dependency>
                <groupId>org.jboss.jbossas</groupId>
                <artifactId>jboss-as-client</artifactId>
                <type>pom</type>
-               <version>${jbossas.client.version}</version>
                <scope>test</scope>
             </dependency>
 				<dependency>

diff --git a/impl/src/test/java/org/jboss/seam/social/test/TwitterTest.java b/impl/src/test/java/org/jboss/seam/social/test/TwitterTest.java
@@ -75,10 +75,11 @@ public static Archive<?> createTestArchive() throws FileNotFoundException {
                     Tweet.class, TweetJackson.class, CredentialJackson.class,
                     OAuthTokenScribe.class)
 
-                .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class).loadReposFromPom("pom.xml")
-                        .artifact("org.jboss.seam.config:seam-config-xml:3.0.0.Final")
-                        .artifact("org.jboss.seam.solder:seam-solder:3.0.0.Final")
-                        .artifact("org.scribe:scribe:1.1.2")
+                .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class)
+                        .loadReposFromPom("pom.xml")
+                        .artifact("org.jboss.seam.config:seam-config-xml")
+                        .artifact("org.jboss.seam.solder:seam-solder")
+                        .artifact("org.scribe:scribe")
                 		.resolveAs(GenericArchive.class))
                 .addAsWebInfResource(new FileAsset(beanFile), ArchivePaths.create("classes/META-INF/beans.xml"));