Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Joakim Erdfelt 2021-09-14 15:13:25 -05:00
parent c8292c3319 54876cc7d4
commit 4c3eef5725
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
5 changed files with 52 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/dependabot.yml vendored
View File

@ -45,6 +45,10 @@ updates:
versions: [ ">=2.0.0" ]
- dependency-name: "jakarta.servlet.jsp.jstl:*"
versions: [ ">=2.0.0" ]
- dependency-name: "org.jboss.weld.servlet:*"
versions: [ ">=4.0.0" ]
- dependency-name: "com.sun.xml.ws:jaxws*"
versions: [ ">=3.0.0" ]
# - package-ecosystem: "maven"
# directory: "/"

13
Jenkinsfile vendored
View File

@ -37,19 +37,6 @@ pipeline {
}
}
// TODO: Remove once JDK17 (non-ea) has been released
stage("Build / Test - JDK16") {
agent { node { label 'linux' } }
steps {
container( 'jetty-build' ) {
timeout( time: 120, unit: 'MINUTES' ) {
mavenBuild( "jdk16", "clean install", "maven3")
recordIssues id: "jdk16", name: "Static Analysis jdk16", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser()]
}
}
}
}
stage("Build / Test - JDK17") {
agent { node { label 'linux' } }
steps {

16
jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestSecurityAnnotationConversions.java
View File

@ -65,12 +65,16 @@ public class TestSecurityAnnotationConversions
{
}
@ServletSecurity(value = @HttpConstraint(value = EmptyRoleSemantic.PERMIT, transportGuarantee = TransportGuarantee.CONFIDENTIAL, rolesAllowed =
{
"tom", "dick", "harry"
}), httpMethodConstraints = {
@HttpMethodConstraint(value = "GET", transportGuarantee = TransportGuarantee.CONFIDENTIAL)
})
@ServletSecurity(
value = @HttpConstraint(
value = EmptyRoleSemantic.PERMIT,
transportGuarantee = TransportGuarantee.CONFIDENTIAL,
rolesAllowed = {
"tom", "dick", "harry"
}),
httpMethodConstraints = {
@HttpMethodConstraint(value = "GET", transportGuarantee = TransportGuarantee.CONFIDENTIAL)
})
public static class Method2Servlet extends HttpServlet
{
}

19
jetty-jaas/pom.xml
View File

@ -12,8 +12,8 @@
<properties>
<bundle-symbolic-name>${project.groupId}.jaas</bundle-symbolic-name>
<!-- 2.0.0.AM25 is breaking surefire -->
<apacheds.version>2.0.0.AM26</apacheds.version>
<apache.directory.api.version>2.1.0</apache.directory.api.version>
<spotbugs.onlyAnalyze>org.eclipse.jetty.jaas.*</spotbugs.onlyAnalyze>
</properties>
@ -119,9 +119,24 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-schema-data</artifactId>
<version>2.0.0</version>
<version>${apache.directory.api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-model</artifactId>
<version>${apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-util</artifactId>
<version>${apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-asn1-api</artifactId>
<version>${apache.directory.api.version}</version>
</dependency>
<!-- because directory server do not have yet junit5 extensions -->
<dependency>
<groupId>org.junit.vintage</groupId>

43
pom.xml
View File

@ -19,7 +19,7 @@
<jetty.url>https://www.eclipse.org/jetty/</jetty.url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build-support.version>1.5</build-support.version>
<checkstyle.version>8.37</checkstyle.version>
<checkstyle.version>9.0</checkstyle.version>
<slf4j.version>2.0.0-alpha5</slf4j.version>
<log4j2.version>2.14.0</log4j2.version>
<logback.version>1.3.0-alpha9</logback.version>
@ -40,13 +40,14 @@
<infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
<gson.version>2.8.8</gson.version>
<grpc.version>1.40.1</grpc.version>
<google.errorprone.version>2.9.0</google.errorprone.version>
<alpn.agent.version>2.0.10</alpn.agent.version>
<hazelcast.version>4.2.2</hazelcast.version>
<conscrypt.version>2.5.2</conscrypt.version>
<asm.version>9.2</asm.version>
<jmh.version>1.33</jmh.version>
<jmhjar.name>benchmarks</jmhjar.name>
<tycho-version>2.1.0</tycho-version>
<tycho.version>2.3.0</tycho.version>
<junit.version>5.8.0</junit.version>
<maven.version>3.8.2</maven.version>
<maven.resolver.version>1.7.2</maven.resolver.version>
@ -63,6 +64,7 @@
<jetty.surefire.argLine>-Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx4g -Xms2g -Xlog:gc:stderr:time,level,tags</jetty.surefire.argLine>
<!-- some maven plugins versions -->
<maven.invoker.version>3.2.2</maven.invoker.version>
<maven.surefire.version>3.0.0-M5</maven.surefire.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<maven.dependency.plugin.version>3.2.0</maven.dependency.plugin.version>
@ -76,7 +78,7 @@
<!-- testing -->
<it.debug>false</it.debug>
<jetty.test.version>5.5</jetty.test.version>
<jetty.test.version>5.8</jetty.test.version>
<hamcrest.version>2.2</hamcrest.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
@ -90,7 +92,7 @@
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<testcontainers.version>1.16.0</testcontainers.version>
<jna.version>5.9.0</jna.version>
<mariadb.version>2.7.0</mariadb.version>
<mariadb.version>2.7.4</mariadb.version>
</properties>
<licenses>
@ -430,14 +432,6 @@
</goals>
</execution>
</executions>
<!-- this has better support of gh token remove when with next release of jetty-version-maven-plugin -->
<dependencies>
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId>
<version>1.132</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -555,7 +549,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.2.1</version>
<version>${maven.invoker.version}</version>
<configuration>
<mergeUserSettings>${invoker.mergeUserSettings}</mergeUserSettings>
<writeJunitReport>true</writeJunitReport>
@ -746,12 +740,12 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>3.0</version>
<version>4.1</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.1</version>
<version>5.1.2</version>
<extensions>true</extensions>
<configuration>
<supportedProjectTypes>
@ -784,7 +778,7 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>2.1.0</version>
<version>2.2.1</version>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
@ -1266,7 +1260,7 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>4.2.2</version>
<version>5.0.1</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
@ -1348,7 +1342,7 @@
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj</artifactId>
<version>2.4.2</version>
<version>2.5.2</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
@ -1370,6 +1364,11 @@
<artifactId>jnr-unixsocket</artifactId>
<version>0.38.10</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>${google.errorprone.version}</version>
</dependency>
<!-- avoid depending on a range dependency from a transitive dependency -->
<dependency>
<groupId>io.grpc</groupId>
@ -1394,7 +1393,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.11</version>
<version>3.12.0</version>
</dependency>
</dependencies>
</dependencyManagement>
@ -1429,7 +1428,7 @@
<path>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.5.1</version>
<version>${google.errorprone.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
@ -1705,7 +1704,7 @@
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
<version>${tycho-version}</version>
<version>${tycho.version}</version>
<executions>
<execution>
<id>pack200-normalize</id>
@ -1734,7 +1733,7 @@
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
<version>${tycho-version}</version>
<version>${tycho.version}</version>
<executions>
<execution>
<id>pack200-pack</id>