From cee5d19dd5df86e2f08ae4442786b0478b5eab74 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Tue, 19 Sep 2023 13:48:13 +0300 Subject: [PATCH] WICKET-7072 Move AbstractLicenseHeaderTestCase from wicket-util src/main to src/test Signed-off-by: Martin Tzvetanov Grigorov --- pom.xml | 6 ++++++ .../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 - .../license/AbstractLicenseHeaderHandler.java | 0 .../util/license/ApacheLicenseHeaderTestCase.java | 0 .../util/license/CssLicenseHeaderHandler.java | 0 .../util/license/HtmlLicenseHeaderHandler.java | 0 .../util/license/ILicenseHeaderHandler.java | 0 .../util/license/JavaLicenseHeaderHandler.java | 0 .../license/JavaScriptLicenseHeaderHandler.java | 0 .../license/PropertiesLicenseHeaderHandler.java | 0 .../license/VelocityLicenseHeaderHandler.java | 0 .../util/license/XmlLicenseHeaderHandler.java | 0 .../util/license/XmlPrologHeaderHandler.java | 0 .../org/apache/wicket/util/license/cssLicense.txt | 0 .../apache/wicket/util/license/javaLicense.txt | 0 .../wicket/util/license/javaScriptLicense.txt | 0 .../wicket/util/license/propertiesLicense.txt | 0 .../wicket/util/license/velocityLicense.txt | 0 .../org/apache/wicket/util/license/xmlLicense.txt | 0 33 files changed, 82 insertions(+), 2 deletions(-) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/HtmlLicenseHeaderHandler.java (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/cssLicense.txt (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/javaLicense.txt (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/javaScriptLicense.txt (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/propertiesLicense.txt (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/velocityLicense.txt (100%) rename wicket-util/src/{main => test}/java/org/apache/wicket/util/license/xmlLicense.txt (100%) diff --git a/pom.xml b/pom.xml index 415f115c930..2074af817cb 100644 --- a/pom.xml +++ b/pom.xml @@ -440,6 +440,12 @@ 10.0.0-M2-SNAPSHOT jar + + org.apache.wicket + wicket-util + 10.0.0-M2-SNAPSHOT + test-jar + org.apache.wicket wicket-velocity 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 3af34dd27dd..2da2e34383d 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 @@ void collectProjectPackages() throws IOException 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 42475e7135c..acb771caaf0 100644 --- a/wicket-auth-roles/pom.xml +++ b/wicket-auth-roles/pom.xml @@ -39,5 +39,10 @@ org.apache.wicket wicket-core + + org.apache.wicket + wicket-util + test-jar + diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml index 61b3bc9f8fd..6ce83336329 100644 --- a/wicket-bean-validation/pom.xml +++ b/wicket-bean-validation/pom.xml @@ -32,6 +32,11 @@ + + org.apache.wicket + wicket-util + test-jar + org.jboss.logging jboss-logging diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml index ce8aab50a44..4f6735d1ec9 100644 --- a/wicket-cdi/pom.xml +++ b/wicket-cdi/pom.xml @@ -37,6 +37,11 @@ !java*,!kotlin*,!sun.nio.ch,org.slf4j*;version="[1.7,3)",* + + org.apache.wicket + wicket-util + test-jar + jakarta.annotation jakarta.annotation-api diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml index 6d9a0988d26..37131bd3ea9 100644 --- a/wicket-core/pom.xml +++ b/wicket-core/pom.xml @@ -169,6 +169,11 @@ org.apache.wicket.validation.validator;-noimport:=true org.apache.wicket wicket-util + + org.apache.wicket + wicket-util + test-jar + org.bouncycastle bcprov-jdk18on diff --git a/wicket-devutils/pom.xml b/wicket-devutils/pom.xml index fcde644cb52..31ec9815921 100644 --- a/wicket-devutils/pom.xml +++ b/wicket-devutils/pom.xml @@ -44,5 +44,10 @@ org.apache.wicket wicket-extensions + + org.apache.wicket + wicket-util + test-jar + diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml index 87490706a57..95231056aa8 100644 --- a/wicket-examples/pom.xml +++ b/wicket-examples/pom.xml @@ -134,6 +134,11 @@ org.apache.wicket wicket-velocity + + org.apache.wicket + wicket-util + test-jar + org.codelibs jhighlight diff --git a/wicket-experimental/wicket-metrics/pom.xml b/wicket-experimental/wicket-metrics/pom.xml index 9ff5715243b..f22b90cf604 100644 --- a/wicket-experimental/wicket-metrics/pom.xml +++ b/wicket-experimental/wicket-metrics/pom.xml @@ -54,5 +54,10 @@ org.apache.wicket wicket-core + + org.apache.wicket + wicket-util + test-jar + diff --git a/wicket-extensions/pom.xml b/wicket-extensions/pom.xml index cd4376c9db4..23de297f90f 100644 --- a/wicket-extensions/pom.xml +++ b/wicket-extensions/pom.xml @@ -41,6 +41,11 @@ org.apache.wicket wicket-core + + org.apache.wicket + wicket-util + test-jar + diff --git a/wicket-guice/pom.xml b/wicket-guice/pom.xml index 5f0554ac316..bfe9e04b476 100644 --- a/wicket-guice/pom.xml +++ b/wicket-guice/pom.xml @@ -56,5 +56,10 @@ org.apache.wicket wicket-ioc + + org.apache.wicket + wicket-util + test-jar + diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml index 2e282f5042c..538e1503320 100644 --- a/wicket-ioc/pom.xml +++ b/wicket-ioc/pom.xml @@ -48,6 +48,11 @@ wicket-core ${project.version} + + org.apache.wicket + wicket-util + test-jar + org.objenesis objenesis diff --git a/wicket-jmx/pom.xml b/wicket-jmx/pom.xml index 9e7d8cbfebc..0443e84a7b7 100644 --- a/wicket-jmx/pom.xml +++ b/wicket-jmx/pom.xml @@ -36,5 +36,10 @@ org.apache.wicket wicket-core + + org.apache.wicket + wicket-util + test-jar + diff --git a/wicket-request/pom.xml b/wicket-request/pom.xml index e109a2bc8f7..32214b6e1f5 100755 --- a/wicket-request/pom.xml +++ b/wicket-request/pom.xml @@ -38,5 +38,10 @@ org.apache.wicket wicket-util + + org.apache.wicket + wicket-util + test-jar + diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml index 0229c7bec3c..b1f8945f165 100755 --- a/wicket-util/pom.xml +++ b/wicket-util/pom.xml @@ -51,4 +51,19 @@ true + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + diff --git a/wicket-util/src/main/java/module-info.java b/wicket-util/src/main/java/module-info.java index 1cf585244cd..7ccc71999bc 100644 --- a/wicket-util/src/main/java/module-info.java +++ b/wicket-util/src/main/java/module-info.java @@ -38,7 +38,6 @@ 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