WICKET-7072 Move AbstractLicenseHeaderTestCase from wicket-util src/m…

…ain to src/test Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
apache · Sep 19, 2023 · cee5d19 · cee5d19
1 parent 4e74e3a
commit cee5d19
Show file tree

Hide file tree

Showing 33 changed files with 82 additions and 2 deletions.
diff --git 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/...ng/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java b/...ng/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...license/AbstractLicenseHeaderHandler.java → ...license/AbstractLicenseHeaderHandler.java b/...license/AbstractLicenseHeaderHandler.java → ...license/AbstractLicenseHeaderHandler.java
diff --git a/.../license/ApacheLicenseHeaderTestCase.java → .../license/ApacheLicenseHeaderTestCase.java b/.../license/ApacheLicenseHeaderTestCase.java → .../license/ApacheLicenseHeaderTestCase.java
diff --git a/...util/license/CssLicenseHeaderHandler.java → ...util/license/CssLicenseHeaderHandler.java b/...util/license/CssLicenseHeaderHandler.java → ...util/license/CssLicenseHeaderHandler.java
diff --git a/...til/license/HtmlLicenseHeaderHandler.java → ...til/license/HtmlLicenseHeaderHandler.java b/...til/license/HtmlLicenseHeaderHandler.java → ...til/license/HtmlLicenseHeaderHandler.java
diff --git a/...t/util/license/ILicenseHeaderHandler.java → ...t/util/license/ILicenseHeaderHandler.java b/...t/util/license/ILicenseHeaderHandler.java → ...t/util/license/ILicenseHeaderHandler.java
diff --git a/...til/license/JavaLicenseHeaderHandler.java → ...til/license/JavaLicenseHeaderHandler.java b/...til/license/JavaLicenseHeaderHandler.java → ...til/license/JavaLicenseHeaderHandler.java
diff --git a/...cense/JavaScriptLicenseHeaderHandler.java → ...cense/JavaScriptLicenseHeaderHandler.java b/...cense/JavaScriptLicenseHeaderHandler.java → ...cense/JavaScriptLicenseHeaderHandler.java
diff --git a/...cense/PropertiesLicenseHeaderHandler.java → ...cense/PropertiesLicenseHeaderHandler.java b/...cense/PropertiesLicenseHeaderHandler.java → ...cense/PropertiesLicenseHeaderHandler.java
diff --git a/...license/VelocityLicenseHeaderHandler.java → ...license/VelocityLicenseHeaderHandler.java b/...license/VelocityLicenseHeaderHandler.java → ...license/VelocityLicenseHeaderHandler.java
diff --git a/...util/license/XmlLicenseHeaderHandler.java → ...util/license/XmlLicenseHeaderHandler.java b/...util/license/XmlLicenseHeaderHandler.java → ...util/license/XmlLicenseHeaderHandler.java
diff --git a/.../util/license/XmlPrologHeaderHandler.java → .../util/license/XmlPrologHeaderHandler.java b/.../util/license/XmlPrologHeaderHandler.java → .../util/license/XmlPrologHeaderHandler.java
diff --git a/...apache/wicket/util/license/cssLicense.txt → ...apache/wicket/util/license/cssLicense.txt b/...apache/wicket/util/license/cssLicense.txt → ...apache/wicket/util/license/cssLicense.txt
diff --git a/...pache/wicket/util/license/javaLicense.txt → ...pache/wicket/util/license/javaLicense.txt b/...pache/wicket/util/license/javaLicense.txt → ...pache/wicket/util/license/javaLicense.txt
diff --git a/...wicket/util/license/javaScriptLicense.txt → ...wicket/util/license/javaScriptLicense.txt b/...wicket/util/license/javaScriptLicense.txt → ...wicket/util/license/javaScriptLicense.txt
diff --git a/...wicket/util/license/propertiesLicense.txt → ...wicket/util/license/propertiesLicense.txt b/...wicket/util/license/propertiesLicense.txt → ...wicket/util/license/propertiesLicense.txt
diff --git a/...e/wicket/util/license/velocityLicense.txt → ...e/wicket/util/license/velocityLicense.txt b/...e/wicket/util/license/velocityLicense.txt → ...e/wicket/util/license/velocityLicense.txt
diff --git a/...apache/wicket/util/license/xmlLicense.txt → ...apache/wicket/util/license/xmlLicense.txt b/...apache/wicket/util/license/xmlLicense.txt → ...apache/wicket/util/license/xmlLicense.txt