This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 63e325d4fab6409be3d0e936ebbed4ecc3fca0e0 Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Sat Dec 7 16:04:06 2024 +0100 Rework poms * consistent use of project.version when also using project.groupId * extract property for each dependency version * sort versions using groupId:artifactId:version --- jspwiki-210-adapters/pom.xml | 4 + jspwiki-api/pom.xml | 164 +++--- jspwiki-bom/pom.xml | 2 +- jspwiki-bootstrap/pom.xml | 25 +- jspwiki-cache/pom.xml | 2 + jspwiki-http/pom.xml | 16 +- jspwiki-kendra-searchprovider/pom.xml | 11 +- jspwiki-main/pom.xml | 634 ++++++++++----------- .../test/java/org/apache/wiki/HttpMockFactory.java | 23 + jspwiki-tika-searchprovider/pom.xml | 3 + jspwiki-war/pom.xml | 493 ++++++++-------- jspwiki-wysiwyg/pom.xml | 20 +- pom.xml | 305 ++++------ 13 files changed, 803 insertions(+), 899 deletions(-) diff --git a/jspwiki-210-adapters/pom.xml b/jspwiki-210-adapters/pom.xml index 2d0b836b9..35a5c646c 100644 --- a/jspwiki-210-adapters/pom.xml +++ b/jspwiki-210-adapters/pom.xml @@ -33,12 +33,14 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-main</artifactId> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-main</artifactId> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -46,6 +48,7 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-api</artifactId> + <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -58,6 +61,7 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-210-test-adaptees</artifactId> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/jspwiki-api/pom.xml b/jspwiki-api/pom.xml index a6a7a4cf2..af1f21182 100644 --- a/jspwiki-api/pom.xml +++ b/jspwiki-api/pom.xml @@ -17,85 +17,87 @@ 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/maven-v4_0_0.xsd";> - - <parent> - <groupId>org.apache.jspwiki</groupId> - <artifactId>jspwiki-builder</artifactId> - <version>3.0.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>jspwiki-api</artifactId> - <name>Apache JSPWiki public API</name> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-event</artifactId> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-util</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <scope>provided</scope> - </dependency> - -<dependency> - <groupId>jakarta.servlet.jsp</groupId> - <artifactId>jakarta.servlet.jsp-api</artifactId> - <scope>provided</scope> -</dependency> - - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-params</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-junit-jupiter</artifactId> - <scope>test</scope> - </dependency> - </dependencies> +<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/maven-v4_0_0.xsd";> + + <parent> + <groupId>org.apache.jspwiki</groupId> + <artifactId>jspwiki-builder</artifactId> + <version>3.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>jspwiki-api</artifactId> + <name>Apache JSPWiki public API</name> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-event</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-util</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>jakarta.servlet.jsp</groupId> + <artifactId>jakarta.servlet.jsp-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> diff --git a/jspwiki-bom/pom.xml b/jspwiki-bom/pom.xml index fb45b3563..9e21cc85a 100644 --- a/jspwiki-bom/pom.xml +++ b/jspwiki-bom/pom.xml @@ -31,7 +31,7 @@ <packaging>pom</packaging> <properties> - <jspwiki.version>2.12.4-SNAPSHOT</jspwiki.version> + <jspwiki.version>3.0.0-SNAPSHOT</jspwiki.version> </properties> <dependencyManagement> diff --git a/jspwiki-bootstrap/pom.xml b/jspwiki-bootstrap/pom.xml index 3a3b71891..1966f2582 100644 --- a/jspwiki-bootstrap/pom.xml +++ b/jspwiki-bootstrap/pom.xml @@ -33,25 +33,26 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-api</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-util</artifactId> + <version>${project.version}</version> </dependency> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <scope>provided</scope> - </dependency> - + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <scope>provided</scope> + </dependency> -<dependency> - <groupId>jakarta.servlet.jsp</groupId> - <artifactId>jakarta.servlet.jsp-api</artifactId> - <scope>provided</scope> -</dependency> + <dependency> + <groupId>jakarta.servlet.jsp</groupId> + <artifactId>jakarta.servlet.jsp-api</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -63,7 +64,7 @@ <artifactId>log4j-core</artifactId> </dependency> - <dependency> + <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> <scope>test</scope> diff --git a/jspwiki-cache/pom.xml b/jspwiki-cache/pom.xml index 617b701aa..a30f322cd 100644 --- a/jspwiki-cache/pom.xml +++ b/jspwiki-cache/pom.xml @@ -33,11 +33,13 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-api</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-util</artifactId> + <version>${project.version}</version> </dependency> <dependency> diff --git a/jspwiki-http/pom.xml b/jspwiki-http/pom.xml index 095d139bc..317d99af9 100644 --- a/jspwiki-http/pom.xml +++ b/jspwiki-http/pom.xml @@ -33,19 +33,21 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-api</artifactId> + <version>${project.version}</version> </dependency> - <dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-util</artifactId> + <version>${project.version}</version> </dependency> - <dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-event</artifactId> + <version>${project.version}</version> </dependency> - <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> @@ -56,11 +58,11 @@ <artifactId>log4j-1.2-api</artifactId> </dependency> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> <scope>provided</scope> - </dependency> + </dependency> <dependency> <groupId>org.junit.jupiter</groupId> diff --git a/jspwiki-kendra-searchprovider/pom.xml b/jspwiki-kendra-searchprovider/pom.xml index bc3710f90..d5d133b3b 100644 --- a/jspwiki-kendra-searchprovider/pom.xml +++ b/jspwiki-kendra-searchprovider/pom.xml @@ -34,12 +34,14 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-main</artifactId> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-main</artifactId> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -47,6 +49,7 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-api</artifactId> + <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -91,10 +94,10 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> <scope>test</scope> - </dependency> + </dependency> </dependencies> </project> \ No newline at end of file diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml index 7338f2f8e..040b89d60 100644 --- a/jspwiki-main/pom.xml +++ b/jspwiki-main/pom.xml @@ -17,332 +17,310 @@ 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/maven-v4_0_0.xsd";> - - <parent> - <groupId>org.apache.jspwiki</groupId> - <artifactId>jspwiki-builder</artifactId> - <version>3.0.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>jspwiki-main</artifactId> - <name>Apache JSPWiki Main Jar</name> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-util</artifactId> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-event</artifactId> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-api</artifactId> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-cache</artifactId> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-http</artifactId> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-wysiwyg</artifactId> - </dependency> - - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-fileupload2-javax</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-fileupload2-jakarta-servlet6</artifactId> - </dependency> - - <dependency> - <groupId>net.sourceforge</groupId> - <artifactId>akismet-java</artifactId> - </dependency> - - <dependency> - <groupId>net.sourceforge</groupId> - <artifactId>sandler</artifactId> - </dependency> - - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-text</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analysis-common</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-backward-codecs</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-highlighter</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-queryparser</artifactId> - </dependency> - - <dependency> - <groupId>org.codelibs</groupId> - <artifactId>nekohtml</artifactId> - </dependency> - - <dependency> - <groupId>org.freshcookies</groupId> - <artifactId>freshcookies-security</artifactId> - </dependency> - - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom2</artifactId> - </dependency> - - <dependency> - <groupId>org.jvnet.hudson</groupId> - <artifactId>org.suigeneris.jrcs.diff</artifactId> - </dependency> - - <dependency> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - </dependency> - - - <dependency> - <groupId>xmlrpc</groupId> - <artifactId>xmlrpc</artifactId> - </dependency> - - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>jakarta.servlet.jsp</groupId> - <artifactId>jakarta.servlet.jsp-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>jakarta.servlet.jsp.jstl</groupId> - <artifactId>jakarta.servlet.jsp.jstl-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.github.jbellis</groupId> - <artifactId>jamm</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>jakarta.mail</artifactId> - <version>2.0.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-webapp</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jndi</artifactId> - <version>12.0.14</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-plus</artifactId> - <version>12.0.14</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>12.0.14</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - <classifier>jdk8</classifier> - </dependency> - - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>sqltool</artifactId> - <scope>test</scope> - <classifier>jdk8</classifier> - </dependency> - - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-params</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-junit-jupiter</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - <phase>package</phase> - <configuration> - <excludes> - <exclude>**/test*/**</exclude> - <exclude>**/*Test.class</exclude> - <exclude>**/*Test$*.class</exclude> - <exclude>**/*Tests.class</exclude> - </excludes> - <skip>false</skip> - <skipIfEmpty>true</skipIfEmpty> - </configuration> - </execution> - </executions> - </plugin> - - <!-- Surefire plugin (running unit tests): - http://maven.apache.org/surefire/maven-surefire-plugin/ - - Individual tests can be run command line via: - mvn clean test -Dtest=WikiEngineTest,AclImplTest,... - - All tests can be skipped via -Dmaven.test.skip - --> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemPropertyVariables> - <java.io.tmpdir>${project.build.directory}</java.io.tmpdir> - </systemPropertyVariables> - <excludes> - <!-- time-consuming tests excluded by default --> - <exclude>**/StressTestVersioningProvider.java</exclude> - <exclude>**/StressTestSpeed.java</exclude> - <exclude>**/MassiveRepositoryTest.java</exclude> - </excludes> - <includes> - <include>**/*Test.java</include> - </includes> - </configuration> - </plugin> - - <plugin> - <groupId>ro.isdc.wro4j</groupId> - <artifactId>wro4j-maven-plugin</artifactId> - <executions> - <execution> - <id>buildPlainEditorSyntaxJS</id> - <phase>prepare-package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <extraConfigFile>${project.basedir}/src/main/javascript/wro.properties</extraConfigFile> - <jsDestinationFolder>${project.build.outputDirectory}/META-INF/resources/plain/</jsDestinationFolder> - <wroFile>src/main/javascript/wro.xml</wroFile> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> +<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/maven-v4_0_0.xsd";> + + <parent> + <groupId>org.apache.jspwiki</groupId> + <artifactId>jspwiki-builder</artifactId> + <version>3.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>jspwiki-main</artifactId> + <name>Apache JSPWiki Main Jar</name> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-util</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-event</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-cache</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-http</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-wysiwyg</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-fileupload2-javax</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-fileupload2-jakarta-servlet6</artifactId> + </dependency> + + <dependency> + <groupId>net.sourceforge</groupId> + <artifactId>akismet-java</artifactId> + </dependency> + + <dependency> + <groupId>net.sourceforge</groupId> + <artifactId>sandler</artifactId> + </dependency> + + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-text</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analysis-common</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-backward-codecs</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-highlighter</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-queryparser</artifactId> + </dependency> + + <dependency> + <groupId>org.codelibs</groupId> + <artifactId>nekohtml</artifactId> + </dependency> + + <dependency> + <groupId>org.freshcookies</groupId> + <artifactId>freshcookies-security</artifactId> + </dependency> + + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom2</artifactId> + </dependency> + + <dependency> + <groupId>org.jvnet.hudson</groupId> + <artifactId>org.suigeneris.jrcs.diff</artifactId> + </dependency> + + <dependency> + <groupId>oro</groupId> + <artifactId>oro</artifactId> + </dependency> + + <dependency> + <groupId>xmlrpc</groupId> + <artifactId>xmlrpc</artifactId> + </dependency> + + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>jakarta.servlet.jsp</groupId> + <artifactId>jakarta.servlet.jsp-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>jakarta.servlet.jsp.jstl</groupId> + <artifactId>jakarta.servlet.jsp.jstl-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>com.github.jbellis</groupId> + <artifactId>jamm</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>com.sun.mail</groupId> + <artifactId>jakarta.mail</artifactId> + </dependency> + + <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + <classifier>jdk8</classifier> + </dependency> + + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>sqltool</artifactId> + <scope>test</scope> + <classifier>jdk8</classifier> + </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + <phase>package</phase> + <configuration> + <excludes> + <exclude>**/test*/**</exclude> + <exclude>**/*Test.class</exclude> + <exclude>**/*Test$*.class</exclude> + <exclude>**/*Tests.class</exclude> + </excludes> + <skip>false</skip> + <skipIfEmpty>true</skipIfEmpty> + </configuration> + </execution> + </executions> + </plugin> + + <!-- Surefire plugin (running unit tests): + http://maven.apache.org/surefire/maven-surefire-plugin/ + + Individual tests can be run command line via: + mvn clean test -Dtest=WikiEngineTest,AclImplTest,... + + All tests can be skipped via -Dmaven.test.skip + --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <java.io.tmpdir>${project.build.directory}</java.io.tmpdir> + </systemPropertyVariables> + <excludes> + <!-- time-consuming tests excluded by default --> + <exclude>**/StressTestVersioningProvider.java</exclude> + <exclude>**/StressTestSpeed.java</exclude> + <exclude>**/MassiveRepositoryTest.java</exclude> + </excludes> + <includes> + <include>**/*Test.java</include> + </includes> + </configuration> + </plugin> + + <plugin> + <groupId>ro.isdc.wro4j</groupId> + <artifactId>wro4j-maven-plugin</artifactId> + <executions> + <execution> + <id>buildPlainEditorSyntaxJS</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <extraConfigFile>${project.basedir}/src/main/javascript/wro.properties</extraConfigFile> + <jsDestinationFolder>${project.build.outputDirectory}/META-INF/resources/plain/ + </jsDestinationFolder> + <wroFile>src/main/javascript/wro.xml</wroFile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/jspwiki-main/src/test/java/org/apache/wiki/HttpMockFactory.java b/jspwiki-main/src/test/java/org/apache/wiki/HttpMockFactory.java index 746a606dc..efec2ddb6 100755 --- a/jspwiki-main/src/test/java/org/apache/wiki/HttpMockFactory.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/HttpMockFactory.java @@ -1,3 +1,21 @@ +/* + 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.wiki; import jakarta.servlet.FilterChain; @@ -16,6 +34,11 @@ import java.util.List; import java.util.Locale; import java.util.Vector; + +/** + * Mocks {@link TestEngine}'s http interactions. As this is a general usage class, tests using {@code MockitoExtension} + * and {@link TestEngine} should also use {@code @MockitoSettings( strictness = Strictness.LENIENT}. + */ public class HttpMockFactory { public static FilterChain createFilterChain() { diff --git a/jspwiki-tika-searchprovider/pom.xml b/jspwiki-tika-searchprovider/pom.xml index 4c1873972..0b6c2b1dd 100644 --- a/jspwiki-tika-searchprovider/pom.xml +++ b/jspwiki-tika-searchprovider/pom.xml @@ -34,18 +34,21 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-main</artifactId> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-api</artifactId> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-main</artifactId> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/jspwiki-war/pom.xml b/jspwiki-war/pom.xml index da7a7280d..6dd6da84c 100644 --- a/jspwiki-war/pom.xml +++ b/jspwiki-war/pom.xml @@ -17,276 +17,269 @@ 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/maven-v4_0_0.xsd";> +<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/maven-v4_0_0.xsd";> - <parent> - <groupId>org.apache.jspwiki</groupId> - <artifactId>jspwiki-builder</artifactId> - <version>3.0.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.apache.jspwiki</groupId> + <artifactId>jspwiki-builder</artifactId> + <version>3.0.0-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jspwiki-war</artifactId> - <name>Apache JSPWiki Main War</name> - <packaging>war</packaging> + <modelVersion>4.0.0</modelVersion> + <artifactId>jspwiki-war</artifactId> + <name>Apache JSPWiki Main War</name> + <packaging>war</packaging> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-bootstrap</artifactId> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-main</artifactId> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-markdown</artifactId> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-210-adapters</artifactId> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-kendra-searchprovider</artifactId> - </dependency> - - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <scope>provided</scope> - </dependency> - -<dependency> - <groupId>jakarta.servlet.jsp</groupId> - <artifactId>jakarta.servlet.jsp-api</artifactId> - <scope>provided</scope> -</dependency> - -<dependency> - <groupId>jakarta.servlet.jsp.jstl</groupId> - <artifactId>jakarta.servlet.jsp.jstl-api</artifactId> -</dependency> -<dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>jakarta.servlet.jsp.jstl</artifactId> -</dependency> - - - </dependencies> - - <build> - <finalName>JSPWiki</finalName> - <plugins> - <plugin> - <groupId>io.leonard.maven.plugins</groupId> - <artifactId>jspc-maven-plugin</artifactId> - <version>4.2.0</version> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-bootstrap</artifactId> + <version>${project.version}</version> + </dependency> - <dependencies> - - - <dependency> <!-- so jspwiki custom taglibs can be seen by the jsp compiler --> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>jspwiki-main</artifactId> <version>${project.version}</version> - </dependency> - <dependency> + </dependency> + + <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-api</artifactId> + <artifactId>jspwiki-markdown</artifactId> <version>${project.version}</version> - </dependency> - <dependency> + </dependency> + + <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-http</artifactId> + <artifactId>jspwiki-210-adapters</artifactId> <version>${project.version}</version> - </dependency> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-kendra-searchprovider</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>jakarta.servlet.jsp.jstl</groupId> - <artifactId>jakarta.servlet.jsp.jstl-api</artifactId> - <version>3.0.2</version> - </dependency> - - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>jakarta.servlet.jsp.jstl</artifactId> - <version>3.0.1</version> - </dependency> - + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jakarta.servlet.jsp</groupId> + <artifactId>jakarta.servlet.jsp-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - <version>2.10.9.2</version> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - </dependency> - - - </dependencies> - </plugin> + <dependency> + <groupId>jakarta.servlet.jsp.jstl</groupId> + <artifactId>jakarta.servlet.jsp.jstl-api</artifactId> + </dependency> - <!-- wro4j Web Resource Optimizer for Java (http://http://code.google.com/p/wro4j/) - Merge and compress CSS and JS files using the WRO4J. - - use UglifyJS for JS compression - - use Less as advanced CSS preprocessor - --> - <plugin> - <groupId>ro.isdc.wro4j</groupId> - <artifactId>wro4j-maven-plugin</artifactId> - <executions> - <execution> - <id>buildDefaultJsAndCss</id> - <phase>prepare-package</phase> - <goals> - <goal>run</goal> - <!--<goal>jshint</goal>--> - </goals> - <configuration> - <!-- - <targetGroups>all</targetGroups> - <minimize>true</minimize> - <cssDestinationFolder>d:/static/css/</cssDestinationFolder> - <jsDestinationFolder>d:/static/js/</jsDestinationFolder> - <ignoreMissingResources>false</ignoreMissingResources> - --> - <cssDestinationFolder>${project.build.directory}/generated-sources/wro/templates/210/</cssDestinationFolder> - <wroFile>src/main/config/wro/wro.xml</wroFile> - </configuration> - </execution> + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>jakarta.servlet.jsp.jstl</artifactId> + </dependency> + </dependencies> - <!-- HADDOCK template --> - <execution> - <id>buildHaddockJsAndCss</id> - <phase>prepare-package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <cssDestinationFolder>${project.build.directory}/generated-sources/wro/templates/default/</cssDestinationFolder> - <wroFile>src/main/config/wro/wro-haddock.xml</wroFile> - </configuration> - </execution> - </executions> - </plugin> + <build> + <finalName>JSPWiki</finalName> + <plugins> + <plugin> + <groupId>io.leonard.maven.plugins</groupId> + <artifactId>jspc-maven-plugin</artifactId> + <dependencies> + <dependency> <!-- so jspwiki custom taglibs can be seen by the jsp compiler --> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-main</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jspwiki-http</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>jakarta.servlet.jsp.jstl</groupId> + <artifactId>jakarta.servlet.jsp.jstl-api</artifactId> + <version>${jakarta-jstl-api.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>jakarta.servlet.jsp.jstl</artifactId> + <version>${jakarta-jstl.version}</version> + </dependency> + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>${ehcache.version}</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>${commons-httpclient.version}</version> + </dependency> + </dependencies> + </plugin> - <!-- Compress certain CSS and JS files using the YUICompressor - (http://alchim.sourceforge.net/yuicompressor-maven-plugin/) - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>yuicompressor-maven-plugin</artifactId> - <executions> - <execution> - <id>compressJSfiles</id> - <goals> - <goal>compress</goal> - </goals> - </execution> - </executions> - <configuration> - <excludeResources>true</excludeResources> - <nosuffix>true</nosuffix> - <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory> - *** relying on jslint-maven-plugin instead, which allows - better customization *** - <jswarn>false</jswarn> - </configuration> - </plugin> - --> + <!-- wro4j Web Resource Optimizer for Java (http://http://code.google.com/p/wro4j/) + Merge and compress CSS and JS files using the WRO4J. + - use UglifyJS for JS compression + - use Less as advanced CSS preprocessor + --> + <plugin> + <groupId>ro.isdc.wro4j</groupId> + <artifactId>wro4j-maven-plugin</artifactId> + <executions> + <execution> + <id>buildDefaultJsAndCss</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + <!--<goal>jshint</goal>--> + </goals> + <configuration> + <!-- + <targetGroups>all</targetGroups> + <minimize>true</minimize> + <cssDestinationFolder>d:/static/css/</cssDestinationFolder> + <jsDestinationFolder>d:/static/js/</jsDestinationFolder> + <ignoreMissingResources>false</ignoreMissingResources> + --> + <cssDestinationFolder>${project.build.directory}/generated-sources/wro/templates/210/ + </cssDestinationFolder> + <wroFile>src/main/config/wro/wro.xml</wroFile> + </configuration> + </execution> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jslint-maven-plugin</artifactId> - <executions> - <execution> - <id>checkJSPWikiFiles</id> - <goals> - <goal>jslint</goal> - </goals> - <configuration> - <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder> - <failOnIssues>false</failOnIssues> - <excludes> - <exclude>prettify.js</exclude> - </excludes> - </configuration> - </execution> - <!-- Some third party JSs have many multiple number of VARs per function - block, are outside of our control so suppressing such messages --> - <execution> - <id>checkThirdParty</id> - <goals> - <goal>jslint</goal> - </goals> - <configuration> - <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder> - <failOnIssues>false</failOnIssues> - <includes> - <include>prettify.js</include> - </includes> - <allowOneVarStatementPerFunction>false</allowOneVarStatementPerFunction> - </configuration> - </execution> - </executions> - </plugin> + <!-- HADDOCK template --> + <execution> + <id>buildHaddockJsAndCss</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <cssDestinationFolder>${project.build.directory}/generated-sources/wro/templates/default/ + </cssDestinationFolder> + <wroFile>src/main/config/wro/wro-haddock.xml</wroFile> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <!-- Output directory configured above with the YUICompressor Maven plugin - <resource> - <directory>${project.build.directory}/generated-sources/yuicompress</directory> - </resource> + <!-- Compress certain CSS and JS files using the YUICompressor + (http://alchim.sourceforge.net/yuicompressor-maven-plugin/) + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>yuicompressor-maven-plugin</artifactId> + <executions> + <execution> + <id>compressJSfiles</id> + <goals> + <goal>compress</goal> + </goals> + </execution> + </executions> + <configuration> + <excludeResources>true</excludeResources> + <nosuffix>true</nosuffix> + <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory> + *** relying on jslint-maven-plugin instead, which allows + better customization *** + <jswarn>false</jswarn> + </configuration> + </plugin> --> - <resource> - <directory>${project.build.directory}/generated-sources/wro</directory> - </resource> - <resource> - <directory>src/main/styles/static</directory> - </resource> - </webResources> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <!-- Unpack the JSP Wiki Pages --> - <execution> - <id>unpack-wikipages-private</id> - <phase>package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.jspwiki.wikipages</groupId> - <artifactId>jspwiki-wikipages-en</artifactId> - <version>${project.version}</version> - </artifactItem> - </artifactItems> - <excludes>META-INF/**</excludes> - <outputDirectory>${project.build.directory}/jspwiki/data/jspwiki-files</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jslint-maven-plugin</artifactId> + <executions> + <execution> + <id>checkJSPWikiFiles</id> + <goals> + <goal>jslint</goal> + </goals> + <configuration> + <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder> + <failOnIssues>false</failOnIssues> + <excludes> + <exclude>prettify.js</exclude> + </excludes> + </configuration> + </execution> + <!-- Some third party JSs have many multiple number of VARs per function + block, are outside our control so suppressing such messages --> + <execution> + <id>checkThirdParty</id> + <goals> + <goal>jslint</goal> + </goals> + <configuration> + <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder> + <failOnIssues>false</failOnIssues> + <includes> + <include>prettify.js</include> + </includes> + <allowOneVarStatementPerFunction>false</allowOneVarStatementPerFunction> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <!-- Output directory configured above with the YUICompressor Maven plugin + <resource> + <directory>${project.build.directory}/generated-sources/yuicompress</directory> + </resource> + --> + <resource> + <directory>${project.build.directory}/generated-sources/wro</directory> + </resource> + <resource> + <directory>src/main/styles/static</directory> + </resource> + </webResources> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <!-- Unpack the JSP Wiki Pages --> + <execution> + <id>unpack-wikipages-private</id> + <phase>package</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.jspwiki.wikipages</groupId> + <artifactId>jspwiki-wikipages-en</artifactId> + <version>${project.version}</version> + </artifactItem> + </artifactItems> + <excludes>META-INF/**</excludes> + <outputDirectory>${project.build.directory}/jspwiki/data/jspwiki-files</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/jspwiki-wysiwyg/pom.xml b/jspwiki-wysiwyg/pom.xml index b4a1db45a..8ced1f18d 100644 --- a/jspwiki-wysiwyg/pom.xml +++ b/jspwiki-wysiwyg/pom.xml @@ -41,7 +41,6 @@ <artifactId>jspwiki-util</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -58,17 +57,16 @@ <artifactId>nekohtml</artifactId> </dependency> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <scope>provided</scope> - </dependency> - -<dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom2</artifactId> -</dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom2</artifactId> + </dependency> <dependency> <groupId>org.junit.jupiter</groupId> diff --git a/pom.xml b/pom.xml index e91e788e8..27beeacbd 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ <awaitility.version>4.3.0</awaitility.version> <aws-java-sdk-kendra.version>1.12.565</aws-java-sdk-kendra.version> <commons-collections.version>4.5.0</commons-collections.version> - <commons-fileupload.version>1.6.0</commons-fileupload.version> + <commons-fileupload.version>2.0.0-M2</commons-fileupload.version> <commons-httpclient.version>3.1</commons-httpclient.version> <commons-io.version>2.20.0</commons-io.version> <commons-lang.version>3.18.0</commons-lang.version> @@ -56,16 +56,21 @@ <ehcache.version>2.10.9.2</ehcache.version> <flexmark.version>0.64.8</flexmark.version> <freshcookies-security.version>0.60</freshcookies-security.version> - <gson.version>2.13.1</gson.version> - <hsqldb.version>2.7.4</hsqldb.version> + <gson.version>2.11.0</gson.version> + <hsqldb.version>2.7.2</hsqldb.version> + <jakarta-activation.version>2.0.1</jakarta-activation.version> + <jakarta-activation-api.version>2.1.3</jakarta-activation-api.version> + <jakarta-jsp-api.version>4.0.0</jakarta-jsp-api.version> + <jakarta-jstl.version>3.0.1</jakarta-jstl.version> + <jakarta-jstl-api.version>3.0.2</jakarta-jstl-api.version> + <jakarta-mail.version>2.0.1</jakarta-mail.version> + <jakarta-mail-api.version>2.1.3</jakarta-mail-api.version> + <jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version> <jamm.version>0.4.0</jamm.version> <jaxen.version>2.0.0</jaxen.version> - <javax-jstl.version>1.2</javax-jstl.version> <javax-mail.version>1.6.2</javax-mail.version> <javax-jsp-api.version>2.3.3</javax-jsp-api.version> - <javax-servlet-api.version>3.1.0</javax-servlet-api.version> <jdom2.version>2.0.6</jdom2.version> - <jetty.version>9.4.54.v20240208</jetty.version> <jrcs-diff.version>0.4.2</jrcs-diff.version> <junit.version>5.13.4</junit.version> <log4j2.version>2.25.1</log4j2.version> @@ -102,8 +107,7 @@ <plugin.surefire.junit5-tree-reporter.version>1.4.0</plugin.surefire.junit5-tree-reporter.version> <plugin.war.version>3.4.0</plugin.war.version> <plugin.inmemdb.version>1.4.3</plugin.inmemdb.version> - <plugin.jspc.version>3.2.2</plugin.jspc.version> - <plugin.build-helper.version>3.6.1</plugin.build-helper.version> + <plugin.jspc.version>5.0.0</plugin.jspc.version> <plugin.checksum.version>1.11</plugin.checksum.version> <plugin.jslint.version>1.0.1</plugin.jslint.version> <plugin.cargo.version>1.10.20</plugin.cargo.version> @@ -148,94 +152,7 @@ <dependencyManagement> <!-- defines what configuration is going to be used if, and only if, the dependency is used --> <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-api</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-main</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-util</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-event</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-cache</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-http</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-wysiwyg</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-markdown</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-kendra-searchprovider</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-main</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-210-adapters</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-210-adapters</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-210-test-adaptees</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jspwiki-bootstrap</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- ordered alphabetically by scope:groupId:artifactId --> + <!-- ordered alphabetically by scope:groupId:artifactId --> <!-- compile dependencies --> <dependency> <groupId>com.amazonaws</groupId> @@ -249,22 +166,10 @@ <version>${selenide.version}</version> </dependency> - <dependency> - <groupId>jakarta.activation</groupId> - <artifactId>jakarta.activation-api</artifactId> - <version>2.1.3</version> - </dependency> - - <dependency> - <groupId>com.sun.activation</groupId> - <artifactId>jakarta.activation</artifactId> - <version>2.0.1</version> - </dependency> - <dependency><!-- https://jakartaee.github.io/mail-api/README-JakartaMail#Download_Jakarta_Mail_Release --> <groupId>com.sun.mail</groupId> <artifactId>jakarta.mail</artifactId> - <version>2.0.1</version> + <version>${jakarta-mail.version}</version> </dependency> <dependency><!-- as of 1.6.2 not included by javax.mail-api, see https://javaee.github.io/javamail/docs/COMPAT.txt --> @@ -273,12 +178,6 @@ <version>${javax-mail.version}</version> </dependency> - <dependency> - <groupId>jakarta.mail</groupId> - <artifactId>jakarta.mail-api</artifactId> - <version>2.1.3</version> - </dependency> - <dependency> <groupId>org.eclipse.angus</groupId> <artifactId>angus-mail</artifactId> @@ -327,18 +226,6 @@ <version>${flexmark.version}</version> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-fileupload2-javax</artifactId> - <version>2.0.0-M2</version> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-fileupload2-jakarta-servlet6</artifactId> - <version>2.0.0-M2</version> - </dependency> - <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> @@ -352,45 +239,39 @@ </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - <version>${commons-collections.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>${commons-lang.version}</version> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + <version>${jakarta-activation-api.version}</version> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-text</artifactId> - <version>${commons-text.version}</version> + <groupId>com.sun.activation</groupId> + <artifactId>jakarta.activation</artifactId> + <version>${jakarta-activation.version}</version> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${log4j2.version}</version> + <groupId>jakarta.mail</groupId> + <artifactId>jakarta.mail-api</artifactId> + <version>${jakarta-mail-api.version}</version> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>${jakarta-servlet-api.version}</version> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - <version>${log4j2.version}</version> + <groupId>jakarta.servlet.jsp</groupId> + <artifactId>jakarta.servlet.jsp-api</artifactId> + <version>${jakarta-jsp-api.version}</version> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${log4j2.version}</version> + <groupId>jakarta.servlet.jsp.jstl</groupId> + <artifactId>jakarta.servlet.jsp.jstl-api</artifactId> + <version>${jakarta-jstl-api.version}</version> </dependency> <dependency> @@ -417,6 +298,60 @@ <version>${ehcache.version}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>${commons-collections.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-fileupload2-javax</artifactId> + <version>${commons-fileupload.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-fileupload2-jakarta-servlet6</artifactId> + <version>${commons-fileupload.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons-lang.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-text</artifactId> + <version>${commons-text.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j2.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j2.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <version>${log4j2.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4j2.version}</version> + </dependency> + <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analysis-common</artifactId> @@ -465,6 +400,12 @@ <version>${freshcookies-security.version}</version> </dependency> + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>jakarta.servlet.jsp.jstl</artifactId> + <version>${jakarta-jstl.version}</version> + </dependency> + <dependency> <groupId>org.jdom</groupId> <artifactId>jdom2</artifactId> @@ -477,18 +418,6 @@ <version>${jrcs-diff.version}</version> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-junit-jupiter</artifactId> - <version>${mockito.version}</version> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -526,28 +455,6 @@ <version>${awaitility.version}</version> </dependency> - <!-- - Note: As Jetty activates during the build, can upgrade - only to the latest Jetty version that can run on the - minimum JDK JSPWiki supports: - http://www.eclipse.org/jetty/documentation/current/what-jetty-version.html - - <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-all</artifactId> - <version>${jetty.version}</version> - <type>pom</type> - </dependency> - --> - - <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-bom</artifactId> - <version>12.0.14</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> @@ -571,27 +478,15 @@ </dependency> <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>6.0.0</version> - </dependency> - - <dependency> - <groupId>jakarta.servlet.jsp</groupId> - <artifactId>jakarta.servlet.jsp-api</artifactId> - <version>4.0.0</version> - </dependency> - - <dependency> - <groupId>jakarta.servlet.jsp.jstl</groupId> - <artifactId>jakarta.servlet.jsp.jstl-api</artifactId> - <version>3.0.2</version> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.version}</version> </dependency> <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>jakarta.servlet.jsp.jstl</artifactId> - <version>3.0.1</version> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + <version>${mockito.version}</version> </dependency> </dependencies> </dependencyManagement> @@ -947,7 +842,7 @@ <configuration> <container> <!-- https://codehaus-cargo.github.io/cargo/Maven2+Plugin+Reference+Guide.html#Maven2PluginReferenceGuide-container --> - <containerId>tomcat9x</containerId> + <containerId>tomcat10x</containerId> <zipUrlInstaller> <url>https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip</url> </zipUrlInstaller> @@ -959,7 +854,7 @@ </container> <configuration> <type>standalone</type> - <home>${project.build.directory}/tomcat9x</home> + <home>${project.build.directory}/tomcat10x</home> <properties> <cargo.servlet.port>8080</cargo.servlet.port> <cargo.jvmargs>-Xms256m -Xmx3072m -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:+DisableExplicitGC -Xverify:none -Djava.awt.headless=true</cargo.jvmargs>
