diff --git a/Jenkinsfile b/Jenkinsfile index 11a770057d3..4477293c51e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,7 +55,7 @@ pipeline { agent { node { label 'linux' } } steps { timeout(time: 30, unit: 'MINUTES') { - mavenBuild("jdk11", "install javadoc:javadoc -DskipTests -Dpmd.skip=true -Dcheckstyle.skip=true", "maven3", true) + mavenBuild("jdk11", "package source:jar javadoc:jar javadoc:aggregate-jar -Peclipse-release -DskipTests -Dpmd.skip=true -Dcheckstyle.skip=true", "maven3", true) warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'JavaDoc'], [parserName: 'Java']] } } diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 9d943840c28..89f78175b64 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -20,6 +20,18 @@ META-INF + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + true + + + + org.apache.maven.plugins diff --git a/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/pom.xml index f9d6a925ed3..479aa35257e 100644 --- a/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/pom.xml @@ -93,6 +93,18 @@ + + + javax.xml.bind + jaxb-api + 2.4.0-b180830.0359 + + + javax.activation + javax.activation-api + 1.2.0 + + @@ -121,40 +133,7 @@ - - - - jdk9+ - - [1.9,) - - - - - - org.eclipse.jetty - jetty-maven-plugin - - - javax.xml.bind - jaxb-api - 2.4.0-b180830.0359 - - - javax.activation - javax.activation-api - 1.2.0 - - - - - - - - - - diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 9deafe864a6..49ce22029ee 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -39,7 +39,18 @@ src/main/context - + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + true + + + + org.apache.maven.plugins diff --git a/jetty-osgi/test-jetty-osgi-fragment/pom.xml b/jetty-osgi/test-jetty-osgi-fragment/pom.xml index e43a76e22a4..e3b7af48eef 100644 --- a/jetty-osgi/test-jetty-osgi-fragment/pom.xml +++ b/jetty-osgi/test-jetty-osgi-fragment/pom.xml @@ -19,7 +19,18 @@ src/main/resources - + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + true + + + + org.apache.maven.plugins diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml index a213793c34f..ccf17f5a981 100644 --- a/jetty-osgi/test-jetty-osgi-server/pom.xml +++ b/jetty-osgi/test-jetty-osgi-server/pom.xml @@ -31,6 +31,18 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + true + + + + org.apache.maven.plugins diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index cb9ff9bc9a6..757dd7f09e9 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -36,7 +36,18 @@ src/main/resources - + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + true + + + + org.apache.maven.plugins diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 0c13244b308..d82c7e2dde9 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -477,6 +477,14 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + + true + + maven-surefire-plugin diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/DetectorConnectionTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/DetectorConnectionTest.java index bd148ad9e4c..d9e7e9e578d 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/DetectorConnectionTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/DetectorConnectionTest.java @@ -693,8 +693,16 @@ public class DetectorConnectionTest start(detector, http); String request = "AAAA".repeat(32768); - String response = getResponse(request); - assertThat(response, Matchers.nullValue()); + try + { + String response = getResponse(request); + assertThat(response, Matchers.nullValue()); + } + catch (SocketException expected) + { + // The test may fail writing the "request" + // bytes as the server sends back a TCP RST. + } } } diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java index a4e3b97415d..64b9e5a9450 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java @@ -92,8 +92,8 @@ public class Modules implements Iterable _modules.stream() .filter(m -> { - boolean included = all || m.getTags().stream().anyMatch(t -> include.contains(t)); - boolean excluded = m.getTags().stream().anyMatch(t -> exclude.contains(t)); + boolean included = all || m.getTags().stream().anyMatch(include::contains); + boolean excluded = m.getTags().stream().anyMatch(exclude::contains); return included && !excluded; }) .sorted() @@ -274,7 +274,7 @@ public class Modules implements Iterable public List getEnabled() { - List enabled = _modules.stream().filter(m -> m.isEnabled()).collect(Collectors.toList()); + List enabled = _modules.stream().filter(Module::isEnabled).collect(Collectors.toList()); TopologicalSort sort = new TopologicalSort<>(); for (Module module : enabled) @@ -303,7 +303,7 @@ public class Modules implements Iterable public List getSortedAll() { - List all = new ArrayList(_modules); + List all = new ArrayList<>(_modules); TopologicalSort sort = new TopologicalSort<>(); for (Module module : all) @@ -569,17 +569,19 @@ public class Modules implements Iterable _modules.stream().filter(Module::isEnabled).forEach(m -> { // Check dependencies - m.getDepends().forEach(d -> - { - Set providers = getAvailableProviders(d); - if (providers.stream().filter(Module::isEnabled).count() == 0) + m.getDepends().stream() + .filter(Module::isRequiredDependency) + .forEach(d -> { - if (unsatisfied.length() > 0) - unsatisfied.append(','); - unsatisfied.append(m.getName()); - StartLog.error("Module [%s] requires a module providing [%s] from one of %s%n", m.getName(), d, providers); - } - }); + Set providers = getAvailableProviders(d); + if (providers.stream().noneMatch(Module::isEnabled)) + { + if (unsatisfied.length() > 0) + unsatisfied.append(','); + unsatisfied.append(m.getName()); + StartLog.error("Module [%s] requires a module providing [%s] from one of %s%n", m.getName(), d, providers); + } + }); }); if (unsatisfied.length() > 0) diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml index 9fc1fac0bdd..23ced0fc942 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-javax-tests/pom.xml @@ -51,6 +51,14 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + + true + + org.apache.felix maven-bundle-plugin diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index 6c935a89e7a..7c3588d6562 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -73,6 +73,18 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + true + + + + org.apache.felix diff --git a/pom.xml b/pom.xml index d42eca8c340..122243794fb 100644 --- a/pom.xml +++ b/pom.xml @@ -28,8 +28,6 @@ 1.1.2 9.0.29 9.4.8.Final - - undefined 2.4.0 7.2 1.21 @@ -561,7 +559,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 true true @@ -578,6 +576,7 @@ true true com.*:org.slf4j*:org.mortbay*:*.jmh*:org.eclipse.jetty.embedded*:org.eclipse.jetty.example.asyncrest*:org.eclipse.jetty.test* + apache-jstl,jetty-osgi-alpn,infinispan-common,infinispan-embedded,infinispan-embedded-query,infinispan-remote,infinispan-remote-query,jetty-plus,jetty-jndi,jetty-documentation,jetty-distribution,jetty-home,jetty-bom,jetty-all,jetty-runner diff --git a/scripts/release-jetty.sh b/scripts/release-jetty.sh index ae0cb0d2f67..408a639c68b 100755 --- a/scripts/release-jetty.sh +++ b/scripts/release-jetty.sh @@ -167,7 +167,7 @@ if proceedyn "Are you sure you want to release using above? (y/N)" n; then # This is equivalent to 'mvn release:perform' if proceedyn "Build/Deploy from tag $TAG_NAME? (Y/n)" y; then git checkout $TAG_NAME - mvn clean package source:jar javadoc:jar gpg:sign deploy \ + mvn clean package source:jar javadoc:jar gpg:sign javadoc:aggregate-jar deploy \ -Peclipse-release $DEPLOY_OPTS reportMavenTestFailures git checkout $GIT_BRANCH_ID