This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 19ee05a3e3 CAUSEWAY-3466: removes surefire workaround for Wicket
(wicket-graceful artifact)
19ee05a3e3 is described below
commit 19ee05a3e3aeb51c605801ae84bde15ee6ecebd0
Author: andi-huber <[email protected]>
AuthorDate: Sat May 20 09:20:28 2023 +0200
CAUSEWAY-3466: removes surefire workaround for Wicket (wicket-graceful
artifact)
---
bom/pom.xml | 8 +-
viewers/wicket/graceful/pom.xml | 117 ---------------------
.../CausewayModuleViewerWicketGraceful.java | 23 ----
.../viewer/wicket/graceful/package-info.java | 24 -----
.../wicket-artifacts-no-module-info/readme.txt | 3 -
.../wicket-core-9.13.0.jar.mangled | Bin 2393559 -> 0 bytes
.../wicket-util-9.13.0.jar.mangled | Bin 382011 -> 0 bytes
viewers/wicket/model/pom.xml | 4 +-
viewers/wicket/pom.xml | 1 -
9 files changed, 3 insertions(+), 177 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 2806880242..ca64d9dfb1 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -177,6 +177,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<spring-boot.version>2.7.12</spring-boot.version>
<summernote.version>0.8.20</summernote.version>
<surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine>
+ <surefire.useModulePath>false</surefire.useModulePath> <!-- disable
module-path for testing, that is, put everything on the class-path -->
<swagger-core.version>2.2.10</swagger-core.version>
<togglz.version>3.3.3</togglz.version>
@@ -561,13 +562,6 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<type>jar</type>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.causeway.viewer</groupId>
-
<artifactId>causeway-viewer-wicket-graceful</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>org.apache.causeway.viewer</groupId>
<artifactId>causeway-viewer-wicket-model</artifactId>
diff --git a/viewers/wicket/graceful/pom.xml b/viewers/wicket/graceful/pom.xml
deleted file mode 100644
index 7c2ed394b2..0000000000
--- a/viewers/wicket/graceful/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.causeway.viewer</groupId>
- <artifactId>causeway-viewer-wicket</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>causeway-viewer-wicket-graceful</artifactId>
- <name>Apache Causeway Viewer - Wicket (Graceful)</name>
- <description>
- Helps with the CI build, that is, it replaces original Wicket
artifacts at ~/.m2/repository
- with mangled variants, that do not include module-info.class
entries.
- This artifact - in its realeased form - is empty.
- </description>
-
- <packaging>jar</packaging>
-
- <properties>
-
<jar-plugin.automaticModuleName>org.apache.causeway.viewer.wicket.graceful</jar-plugin.automaticModuleName>
-
<git-plugin.propertiesDir>org/apache/causeway/viewer/wicket/graceful</git-plugin.propertiesDir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>patch-wicket</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>
- process-sources
- </phase>
- <configuration>
- <target>
- <copy
-
file="${project.build.testSourceDirectory}/../resources/wicket-artifacts-no-module-info/wicket-core-9.13.0.jar.mangled"
-
tofile="${settings.localRepository}/org/apache/wicket/wicket-core/9.13.0/wicket-core-9.13.0.jar"
- overwrite="true"
- />
- <copy
-
file="${project.build.testSourceDirectory}/../resources/wicket-artifacts-no-module-info/wicket-util-9.13.0.jar.mangled"
-
tofile="${settings.localRepository}/org/apache/wicket/wicket-util/9.13.0/wicket-util-9.13.0.jar"
- overwrite="true"
- />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- TESTING -->
-
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
-
<artifactId>causeway-core-internaltestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-
-</project>
diff --git
a/viewers/wicket/graceful/src/main/java/org/apache/causeway/viewer/wicket/graceful/CausewayModuleViewerWicketGraceful.java
b/viewers/wicket/graceful/src/main/java/org/apache/causeway/viewer/wicket/graceful/CausewayModuleViewerWicketGraceful.java
deleted file mode 100644
index 7d659b97eb..0000000000
---
a/viewers/wicket/graceful/src/main/java/org/apache/causeway/viewer/wicket/graceful/CausewayModuleViewerWicketGraceful.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.causeway.viewer.wicket.graceful;
-
-public class CausewayModuleViewerWicketGraceful {
-
-}
diff --git
a/viewers/wicket/graceful/src/main/java/org/apache/causeway/viewer/wicket/graceful/package-info.java
b/viewers/wicket/graceful/src/main/java/org/apache/causeway/viewer/wicket/graceful/package-info.java
deleted file mode 100644
index f9976448cd..0000000000
---
a/viewers/wicket/graceful/src/main/java/org/apache/causeway/viewer/wicket/graceful/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * Helps with the CI build, that is, it replaces original Wicket artifacts at
~/.m2/repository
- * with mangled variants, that do not include module-info.class entries.
- * This artifact - in its realeased form - is empty.
- */
-package org.apache.causeway.viewer.wicket.graceful;
diff --git
a/viewers/wicket/graceful/src/test/resources/wicket-artifacts-no-module-info/readme.txt
b/viewers/wicket/graceful/src/test/resources/wicket-artifacts-no-module-info/readme.txt
deleted file mode 100644
index a1943022e1..0000000000
---
a/viewers/wicket/graceful/src/test/resources/wicket-artifacts-no-module-info/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-these are the originals, but with
-- module-info.class removed from their root
-- META-INF/MANIFEST.MF entry Automatic-Module-Name: org.apache.wicket.xxx added
\ No newline at end of file
diff --git
a/viewers/wicket/graceful/src/test/resources/wicket-artifacts-no-module-info/wicket-core-9.13.0.jar.mangled
b/viewers/wicket/graceful/src/test/resources/wicket-artifacts-no-module-info/wicket-core-9.13.0.jar.mangled
deleted file mode 100644
index 09a475f977..0000000000
Binary files
a/viewers/wicket/graceful/src/test/resources/wicket-artifacts-no-module-info/wicket-core-9.13.0.jar.mangled
and /dev/null differ
diff --git
a/viewers/wicket/graceful/src/test/resources/wicket-artifacts-no-module-info/wicket-util-9.13.0.jar.mangled
b/viewers/wicket/graceful/src/test/resources/wicket-artifacts-no-module-info/wicket-util-9.13.0.jar.mangled
deleted file mode 100644
index 3bbc9e0405..0000000000
Binary files
a/viewers/wicket/graceful/src/test/resources/wicket-artifacts-no-module-info/wicket-util-9.13.0.jar.mangled
and /dev/null differ
diff --git a/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
index 03ce48ffdf..643aa32ea4 100644
--- a/viewers/wicket/model/pom.xml
+++ b/viewers/wicket/model/pom.xml
@@ -38,8 +38,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.causeway.viewer</groupId>
- <artifactId>causeway-viewer-wicket-graceful</artifactId>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
</dependency>
<dependency>
diff --git a/viewers/wicket/pom.xml b/viewers/wicket/pom.xml
index 7cf278ee54..6a9f7b7dde 100644
--- a/viewers/wicket/pom.xml
+++ b/viewers/wicket/pom.xml
@@ -113,7 +113,6 @@
<modules>
<module>applib</module>
- <module>graceful</module>
<module>model</module>
<module>viewer</module>
<module>ui</module>
