Merged 'jetty-10.0.x' into 'jetty-10.0.x-4382-h1_to_h2_upgrade'.
This commit is contained in:
commit
9cbd9ab44e
|
@ -55,7 +55,7 @@ pipeline {
|
||||||
agent { node { label 'linux' } }
|
agent { node { label 'linux' } }
|
||||||
steps {
|
steps {
|
||||||
timeout(time: 30, unit: 'MINUTES') {
|
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']]
|
warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'JavaDoc'], [parserName: 'Java']]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,18 @@
|
||||||
<targetPath>META-INF</targetPath>
|
<targetPath>META-INF</targetPath>
|
||||||
</resource>
|
</resource>
|
||||||
</resources>
|
</resources>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<!-- No point building javadoc for this project -->
|
||||||
|
<skip>true</skip>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|
|
@ -93,6 +93,18 @@
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.xml.bind</groupId>
|
||||||
|
<artifactId>jaxb-api</artifactId>
|
||||||
|
<version>2.4.0-b180830.0359</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.activation</groupId>
|
||||||
|
<artifactId>javax.activation-api</artifactId>
|
||||||
|
<version>1.2.0</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
|
@ -121,40 +133,7 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<profiles>
|
|
||||||
<profile>
|
|
||||||
<id>jdk9+</id>
|
|
||||||
<activation>
|
|
||||||
<jdk>[1.9,)</jdk>
|
|
||||||
</activation>
|
|
||||||
<build>
|
|
||||||
<pluginManagement>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-maven-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.xml.bind</groupId>
|
|
||||||
<artifactId>jaxb-api</artifactId>
|
|
||||||
<version>2.4.0-b180830.0359</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.activation</groupId>
|
|
||||||
<artifactId>javax.activation-api</artifactId>
|
|
||||||
<version>1.2.0</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</pluginManagement>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -39,7 +39,18 @@
|
||||||
<directory>src/main/context</directory>
|
<directory>src/main/context</directory>
|
||||||
</resource>
|
</resource>
|
||||||
</resources>
|
</resources>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<!-- No point building javadoc on testing projects -->
|
||||||
|
<skip>true</skip>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|
|
@ -19,7 +19,18 @@
|
||||||
<directory>src/main/resources</directory>
|
<directory>src/main/resources</directory>
|
||||||
</resource>
|
</resource>
|
||||||
</resources>
|
</resources>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<!-- No point building javadoc on testing projects -->
|
||||||
|
<skip>true</skip>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|
|
@ -31,6 +31,18 @@
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<!-- No point building javadoc on testing projects -->
|
||||||
|
<skip>true</skip>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|
|
@ -36,7 +36,18 @@
|
||||||
<directory>src/main/resources</directory>
|
<directory>src/main/resources</directory>
|
||||||
</resource>
|
</resource>
|
||||||
</resources>
|
</resources>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<!-- No point building javadoc on testing projects -->
|
||||||
|
<skip>true</skip>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|
|
@ -477,6 +477,14 @@
|
||||||
<build>
|
<build>
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<!-- No point building javadoc on testing projects -->
|
||||||
|
<skip>true</skip>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
|
|
|
@ -693,8 +693,16 @@ public class DetectorConnectionTest
|
||||||
start(detector, http);
|
start(detector, http);
|
||||||
|
|
||||||
String request = "AAAA".repeat(32768);
|
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.
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,8 +92,8 @@ public class Modules implements Iterable<Module>
|
||||||
_modules.stream()
|
_modules.stream()
|
||||||
.filter(m ->
|
.filter(m ->
|
||||||
{
|
{
|
||||||
boolean included = all || m.getTags().stream().anyMatch(t -> include.contains(t));
|
boolean included = all || m.getTags().stream().anyMatch(include::contains);
|
||||||
boolean excluded = m.getTags().stream().anyMatch(t -> exclude.contains(t));
|
boolean excluded = m.getTags().stream().anyMatch(exclude::contains);
|
||||||
return included && !excluded;
|
return included && !excluded;
|
||||||
})
|
})
|
||||||
.sorted()
|
.sorted()
|
||||||
|
@ -274,7 +274,7 @@ public class Modules implements Iterable<Module>
|
||||||
|
|
||||||
public List<Module> getEnabled()
|
public List<Module> getEnabled()
|
||||||
{
|
{
|
||||||
List<Module> enabled = _modules.stream().filter(m -> m.isEnabled()).collect(Collectors.toList());
|
List<Module> enabled = _modules.stream().filter(Module::isEnabled).collect(Collectors.toList());
|
||||||
|
|
||||||
TopologicalSort<Module> sort = new TopologicalSort<>();
|
TopologicalSort<Module> sort = new TopologicalSort<>();
|
||||||
for (Module module : enabled)
|
for (Module module : enabled)
|
||||||
|
@ -303,7 +303,7 @@ public class Modules implements Iterable<Module>
|
||||||
|
|
||||||
public List<Module> getSortedAll()
|
public List<Module> getSortedAll()
|
||||||
{
|
{
|
||||||
List<Module> all = new ArrayList(_modules);
|
List<Module> all = new ArrayList<>(_modules);
|
||||||
|
|
||||||
TopologicalSort<Module> sort = new TopologicalSort<>();
|
TopologicalSort<Module> sort = new TopologicalSort<>();
|
||||||
for (Module module : all)
|
for (Module module : all)
|
||||||
|
@ -569,17 +569,19 @@ public class Modules implements Iterable<Module>
|
||||||
_modules.stream().filter(Module::isEnabled).forEach(m ->
|
_modules.stream().filter(Module::isEnabled).forEach(m ->
|
||||||
{
|
{
|
||||||
// Check dependencies
|
// Check dependencies
|
||||||
m.getDepends().forEach(d ->
|
m.getDepends().stream()
|
||||||
{
|
.filter(Module::isRequiredDependency)
|
||||||
Set<Module> providers = getAvailableProviders(d);
|
.forEach(d ->
|
||||||
if (providers.stream().filter(Module::isEnabled).count() == 0)
|
|
||||||
{
|
{
|
||||||
if (unsatisfied.length() > 0)
|
Set<Module> providers = getAvailableProviders(d);
|
||||||
unsatisfied.append(',');
|
if (providers.stream().noneMatch(Module::isEnabled))
|
||||||
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)
|
||||||
}
|
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)
|
if (unsatisfied.length() > 0)
|
||||||
|
|
|
@ -51,6 +51,14 @@
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<!-- No point building javadoc on testing projects -->
|
||||||
|
<skip>true</skip>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.felix</groupId>
|
<groupId>org.apache.felix</groupId>
|
||||||
<artifactId>maven-bundle-plugin</artifactId>
|
<artifactId>maven-bundle-plugin</artifactId>
|
||||||
|
|
|
@ -73,6 +73,18 @@
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<!-- No point building javadoc on testing projects -->
|
||||||
|
<skip>true</skip>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.felix</groupId>
|
<groupId>org.apache.felix</groupId>
|
||||||
|
|
5
pom.xml
5
pom.xml
|
@ -28,8 +28,6 @@
|
||||||
<websocket.api.version>1.1.2</websocket.api.version>
|
<websocket.api.version>1.1.2</websocket.api.version>
|
||||||
<jsp.version>9.0.29</jsp.version>
|
<jsp.version>9.0.29</jsp.version>
|
||||||
<infinispan.version>9.4.8.Final</infinispan.version>
|
<infinispan.version>9.4.8.Final</infinispan.version>
|
||||||
<!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
|
|
||||||
<alpn.version>undefined</alpn.version>
|
|
||||||
<conscrypt.version>2.4.0</conscrypt.version>
|
<conscrypt.version>2.4.0</conscrypt.version>
|
||||||
<asm.version>7.2</asm.version>
|
<asm.version>7.2</asm.version>
|
||||||
<jmh.version>1.21</jmh.version>
|
<jmh.version>1.21</jmh.version>
|
||||||
|
@ -561,7 +559,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
<version>3.1.1</version>
|
<version>3.2.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<verbose>true</verbose>
|
<verbose>true</verbose>
|
||||||
<debug>true</debug>
|
<debug>true</debug>
|
||||||
|
@ -578,6 +576,7 @@
|
||||||
<attach>true</attach>
|
<attach>true</attach>
|
||||||
<isOffline>true</isOffline>
|
<isOffline>true</isOffline>
|
||||||
<excludePackageNames>com.*:org.slf4j*:org.mortbay*:*.jmh*:org.eclipse.jetty.embedded*:org.eclipse.jetty.example.asyncrest*:org.eclipse.jetty.test*</excludePackageNames>
|
<excludePackageNames>com.*:org.slf4j*:org.mortbay*:*.jmh*:org.eclipse.jetty.embedded*:org.eclipse.jetty.example.asyncrest*:org.eclipse.jetty.test*</excludePackageNames>
|
||||||
|
<skippedModules>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</skippedModules>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|
|
@ -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'
|
# This is equivalent to 'mvn release:perform'
|
||||||
if proceedyn "Build/Deploy from tag $TAG_NAME? (Y/n)" y; then
|
if proceedyn "Build/Deploy from tag $TAG_NAME? (Y/n)" y; then
|
||||||
git checkout $TAG_NAME
|
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
|
-Peclipse-release $DEPLOY_OPTS
|
||||||
reportMavenTestFailures
|
reportMavenTestFailures
|
||||||
git checkout $GIT_BRANCH_ID
|
git checkout $GIT_BRANCH_ID
|
||||||
|
|
Loading…
Reference in New Issue