Author: gmazza
Date: Wed Dec 25 10:17:11 2013
New Revision: 1553365
URL: http://svn.apache.org/r1553365
Log:
Wro4J plugin moved to prepare-package phase.
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/pom.xml
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
Modified: jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1553365&r1=1553364&r2=1553365&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Wed Dec 25 10:17:11 2013
@@ -1,3 +1,17 @@
+2013-12-22 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-58 (I think)
+
+ * Moved MassiveRepositoryTest to surefire plugin exclusion test to speed
+ up build.
+
+ * Moved wro4j-maven-plugin from compile to prepare-package phase so
+ people can run mvn test, mvn test -Dtest=xxxxTest, etc. without
needing
+ to trigger wro4j each time. (A nice sanity saver.)
+
+ * Simpler error messages when JDBC*DatabaseTest fail due to DB being
+ unavailable.
+
2013-12-22 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.10.0-rc2-3
Modified: jspwiki/trunk/jspwiki-war/pom.xml
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1553365&r1=1553364&r2=1553365&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ jspwiki/trunk/jspwiki-war/pom.xml Wed Dec 25 10:17:11 2013
@@ -227,6 +227,7 @@
<!-- time-consuming tests excluded by default -->
<exclude>**/StressTestVersioningProvider.java</exclude>
<exclude>**/StressTestSpeed.java</exclude>
+ <exclude>**/MassiveRepositoryTest.java</exclude>
</excludes>
<includes>
<include>**/*Test.java</include>
@@ -245,7 +246,7 @@
<artifactId>wro4j-maven-plugin</artifactId>
<executions>
<execution>
- <phase>compile</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>run</goal>
<!--<goal>jshint</goal>-->
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1553365&r1=1553364&r2=1553365&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Wed
Dec 25 10:17:11 2013
@@ -52,7 +52,7 @@ public final class Release {
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "rc2";
+ private static final String POSTFIX = "svn";
/** The JSPWiki major version. */
public static final int VERSION = 2;
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "3";
+ public static final String BUILD = "58";
/**
* This is the generic version string you should use when printing out
the version. It is of
Modified:
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java?rev=1553365&r1=1553364&r2=1553365&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
Wed Dec 25 10:17:11 2013
@@ -84,10 +84,8 @@ public class JDBCGroupDatabaseTest exten
}
catch( SQLException e )
{
- System.err.println("Looks like your database could not be
connected to - "+
- "please make sure that you have started your
database, exception: " + e);
-
- throw (SQLException) e.fillInStackTrace();
+ fail("Looks like your database could not be connected to - "+
+ "please make sure that you have started your database,
exception: " + e.getMessage());
}
// Initialize the user database
Modified:
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java?rev=1553365&r1=1553364&r2=1553365&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
Wed Dec 25 10:17:11 2013
@@ -125,10 +125,8 @@ public class JDBCUserDatabaseTest extend
}
catch( SQLException e )
{
- System.err.println("Looks like your database could not be
connected to - "+
- "please make sure that you have started your
database, exception: " + e);
-
- throw (SQLException) e.fillInStackTrace();
+ fail("Looks like your database could not be connected to - "+
+ "please make sure that you have started your database,
exception: " + e.getMessage());
}
}
