diff --git a/jetty-home/src/main/resources/modules/hawtio.mod b/jetty-home/src/main/resources/modules/hawtio.mod deleted file mode 100644 index b4dd2a8fcd0..00000000000 --- a/jetty-home/src/main/resources/modules/hawtio.mod +++ /dev/null @@ -1,36 +0,0 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[description] -Deploys the Hawtio console as a web application. - -[tags] -3rdparty - -[depend] -stats -deploy -jmx - -[xml] -etc/hawtio.xml - -[files] -etc/hawtio/ -lib/hawtio/ -maven://io.hawt/hawtio-default/${hawtio.version}/war|lib/hawtio/hawtio.war -basehome:modules/hawtio/hawtio.xml|etc/hawtio.xml - -[license] -Hawtio is a redhat JBoss project released under the Apache License, v2.0 -http://hawt.io/ -http://github.com/hawtio/hawtio -http://www.apache.org/licenses/LICENSE-2.0.html - -[ini] -hawtio.version?=@hawtio.version@ - -[ini-template] -## Hawt.io configuration --Dhawtio.authenticationEnabled?=false --Dhawtio.dirname?=/dirname --Dhawtio.config.dir?=${jetty.base}/etc/hawtio diff --git a/jetty-home/src/main/resources/modules/hawtio/hawtio.xml b/jetty-home/src/main/resources/modules/hawtio/hawtio.xml deleted file mode 100644 index 8b66e036292..00000000000 --- a/jetty-home/src/main/resources/modules/hawtio/hawtio.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - /hawtio - /lib/hawtio/hawtio.war - true - false - /etc/webdefault.xml - - - - diff --git a/jetty-home/src/main/resources/modules/jamon.mod b/jetty-home/src/main/resources/modules/jamon.mod deleted file mode 100644 index 109410a2e8b..00000000000 --- a/jetty-home/src/main/resources/modules/jamon.mod +++ /dev/null @@ -1,39 +0,0 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[description] -Deploys the JAMon web application. - -[tags] -3rdparty - -[depend] -stats -deploy -jmx -jsp - -[xml] -etc/jamon.xml - -[files] -lib/jamon/ -maven://com.jamonapi/jamon/${jamon.version}|lib/jamon/jamon-${jamon.version}.jar -maven://com.jamonapi/jamon_war/${jamon.version}/war|lib/jamon/jamon.war -basehome:modules/jamon/jamon.xml|etc/jamon.xml - -[lib] -lib/jamon/**.jar - -[license] -JAMon is a source forge hosted project released under a BSD derived license. -http://jamonapi.sourceforge.net -http://jamonapi.sourceforge.net/JAMonLicense.html - -[ini] -jamon.version?=@jamon.version@ - -[ini-template] -## Jamon Configuration -# jamon.summaryLabels=demo -jamon.summaryLabels=default, request.getStatus().contextpath.value.ms - diff --git a/jetty-home/src/main/resources/modules/jamon/jamon.xml b/jetty-home/src/main/resources/modules/jamon/jamon.xml deleted file mode 100644 index e4356d4833f..00000000000 --- a/jetty-home/src/main/resources/modules/jamon/jamon.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - /jamon - /lib/jamon/jamon.war - true - false - /etc/webdefault.xml - - - - - - diff --git a/jetty-home/src/main/resources/modules/jminix.mod b/jetty-home/src/main/resources/modules/jminix.mod deleted file mode 100644 index c3d6f7f71bb..00000000000 --- a/jetty-home/src/main/resources/modules/jminix.mod +++ /dev/null @@ -1,46 +0,0 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[description] -Deploys the Jminix JMX Console within the server. - -[tags] -3rdparty - -[depend] -stats -jmx -commons-logging - -[xml] -etc/jminix.xml - -[files] -lib/jminix/ -maven://org.jminix/jminix/1.1.0|lib/jminix/jminix-1.1.0.jar -https://maven.restlet.talend.com/org/restlet/org.restlet/1.1.5/org.restlet-1.1.5.jar|lib/jminix/org.restlet-1.1.5.jar -https://maven.restlet.talend.com/org/restlet/org.restlet.ext.velocity/1.1.5/org.restlet.ext.velocity-1.1.5.jar|lib/jminix/org.restlet.ext.velocity-1.1.5.jar -maven://org.apache.velocity/velocity/1.5|lib/jminix/velocity-1.5.jar -maven://oro/oro/2.0.8|lib/jminix/oro-2.0.8.jar -https://maven.restlet.talend.com/com/noelios/restlet/com.noelios.restlet/1.1.5/com.noelios.restlet-1.1.5.jar|lib/jminix/com.noelios.restlet-1.1.5.jar -https://maven.restlet.talend.com/com/noelios/restlet/com.noelios.restlet.ext.servlet/1.1.5/com.noelios.restlet.ext.servlet-1.1.5.jar|lib/jminix/com.noelios.restlet.ext.servlet-1.1.5.jar -maven://net.sf.json-lib/json-lib/2.2.3/jar/jdk15|lib/jminix/json-lib-2.2.3-jdk15.jar -maven://commons-lang/commons-lang/2.4|lib/jminix/commons-lang-2.4.jar -maven://commons-beanutils/commons-beanutils/1.7.0|lib/jminix/commons-beanutils-1.7.0.jar -maven://commons-collections/commons-collections/3.2|lib/jminix/commons-collections-3.2.jar -maven://net.sf.ezmorph/ezmorph/1.0.6|lib/jminix/ezmorph-1.0.6.jar -maven://org.jgroups/jgroups/2.12.1.3.Final|lib/jminix/jgroups-2.12.1.3.Final.jar -maven://org.jasypt/jasypt/1.8|lib/jminix/jasypt-1.8.jar -basehome:modules/jminix/jminix.xml|etc/jminix.xml - -[lib] -lib/jminix/**.jar - -[license] -JMiniX is a hosted at google code and released under the Apache License 2.0 -https://code.google.com/p/jminix/ -http://www.apache.org/licenses/LICENSE-2.0 - -[ini-template] -## Jminix Configuration -# jminix.port=8088 - diff --git a/jetty-home/src/main/resources/modules/jminix/jminix.xml b/jetty-home/src/main/resources/modules/jminix/jminix.xml deleted file mode 100644 index 933de82b697..00000000000 --- a/jetty-home/src/main/resources/modules/jminix/jminix.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/jetty-home/src/main/resources/modules/jolokia.mod b/jetty-home/src/main/resources/modules/jolokia.mod deleted file mode 100644 index ee4875d5d24..00000000000 --- a/jetty-home/src/main/resources/modules/jolokia.mod +++ /dev/null @@ -1,27 +0,0 @@ -# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[description] -Deploys the Jolokia console as a web application. - -[tags] -3rdparty - -[depend] -stats -deploy -jmx - -[xml] -etc/jolokia.xml - -[files] -maven://org.jolokia/jolokia-war/${jolokia.version}/war|lib/jolokia/jolokia.war -basehome:modules/jolokia/jolokia.xml|etc/jolokia.xml - -[ini] -jolokia.version?=@jolokia.version@ - -[license] -Jolokia is released under the Apache License 2.0 -http://www.jolokia.org -http://www.apache.org/licenses/LICENSE-2.0 diff --git a/jetty-home/src/main/resources/modules/jolokia/jolokia.xml b/jetty-home/src/main/resources/modules/jolokia/jolokia.xml deleted file mode 100644 index 5c46f501a55..00000000000 --- a/jetty-home/src/main/resources/modules/jolokia/jolokia.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - /jolokia - /lib/jolokia/jolokia.war - true - false - /etc/webdefault.xml - - - - diff --git a/pom.xml b/pom.xml index 67ab1766a25..8b07c0707bf 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,6 @@ 31.0.1-jre 5.1.0 2.2 - 2.14.4 4.2.4 4.3.5.Final 11.0.14.Final @@ -74,7 +73,6 @@ 3.0.2 3.0.2 3.0.1 - 2.82 1.1.0.v201105071233 2.0 1.4.1.v201005082020 @@ -97,7 +95,6 @@ 2.2.11 3.1.15 0.38.17 - 1.3.3 1.1.1 2.4.7 10.0.14 diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/ThirdPartyModulesTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/ThirdPartyModulesTests.java deleted file mode 100644 index 17492241383..00000000000 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/ThirdPartyModulesTests.java +++ /dev/null @@ -1,185 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others. -// -// This program and the accompanying materials are made available under the -// terms of the Eclipse Public License v. 2.0 which is available at -// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 -// which is available at https://www.apache.org/licenses/LICENSE-2.0. -// -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 -// ======================================================================== -// - -package org.eclipse.jetty.tests.distribution; - -import java.nio.file.Path; -import java.util.concurrent.TimeUnit; - -import org.eclipse.jetty.client.api.ContentResponse; -import org.eclipse.jetty.http.HttpStatus; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -public class ThirdPartyModulesTests extends AbstractJettyHomeTest -{ - @Test - @Disabled("not jakarta ready https://github.com/eclipse/jetty.project/issues/6595") - public void testHawtio() throws Exception - { - Path jettyBase = newTestJettyBaseDirectory(); - String jettyVersion = System.getProperty("jettyVersion"); - JettyHomeTester distribution = JettyHomeTester.Builder.newInstance() - .jettyVersion(jettyVersion) - .jettyBase(jettyBase) - .mavenLocalRepository(System.getProperty("mavenRepoPath")) - .build(); - - int httpPort = distribution.freePort(); - - String[] argsConfig = { - "--approve-all-licenses", - "--add-modules=hawtio,http" - }; - - try (JettyHomeTester.Run runConfig = distribution.start(argsConfig)) - { - assertTrue(runConfig.awaitFor(2, TimeUnit.MINUTES)); - assertEquals(0, runConfig.getExitValue()); - - String[] argsStart = { - "jetty.http.port=" + httpPort - }; - - try (JettyHomeTester.Run runStart = distribution.start(argsStart)) - { - assertTrue(runStart.awaitConsoleLogsFor("Started Server@", 20, TimeUnit.SECONDS)); - - startHttpClient(); - ContentResponse response = client.GET("http://localhost:" + httpPort + "/hawtio"); - assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response)); - assertThat(response.getContentAsString(), containsString("Hawtio")); - } - } - } - - @Test - @Disabled("not jakarta ready https://github.com/eclipse/jetty.project/issues/6595") - public void testJAMon() throws Exception - { - Path jettyBase = newTestJettyBaseDirectory(); - String jettyVersion = System.getProperty("jettyVersion"); - JettyHomeTester distribution = JettyHomeTester.Builder.newInstance() - .jettyVersion(jettyVersion) - .jettyBase(jettyBase) - .mavenLocalRepository(System.getProperty("mavenRepoPath")) - .build(); - - int httpPort = distribution.freePort(); - - String[] argsConfig = { - "--approve-all-licenses", - "--add-modules=jamon,http" - }; - - try (JettyHomeTester.Run runConfig = distribution.start(argsConfig)) - { - assertTrue(runConfig.awaitFor(2, TimeUnit.MINUTES)); - assertEquals(0, runConfig.getExitValue()); - - String[] argsStart = { - "jetty.http.port=" + httpPort - }; - - try (JettyHomeTester.Run runStart = distribution.start(argsStart)) - { - assertTrue(runStart.awaitConsoleLogsFor("Started Server@", 20, TimeUnit.SECONDS)); - - startHttpClient(); - ContentResponse response = client.GET("http://localhost:" + httpPort + "/jamon"); - assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response)); - assertThat(response.getContentAsString(), containsString("JAMon")); - } - } - } - - @Test - public void testjminix() throws Exception - { - Path jettyBase = newTestJettyBaseDirectory(); - String jettyVersion = System.getProperty("jettyVersion"); - JettyHomeTester distribution = JettyHomeTester.Builder.newInstance() - .jettyVersion(jettyVersion) - .jettyBase(jettyBase) - .mavenLocalRepository(System.getProperty("mavenRepoPath")) - .build(); - - int httpPort = distribution.freePort(); - - String[] argsConfig = { - "--approve-all-licenses", - "--add-modules=jminix,http,logging-jcl-capture" - }; - - try (JettyHomeTester.Run runConfig = distribution.start(argsConfig)) - { - assertTrue(runConfig.awaitFor(2, TimeUnit.MINUTES)); - assertEquals(0, runConfig.getExitValue()); - - String[] argsStart = { - "jetty.http.port=" + httpPort - }; - - try (JettyHomeTester.Run runStart = distribution.start(argsStart)) - { - assertTrue(runStart.awaitConsoleLogsFor("Started Server@", 20, TimeUnit.SECONDS)); - } - } - } - - @Test - @Disabled("not jakarta ready https://github.com/eclipse/jetty.project/issues/6595") - public void testjolokia() throws Exception - { - Path jettyBase = newTestJettyBaseDirectory(); - String jettyVersion = System.getProperty("jettyVersion"); - JettyHomeTester distribution = JettyHomeTester.Builder.newInstance() - .jettyVersion(jettyVersion) - .jettyBase(jettyBase) - .mavenLocalRepository(System.getProperty("mavenRepoPath")) - .build(); - - int httpPort = distribution.freePort(); - - String[] argsConfig = { - "--approve-all-licenses", - "--add-modules=jolokia,http" - }; - - try (JettyHomeTester.Run runConfig = distribution.start(argsConfig)) - { - assertTrue(runConfig.awaitFor(2, TimeUnit.MINUTES)); - assertEquals(0, runConfig.getExitValue()); - - String[] argsStart = { - "jetty.http.port=" + httpPort - }; - - try (JettyHomeTester.Run runStart = distribution.start(argsStart)) - { - assertTrue(runStart.awaitConsoleLogsFor("Started Server@", 20, TimeUnit.SECONDS)); - - startHttpClient(); - ContentResponse response = client.GET("http://localhost:" + httpPort + "/jolokia"); - assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response)); - assertThat(response.getContentAsString(), containsString("\"agentType\":\"servlet\"")); - } - } - } - -}