You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2023/09/19 10:49:18 UTC
[wicket] 01/01: WICKET-7072 Move AbstractLicenseHeaderTestCase from wicket-util src/main to src/test
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch WICKET-7072-JUnit-in-main
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit cee5d19dd5df86e2f08ae4442786b0478b5eab74
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Tue Sep 19 13:48:13 2023 +0300
WICKET-7072 Move AbstractLicenseHeaderTestCase from wicket-util src/main to src/test
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
pom.xml | 6 ++++++
.../org/apache/wicket/osgi/OsgiClashingPackagesTest.java | 2 +-
wicket-auth-roles/pom.xml | 5 +++++
wicket-bean-validation/pom.xml | 5 +++++
wicket-cdi/pom.xml | 5 +++++
wicket-core/pom.xml | 5 +++++
wicket-devutils/pom.xml | 5 +++++
wicket-examples/pom.xml | 5 +++++
wicket-experimental/wicket-metrics/pom.xml | 5 +++++
wicket-extensions/pom.xml | 5 +++++
wicket-guice/pom.xml | 5 +++++
wicket-ioc/pom.xml | 5 +++++
wicket-jmx/pom.xml | 5 +++++
wicket-request/pom.xml | 5 +++++
wicket-util/pom.xml | 15 +++++++++++++++
wicket-util/src/main/java/module-info.java | 1 -
.../wicket/util/license/AbstractLicenseHeaderHandler.java | 0
.../wicket/util/license/ApacheLicenseHeaderTestCase.java | 0
.../wicket/util/license/CssLicenseHeaderHandler.java | 0
.../wicket/util/license/HtmlLicenseHeaderHandler.java | 0
.../apache/wicket/util/license/ILicenseHeaderHandler.java | 0
.../wicket/util/license/JavaLicenseHeaderHandler.java | 0
.../util/license/JavaScriptLicenseHeaderHandler.java | 0
.../util/license/PropertiesLicenseHeaderHandler.java | 0
.../wicket/util/license/VelocityLicenseHeaderHandler.java | 0
.../wicket/util/license/XmlLicenseHeaderHandler.java | 0
.../wicket/util/license/XmlPrologHeaderHandler.java | 0
.../java/org/apache/wicket/util/license/cssLicense.txt | 0
.../java/org/apache/wicket/util/license/javaLicense.txt | 0
.../org/apache/wicket/util/license/javaScriptLicense.txt | 0
.../org/apache/wicket/util/license/propertiesLicense.txt | 0
.../org/apache/wicket/util/license/velocityLicense.txt | 0
.../java/org/apache/wicket/util/license/xmlLicense.txt | 0
33 files changed, 82 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 415f115c93..2074af817c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -440,6 +440,12 @@
<version>10.0.0-M2-SNAPSHOT</version>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <version>10.0.0-M2-SNAPSHOT</version>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-velocity</artifactId>
diff --git a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
index 3af34dd27d..2da2e34383 100644
--- a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
+++ b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
@@ -39,7 +39,7 @@ class OsgiClashingPackagesTest
for (String dependency : dependencies)
{
// process only wicket-xyz.jar
- if (dependency.contains("wicket-") && dependency.endsWith(".jar"))
+ if (dependency.contains("wicket-") && dependency.endsWith(".jar") && !dependency.endsWith("-tests.jar"))
{
JarFile jarFile = new JarFile(dependency);
try
diff --git a/wicket-auth-roles/pom.xml b/wicket-auth-roles/pom.xml
index 42475e7135..acb771caaf 100644
--- a/wicket-auth-roles/pom.xml
+++ b/wicket-auth-roles/pom.xml
@@ -39,5 +39,10 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <type>test-jar</type>
+ </dependency>
</dependencies>
</project>
diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml
index 61b3bc9f8f..6ce8333632 100644
--- a/wicket-bean-validation/pom.xml
+++ b/wicket-bean-validation/pom.xml
@@ -32,6 +32,11 @@
</properties>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml
index ce8aab50a4..4f6735d1ec 100644
--- a/wicket-cdi/pom.xml
+++ b/wicket-cdi/pom.xml
@@ -37,6 +37,11 @@
<osgi.import.package>!java*,!kotlin*,!sun.nio.ch,org.slf4j*;version="[1.7,3)",*</osgi.import.package>
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index 6d9a0988d2..37131bd3ea 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -169,6 +169,11 @@ org.apache.wicket.validation.validator;-noimport:=true
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
diff --git a/wicket-devutils/pom.xml b/wicket-devutils/pom.xml
index fcde644cb5..31ec981592 100644
--- a/wicket-devutils/pom.xml
+++ b/wicket-devutils/pom.xml
@@ -44,5 +44,10 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <type>test-jar</type>
+ </dependency>
</dependencies>
</project>
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index 87490706a5..95231056aa 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -134,6 +134,11 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-velocity</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.codelibs</groupId>
<artifactId>jhighlight</artifactId>
diff --git a/wicket-experimental/wicket-metrics/pom.xml b/wicket-experimental/wicket-metrics/pom.xml
index 9ff5715243..f22b90cf60 100644
--- a/wicket-experimental/wicket-metrics/pom.xml
+++ b/wicket-experimental/wicket-metrics/pom.xml
@@ -54,5 +54,10 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <type>test-jar</type>
+ </dependency>
</dependencies>
</project>
diff --git a/wicket-extensions/pom.xml b/wicket-extensions/pom.xml
index cd4376c9db..23de297f90 100644
--- a/wicket-extensions/pom.xml
+++ b/wicket-extensions/pom.xml
@@ -41,6 +41,11 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <type>test-jar</type>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/wicket-guice/pom.xml b/wicket-guice/pom.xml
index 5f0554ac31..bfe9e04b47 100644
--- a/wicket-guice/pom.xml
+++ b/wicket-guice/pom.xml
@@ -56,5 +56,10 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-ioc</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <type>test-jar</type>
+ </dependency>
</dependencies>
</project>
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index 2e282f5042..538e150332 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -48,6 +48,11 @@
<artifactId>wicket-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
diff --git a/wicket-jmx/pom.xml b/wicket-jmx/pom.xml
index 9e7d8cbfeb..0443e84a7b 100644
--- a/wicket-jmx/pom.xml
+++ b/wicket-jmx/pom.xml
@@ -36,5 +36,10 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <type>test-jar</type>
+ </dependency>
</dependencies>
</project>
diff --git a/wicket-request/pom.xml b/wicket-request/pom.xml
index e109a2bc8f..32214b6e1f 100755
--- a/wicket-request/pom.xml
+++ b/wicket-request/pom.xml
@@ -38,5 +38,10 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <type>test-jar</type>
+ </dependency>
</dependencies>
</project>
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index 0229c7bec3..b1f8945f16 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -51,4 +51,19 @@
<optional>true</optional>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/wicket-util/src/main/java/module-info.java b/wicket-util/src/main/java/module-info.java
index 1cf585244c..7ccc71999b 100644
--- a/wicket-util/src/main/java/module-info.java
+++ b/wicket-util/src/main/java/module-info.java
@@ -38,7 +38,6 @@ module org.apache.wicket.util {
exports org.apache.wicket.util.file;
exports org.apache.wicket.util.io;
exports org.apache.wicket.util.lang;
- exports org.apache.wicket.util.license;
exports org.apache.wicket.util.listener;
exports org.apache.wicket.util.markup.xhtml;
exports org.apache.wicket.util.parse.metapattern;
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java b/wicket-util/src/test/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
rename to wicket-util/src/test/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java b/wicket-util/src/test/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
rename to wicket-util/src/test/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java b/wicket-util/src/test/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
rename to wicket-util/src/test/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/HtmlLicenseHeaderHandler.java b/wicket-util/src/test/java/org/apache/wicket/util/license/HtmlLicenseHeaderHandler.java
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/HtmlLicenseHeaderHandler.java
rename to wicket-util/src/test/java/org/apache/wicket/util/license/HtmlLicenseHeaderHandler.java
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java b/wicket-util/src/test/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java
rename to wicket-util/src/test/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java b/wicket-util/src/test/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
rename to wicket-util/src/test/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java b/wicket-util/src/test/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
rename to wicket-util/src/test/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java b/wicket-util/src/test/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
rename to wicket-util/src/test/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java b/wicket-util/src/test/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
rename to wicket-util/src/test/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java b/wicket-util/src/test/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
rename to wicket-util/src/test/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java b/wicket-util/src/test/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
rename to wicket-util/src/test/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/cssLicense.txt b/wicket-util/src/test/java/org/apache/wicket/util/license/cssLicense.txt
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/cssLicense.txt
rename to wicket-util/src/test/java/org/apache/wicket/util/license/cssLicense.txt
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/javaLicense.txt b/wicket-util/src/test/java/org/apache/wicket/util/license/javaLicense.txt
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/javaLicense.txt
rename to wicket-util/src/test/java/org/apache/wicket/util/license/javaLicense.txt
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/javaScriptLicense.txt b/wicket-util/src/test/java/org/apache/wicket/util/license/javaScriptLicense.txt
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/javaScriptLicense.txt
rename to wicket-util/src/test/java/org/apache/wicket/util/license/javaScriptLicense.txt
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/propertiesLicense.txt b/wicket-util/src/test/java/org/apache/wicket/util/license/propertiesLicense.txt
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/propertiesLicense.txt
rename to wicket-util/src/test/java/org/apache/wicket/util/license/propertiesLicense.txt
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/velocityLicense.txt b/wicket-util/src/test/java/org/apache/wicket/util/license/velocityLicense.txt
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/velocityLicense.txt
rename to wicket-util/src/test/java/org/apache/wicket/util/license/velocityLicense.txt
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/xmlLicense.txt b/wicket-util/src/test/java/org/apache/wicket/util/license/xmlLicense.txt
similarity index 100%
rename from wicket-util/src/main/java/org/apache/wicket/util/license/xmlLicense.txt
rename to wicket-util/src/test/java/org/apache/wicket/util/license/xmlLicense.txt