Update build configuration and make sure it works on all platforms

jbossas · Sep 2, 2013 · cd205ed · cd205ed
1 parent e8f3e7f
commit cd205ed
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -29,19 +29,24 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>9</version>
+        <version>11</version>
     </parent>
 
     <groupId>org.jboss</groupId>
     <artifactId>jboss-dmr</artifactId>
     <version>1.2.0.Beta3-SNAPSHOT</version>
     <name>JBoss Dynamic Model Representation</name>
 
+    <properties>
+        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.6</maven.compiler.source>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.jboss.logmanager</groupId>
             <artifactId>jboss-logmanager</artifactId>
-            <version>1.2.0.GA</version>
+            <version>1.4.3.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -53,22 +58,16 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.1</version>
+            <version>4.11</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.4</version>
+                <version>${version.antrun.plugin}</version>
                 <executions>
                     <execution>
                         <id>make-the-stupid-directory</id>
@@ -87,7 +86,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>apt-maven-plugin</artifactId>
-                <version>1.0-alpha-5</version>
+                <version>${version.apt.plugin}</version>
                 <configuration>
                     <additionalSourceRoots>
                         <additionalSourceRoot>${project.basedir}/src/placeholder/java</additionalSourceRoot>
@@ -108,7 +107,9 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>${version.surefire.plugin}</version>
                 <configuration>
+                    <argLine>-Dfile.encoding=UTF-8</argLine>
                     <systemProperties>
                         <property>
                             <name>java.util.logging.manager</name>
@@ -119,7 +120,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.6.1</version>
+                <version>${version.javadoc.plugin}</version>
                 <configuration>
                     <docfilessubdirs>true</docfilessubdirs>
                     <detectJavaApiLink>false</detectJavaApiLink>
@@ -128,12 +129,12 @@
                     <docletArtifact>
                         <groupId>org.jboss.apiviz</groupId>
                         <artifactId>apiviz</artifactId>
-                        <version>1.3.1.GA</version>
+                        <version>1.3.2.GA</version>
                     </docletArtifact>
                     <doctitle><![CDATA[JBoss Dynamic Model Representation API ]]>${project.version}</doctitle>
                     <header><![CDATA[JBoss Dynamic Model Representation API ]]>${project.version}</header>
                     <footer><![CDATA[JBoss Dynamic Model Representation API ]]>${project.version}</footer>
-                    <bottom><![CDATA[<i>Copyright &#169; 2010 JBoss, a division of Red Hat, Inc.</i>]]></bottom>
+                    <bottom><![CDATA[<i>Copyright &#169; 2013 JBoss, a division of Red Hat, Inc.</i>]]></bottom>
                     <links>
                         <link>http://java.sun.com/javase/6/docs/api/</link>
                     </links>

diff --git a/src/test/java/org/jboss/dmr/ExpressionValueTest.java b/src/test/java/org/jboss/dmr/ExpressionValueTest.java
@@ -6,10 +6,9 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Arrays;
 import java.util.Collection;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class ExpressionValueTest {

diff --git a/src/test/java/org/jboss/dmr/ModelNodeTest.java b/src/test/java/org/jboss/dmr/ModelNodeTest.java
@@ -4,7 +4,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
-import static org.junit.matchers.JUnitMatchers.containsString;
+import static org.hamcrest.CoreMatchers.containsString;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -44,7 +44,7 @@ public void setUp() {
         node.get("long-value").set(Long.valueOf("14"));
         node.get("max-long-value").set(Long.MAX_VALUE);
         node.get("property-value").set("property", ModelType.PROPERTY);
-        node.get("expression-value").setExpression("$expression");
+        node.get("expression-value").set(new ValueExpression("$expression"));
         node.get("true-value").set(true);
         node.get("false-value").set(false);
     }