ARQ-477 Add Arquillian-Build to dependencyManagement. Add junit Overr…

…ide to JBoss Embedded 6 pom
kpiwko · Jun 22, 2011 · d6d5e5a · d6d5e5a
1 parent cb67d19
commit d6d5e5a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/jbossas-embedded-6/pom.xml b/jbossas-embedded-6/pom.xml
@@ -25,8 +25,11 @@
 
         <!-- Versioning -->
         <version.org.jboss.jbossas>6.0.0.Final</version.org.jboss.jbossas>
-        <version.shrinkwrap_shrinkwrap>1.0.0-beta-2</version.shrinkwrap_shrinkwrap>
 
+        <!-- Override the managed version from jboss-as-depchain-->
+        <version.shrinkwrap_shrinkwrap>1.0.0-beta-3</version.shrinkwrap_shrinkwrap>
+        <version.junit>4.8.1</version.junit>
+
     </properties>
 
     <!-- Dependencies -->
@@ -109,6 +112,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>${version.junit}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/pom.xml b/pom.xml
@@ -27,6 +27,11 @@
 
         <!-- Versioning -->
         <version.arquillian_core>1.0.0.CR1-SNAPSHOT</version.arquillian_core>
+
+        <!-- override from parent -->
+        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.6</maven.compiler.source>
+
 
     </properties>
 
@@ -39,6 +44,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-build</artifactId>
+                <version>${version.arquillian_core}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -56,23 +68,5 @@
         <module>jbossas-remote-6</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <inherited>true</inherited>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <showDeprecation>false</showDeprecation>
-                    <showWarnings>true</showWarnings>
-                    <optimize>true</optimize>
-                    <compilerVersion>1.6</compilerVersion>
-                    <fork>true</fork>
-                    <argLine>-Xmx512M</argLine>
-                </configuration>
-            </plugin>
-        </plugins>    
-    </build>
 </project>