You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2014/06/02 21:55:55 UTC

svn commit: r1599333 - in /maven/archetypes/trunk: maven-archetype-profiles/src/main/resources/archetype-resources/ maven-archetype-quickstart/src/main/resources/archetype-resources/ maven-archetype-quickstart/src/main/resources/archetype-resources/src...

Author: khmarbaise
Date: Mon Jun  2 19:55:54 2014
New Revision: 1599333

URL: http://svn.apache.org/r1599333
Log:
[MARCHETYPES-45]
 - maven-archetype-profiles
 - maven-archetype-quickstart
 - maven-archetype-webapp
   - Upgrade to JUnit 4.11
   - usage of annotations for unit test example.

Modified:
    maven/archetypes/trunk/maven-archetype-profiles/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml
    maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java
    maven/archetypes/trunk/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml

Modified: maven/archetypes/trunk/maven-archetype-profiles/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-profiles/src/main/resources/archetype-resources/pom.xml?rev=1599333&r1=1599332&r2=1599333&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-profiles/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetypes/trunk/maven-archetype-profiles/src/main/resources/archetype-resources/pom.xml Mon Jun  2 19:55:54 2014
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml?rev=1599333&r1=1599332&r2=1599333&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml Mon Jun  2 19:55:54 2014
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.2</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java?rev=1599333&r1=1599332&r2=1599333&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java (original)
+++ maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java Mon Jun  2 19:55:54 2014
@@ -1,37 +1,19 @@
 package $package;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 /**
  * Unit test for simple App.
  */
 public class AppTest 
-    extends TestCase
 {
     /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
      * Rigourous Test :-)
      */
-    public void testApp()
+    @Test
+    public void shouldAnswerWithTrue()
     {
         assertTrue( true );
     }

Modified: maven/archetypes/trunk/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml?rev=1599333&r1=1599332&r2=1599333&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetypes/trunk/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml Mon Jun  2 19:55:54 2014
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.2</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
   </dependencies>