Author: mgrigorov
Date: Wed Aug 17 09:23:36 2011
New Revision: 1158590
URL: http://svn.apache.org/viewvc?rev=1158590&view=rev
Log:
Move Apache licence unit test mini-framework to wicket-util/src/test.
This way wicket-util has no 'provided' dependency to JUnit.
JUnit is needed only for the test phase => scope is 'test' now.
Added:
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/HtmlLicenseHeaderHandler.java
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/HtmlLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/cssLicense.txt
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/cssLicense.txt
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/javaLicense.txt
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaLicense.txt
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/javaScriptLicense.txt
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaScriptLicense.txt
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/propertiesLicense.txt
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/propertiesLicense.txt
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/velocityLicense.txt
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/velocityLicense.txt
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/xmlLicense.txt
- copied unchanged from r1158543,
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/xmlLicense.txt
Removed:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/HtmlLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/cssLicense.txt
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaLicense.txt
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaScriptLicense.txt
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/propertiesLicense.txt
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/velocityLicense.txt
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/xmlLicense.txt
Modified:
wicket/trunk/wicket-guice/pom.xml
wicket/trunk/wicket-ioc/pom.xml
wicket/trunk/wicket-jmx/pom.xml
wicket/trunk/wicket-request/pom.xml
wicket/trunk/wicket-spring/pom.xml
wicket/trunk/wicket-util/pom.xml
wicket/trunk/wicket-velocity/pom.xml
wicket/trunk/wicket-weld/pom.xml
Modified: wicket/trunk/wicket-guice/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/pom.xml?rev=1158590&r1=1158589&r2=1158590&view=diff
==============================================================================
--- wicket/trunk/wicket-guice/pom.xml (original)
+++ wicket/trunk/wicket-guice/pom.xml Wed Aug 17 09:23:36 2011
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
@@ -47,5 +46,12 @@
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-ioc/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/pom.xml?rev=1158590&r1=1158589&r2=1158590&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/pom.xml (original)
+++ wicket/trunk/wicket-ioc/pom.xml Wed Aug 17 09:23:36 2011
@@ -47,5 +47,12 @@
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-jmx/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/pom.xml?rev=1158590&r1=1158589&r2=1158590&view=diff
==============================================================================
--- wicket/trunk/wicket-jmx/pom.xml (original)
+++ wicket/trunk/wicket-jmx/pom.xml Wed Aug 17 09:23:36 2011
@@ -37,6 +37,12 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
<version>${project.version}</version>
</dependency>
</dependencies>
Modified: wicket/trunk/wicket-request/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/pom.xml?rev=1158590&r1=1158589&r2=1158590&view=diff
==============================================================================
--- wicket/trunk/wicket-request/pom.xml (original)
+++ wicket/trunk/wicket-request/pom.xml Wed Aug 17 09:23:36 2011
@@ -33,5 +33,12 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-spring/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/pom.xml?rev=1158590&r1=1158589&r2=1158590&view=diff
==============================================================================
--- wicket/trunk/wicket-spring/pom.xml (original)
+++ wicket/trunk/wicket-spring/pom.xml Wed Aug 17 09:23:36 2011
@@ -52,5 +52,12 @@
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-util/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/pom.xml?rev=1158590&r1=1158589&r2=1158590&view=diff
==============================================================================
--- wicket/trunk/wicket-util/pom.xml (original)
+++ wicket/trunk/wicket-util/pom.xml Wed Aug 17 09:23:36 2011
@@ -28,11 +28,4 @@
<version>1.5-SNAPSHOT</version>
<name>Wicket Util</name>
<url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
</project>
Modified: wicket/trunk/wicket-velocity/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/pom.xml?rev=1158590&r1=1158589&r2=1158590&view=diff
==============================================================================
--- wicket/trunk/wicket-velocity/pom.xml (original)
+++ wicket/trunk/wicket-velocity/pom.xml Wed Aug 17 09:23:36 2011
@@ -40,12 +40,18 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.7</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-weld/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/pom.xml?rev=1158590&r1=1158589&r2=1158590&view=diff
==============================================================================
--- wicket/trunk/wicket-weld/pom.xml (original)
+++ wicket/trunk/wicket-weld/pom.xml Wed Aug 17 09:23:36 2011
@@ -77,5 +77,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
