This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/spring6 by this push:
new 35ceca741d ISIS-3275: use jitpack build of wicket fork
35ceca741d is described below
commit 35ceca741d15bc2b037e1c207aeb24dfbd1b6c26
Author: Andi Huber <[email protected]>
AuthorDate: Mon Nov 28 17:32:43 2022 +0100
ISIS-3275: use jitpack build of wicket fork
---
bom/pom.xml | 10 +++++++++-
core/pom.xml | 31 +++++++++----------------------
regressiontests/stable/pom.xml | 5 -----
viewers/wicket/graceful/pom.xml | 6 ++++--
viewers/wicket/model/pom.xml | 25 ++++++++++++++++++++-----
viewers/wicket/pom.xml | 4 ++--
viewers/wicket/ui/pom.xml | 8 ++++----
viewers/wicket/viewer/pom.xml | 7 +++----
8 files changed, 51 insertions(+), 45 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 503611b952..92aacb21a5 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -428,7 +428,8 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<vaadin.version>23.2.9</vaadin.version>
- <wicket.version>10.0.0-M1-SNAPSHOT</wicket.version> <!-- 9.4.0 is
last known good, before wicket put jupiter-api on the module graph -->
+ <wicket.version>-f5513ee9d6-1</wicket.version> <!-- 9.4.0 is last
known good, before wicket put jupiter-api on the module graph -->
+
<wicket-bootstrap.version>6.0.0-M8</wicket-bootstrap.version> <!--
de.agilecoders.wicket:wicket-bootstrap... -->
<wicket-webjars.version>3.0.6</wicket-webjars.version>
<wicket-viewer-jquery.version>3.6.1</wicket-viewer-jquery.version>
<!-- as served by wicket via webjars -->
@@ -455,6 +456,13 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<url>https://repository.apache.org/content/groups/snapshots/</url>
<snapshots><enabled>true</enabled></snapshots>
</repository>
+ <repository>
+ <!-- used for wicket 10.0.0-M1-SNAPSHOT fork at
+
https://jitpack.io/#apache-causeway-committers/wicket
+ temporary till release of wicket 10.0.0 -->
+ <id>jitpack.io</id>
+ <url>https://jitpack.io</url>
+ </repository>
<repository>
<!-- temporary till release of wicket-stuff 10.0.0 -->
<id>wicketstuff-core-snapshots</id>
diff --git a/core/pom.xml b/core/pom.xml
index b8728c23b6..81426c3d32 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1015,30 +1015,30 @@
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers</groupId>
<artifactId>wicket</artifactId>
<version>${wicket.version}</version>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-core</artifactId>
<version>${wicket.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-devutils</artifactId>
<version>${wicket.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-core-tester</artifactId>
<version>${wicket.version}</version>
</dependency>
<!-- TODO: when used, move exclusions down -->
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-request</artifactId>
<version>${wicket.version}</version>
<exclusions>
@@ -1051,7 +1051,7 @@
<!-- TODO: when used, move exclusions down -->
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-util</artifactId>
<version>${wicket.version}</version>
<exclusions>
@@ -1063,31 +1063,18 @@
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
<version>${wicket.version}</version>
</dependency>
- <!-- TODO: when used, move exclusions down -->
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-datetime</artifactId>
- <version>${wicket.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
-
<artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
<version>${wicket.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-spring</artifactId>
<version>${wicket.version}</version>
</dependency>
diff --git a/regressiontests/stable/pom.xml b/regressiontests/stable/pom.xml
index 5e50ad84ac..7277ad086f 100644
--- a/regressiontests/stable/pom.xml
+++ b/regressiontests/stable/pom.xml
@@ -106,11 +106,6 @@
<type>pom</type>
<optional>true</optional>
</dependency>
-
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core-tester</artifactId>
- </dependency>
<!-- <dependency> -->
<!-- <groupId>org.glassfish.jersey.ext</groupId> -->
diff --git a/viewers/wicket/graceful/pom.xml b/viewers/wicket/graceful/pom.xml
index 8eb11da5c5..558da356b7 100644
--- a/viewers/wicket/graceful/pom.xml
+++ b/viewers/wicket/graceful/pom.xml
@@ -40,7 +40,7 @@
<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>
@@ -75,9 +75,10 @@
</plugin>
</plugins>
</build>
+-->
<dependencies>
-
+<!--
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
@@ -102,6 +103,7 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<!-- TESTING -->
diff --git a/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
index cf6213c99b..c20daf8fe0 100644
--- a/viewers/wicket/model/pom.xml
+++ b/viewers/wicket/model/pom.xml
@@ -36,11 +36,26 @@
</properties>
<dependencies>
-
- <dependency>
- <groupId>org.apache.causeway.viewer</groupId>
- <artifactId>causeway-viewer-wicket-graceful</artifactId>
- </dependency>
+ <dependency>
+ <groupId>com.github.apache-causeway-committers.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.github.apache-causeway-committers.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.causeway.core</groupId>
diff --git a/viewers/wicket/pom.xml b/viewers/wicket/pom.xml
index 0f4b9eef2a..0e2c048242 100644
--- a/viewers/wicket/pom.xml
+++ b/viewers/wicket/pom.xml
@@ -27,11 +27,11 @@
<version>3.0.0-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
-
+
<groupId>org.apache.causeway.viewer</groupId>
<artifactId>causeway-viewer-wicket</artifactId>
<name>Apache Causeway Viewer - Wicket</name>
-
+
<packaging>pom</packaging>
<modules>
diff --git a/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
index 12592c5eed..a5ef602bcb 100644
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@ -72,7 +72,7 @@
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-devutils</artifactId>
<exclusions>
<exclusion>
@@ -87,7 +87,7 @@
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
<exclusions>
<exclusion>
@@ -97,7 +97,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
<exclusions>
<exclusion>
@@ -108,7 +108,7 @@
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
+
<groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-spring</artifactId>
<exclusions>
<!-- already provided by jakarta.inject-api -->
diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
index 4bc3fe26ce..97cf311bb3 100644
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@ -34,8 +34,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.causeway.viewer.wicket.viewer</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/causeway/viewer/wicket/viewer</git-plugin.propertiesDir>
-
- <!-- override surefire defaults from bom, as this is not a Java module
yet -->
+ <!-- override surefire defaults from bom, as this is not a Java
module yet -->
<surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine>
</properties>
@@ -65,7 +64,7 @@
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
+ <groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-spring</artifactId>
<exclusions>
<exclusion>
@@ -88,7 +87,7 @@
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
+ <groupId>com.github.apache-causeway-committers.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
<exclusions>
<exclusion>
