module-info are added; structrure is updated to conform M2

bootstrap-common-tests/src/test/java/de/agilecoders/wicket/testing/osgi/OsgiClashingPackagesTest.java

@@ -49,7 +49,7 @@ void collectProjectPackages() throws IOException {
         Set<Entry<String, List<Project>>> entrySet = projectBuckets.entrySet();
         for (Entry<String, List<Project>> entry : entrySet) {
             List<Project> projects = entry.getValue();
-            if (projects.size() > 1) {
+            if (!"".equals(entry.getKey()) && projects.size() > 1) {
                 fail(entry);
             }
         }

bootstrap-core/pom.xml

@@ -18,9 +18,6 @@
         <url>https://github.com/l0rdn1kk0n/wicket-bootstrap/issues</url>
     </issueManagement>
 
-    <properties>
-        <autoModuleName>wicket.bootstrap.core</autoModuleName>
-    </properties>
     <dependencies>
 
         <dependency>
@@ -69,6 +66,11 @@
             <artifactId>wicket-util</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket-tester</artifactId>
+        </dependency>
+
         <!-- LOGGING DEPENDENCIES - LOG4J -->
         <dependency>
             <groupId>org.slf4j</groupId>

bootstrap-core/src/main/java/module-info.java

@@ -0,0 +1,51 @@
+module wicket.bootstrap.core {
+    exports de.agilecoders.wicket.core;
+    exports de.agilecoders.wicket.core.markup.html;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.badge;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.behavior;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.block;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.block.prettyprint;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.button;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.button.dropdown;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.carousel;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.common;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.components;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.components.progress;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.dialog;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.form;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.form.radio;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.heading;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.html;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.image;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.layout;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.layout.col;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.layout.offset;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.layout.order;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.list;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.navbar;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.navigation;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.panel;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.table;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.tabs;
+    exports de.agilecoders.wicket.core.markup.html.bootstrap.utilities;
+    exports de.agilecoders.wicket.core.markup.html.references;
+    exports de.agilecoders.wicket.core.markup.html.themes.bootstrap;
+    exports de.agilecoders.wicket.core.settings;
+    exports de.agilecoders.wicket.core.util;
+
+    requires org.apache.commons.lang3;
+
+    requires org.apache.wicket.core;
+    requires org.apache.wicket.extensions;
+    requires org.apache.wicket.request;
+    requires org.apache.wicket.util;
+
+    requires com.fasterxml.jackson.core;
+    requires com.fasterxml.jackson.databind;
+
+    requires org.slf4j;
+
+    requires jquery.selectors;
+    requires wicket.webjars;
+}

bootstrap-extensions/pom.xml

@@ -14,8 +14,6 @@
     <name>bootstrap-extensions</name>
 
     <properties>
-        <autoModuleName>wicket.bootstrap.extensions</autoModuleName>
-
         <inputmask.version>5.0.6</inputmask.version>
         <jqueryui.version>1.13.2</jqueryui.version>
         <typeaheadjs.version>0.11.1</typeaheadjs.version>
@@ -86,7 +84,6 @@
         <dependency>
             <groupId>com.google.javascript</groupId>
             <artifactId>closure-compiler-unshaded</artifactId>
-            <version>${google-closure.version}</version>
             <optional>true</optional>
         </dependency>
 
@@ -155,6 +152,10 @@
         </dependency>
 
         <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket-tester</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/editor/SummernoteEditor.java

@@ -10,13 +10,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.FileUploadException;
 import org.apache.wicket.Application;
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.commons.fileupload2.FileItem;
-import org.apache.wicket.commons.fileupload2.FileUploadException;
 import org.apache.wicket.core.util.string.JavaScriptUtils;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.MarkupStream;

bootstrap-extensions/src/main/java/module-info.java

@@ -0,0 +1,57 @@
+module wicket.bootstrap.extensions {
+    exports de.agilecoders.wicket.extensions.javascript;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.behavior;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.editor;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstrapcheckbox;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstraptoggle;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkboxx;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.clockpicker;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.datetime;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.password.strength;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.rating;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.select;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.spinner;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.tempusdominus;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.typeahead;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.typeaheadV10;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.typeaheadV10.bloodhound;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.form.validation;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.html5player;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.icon;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.inputmask;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.jqueryui;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.markdown;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.navigation;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.references;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.spinner;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.table;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.table.filter;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.table.sort;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.table.toolbars;
+    exports de.agilecoders.wicket.extensions.markup.html.bootstrap.tour;
+    exports de.agilecoders.wicket.extensions.request;
+    exports de.agilecoders.wicket.extensions.wizard;
+
+    requires org.apache.commons.fileupload2.core;
+
+    requires org.apache.wicket.core;
+    requires org.apache.wicket.extensions;
+    requires org.apache.wicket.request;
+    requires org.apache.wicket.util;
+
+    requires wicket.bootstrap.core;
+    requires jquery.selectors;
+
+    requires com.google.common;
+    requires com.fasterxml.jackson.annotation;
+    requires com.fasterxml.jackson.core;
+    requires com.fasterxml.jackson.databind;
+
+    requires org.slf4j;
+
+    requires static yuicompressor;
+    requires static closure.compiler.unshaded.v20230802;
+}

bootstrap-sass/pom.xml

@@ -14,14 +14,12 @@
     <packaging>bundle</packaging>
 
     <properties>
-        <autoModuleName>wicket.bootstrap.saas</autoModuleName>
-
         <antlr.version>3.5.2</antlr.version>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>ua.kasta</groupId>
+            <groupId>io.bit3</groupId>
             <artifactId>jsass</artifactId>
             <version>${jsass.version}</version>
         </dependency>
@@ -43,6 +41,10 @@
         </dependency>
 
         <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket-tester</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

bootstrap-sass/src/main/java/module-info.java

@@ -0,0 +1,17 @@
+module wicket.bootstrap.saas {
+    exports de.agilecoders.wicket.sass;
+
+    requires jsass;
+    requires wicket.webjars;
+
+    requires org.apache.commons.io;
+    requires org.apache.commons.lang3;
+
+    requires org.apache.wicket.core;
+    requires org.apache.wicket.request;
+    requires org.apache.wicket.util;
+
+    requires jakarta.servlet;
+
+    requires org.slf4j;
+}

bootstrap-themes/pom.xml

@@ -14,8 +14,6 @@
     <name>bootstrap-themes</name>
 
     <properties>
-        <autoModuleName>wicket.bootstrap.themes</autoModuleName>
-
         <bootstrap-italia.version>1.6.2</bootstrap-italia.version>
         <splide.version>3.6.12</splide.version>
     </properties>

bootstrap-themes/src/main/java/module-info.java

@@ -0,0 +1,13 @@
+module wicket.bootstrap.themes {
+    exports de.agilecoders.wicket.themes.markup.html.bootstrap;
+    exports de.agilecoders.wicket.themes.markup.html.bootswatch;
+    exports de.agilecoders.wicket.themes.markup.html.italia;
+    exports de.agilecoders.wicket.themes.markup.html.material_design;
+
+    requires org.apache.wicket.core;
+    requires org.apache.wicket.request;
+    requires org.apache.wicket.util;
+
+    requires wicket.bootstrap.core;
+    requires wicket.webjars;
+}

pom.xml

@@ -43,11 +43,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.java.source>${java.version}</maven.java.source>
         <maven.java.target>${java.version}</maven.java.target>
-        <autoModuleName>wicket.bootstrap.parent</autoModuleName>
 
         <bootstrap.version>5.3.2</bootstrap.version>
         <wicket-webjars.version>4.0.0</wicket-webjars.version>
-        <wicket-jquery-selectors.version>4.0.0</wicket-jquery-selectors.version>
+        <wicket-jquery-selectors.version>4.0.1</wicket-jquery-selectors.version>
         <popper.version>2.11.8</popper.version>
 
         <enforcer.disable>true</enforcer.disable>
@@ -62,8 +61,8 @@
         <contiperf.version>2.4.3</contiperf.version>
         <doxia.version>1.0</doxia.version>
         <!-- Note: closure-compiler -unshaded v20200920 (until at least v20210907) contains gson -->
-        <google-closure.version>v20200830</google-closure.version>
-        <jetty.version>11.0.13</jetty.version>
+        <google-closure.version>v20230802</google-closure.version>
+        <jetty.version>11.0.17</jetty.version>
         <jquerypp.version>1.0.1</jquerypp.version>
         <jquery.version>3.7.1</jquery.version>
         <junit-jupiter.version>5.10.0</junit-jupiter.version>
@@ -72,11 +71,11 @@
         <hamcrest.version>2.2</hamcrest.version>
         <logback.version>1.4.11</logback.version>
         <modernizr.version>2.8.3-1</modernizr.version>
-        <mockito.version>5.5.0</mockito.version>
+        <mockito.version>5.6.0</mockito.version>
         <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
         <slf4j.version>2.0.9</slf4j.version>
-        <wicket.version>10.0.0-M1</wicket.version>
-        <wicketstuff.version>10.0.0-M1</wicketstuff.version>
+        <wicket.version>10.0.0-M2-SNAPSHOT</wicket.version>
+        <wicketstuff.version>10.0.0-M2-SNAPSHOT</wicketstuff.version>
         <yuicompressor.version>2.4.8</yuicompressor.version>
 
         <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
@@ -143,6 +142,13 @@
                 <version>${wicket.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-tester</artifactId>
+                <version>${wicket.version}</version>
+                <scope>test</scope>
+            </dependency>
+
             <dependency>
                 <groupId>org.wicketstuff</groupId>
                 <artifactId>wicketstuff-annotation</artifactId>
@@ -272,6 +278,12 @@
                 <version>${slf4j.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.google.javascript</groupId>
+                <artifactId>closure-compiler-unshaded</artifactId>
+                <version>${google-closure.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apiguardian</groupId>
                 <artifactId>apiguardian-api</artifactId>
@@ -415,6 +427,9 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${maven-surefire-plugin.version}</version>
+                    <configuration>
+                        <useModulePath>false</useModulePath>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -489,7 +504,6 @@
                         <instructions>
                             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                             <Bundle-Version>${project.version}</Bundle-Version>
-                            <Automatic-Module-Name>${autoModuleName}</Automatic-Module-Name>
                         </instructions>
                     </configuration>
                 </plugin>