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

Merge pull request #6797 from eclipse/jetty-10.0.x-version-rollup 

Rollup of version changes for 10.0.x
This commit is contained in:
Joakim Erdfelt 2021-09-13 18:20:27 -05:00 committed by GitHub
parent b44dde6098 40150a9bec
commit e629e1c26e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/dependabot.yml vendored
View File

@ -5,6 +5,8 @@ updates:
target-branch: "jetty-9.4.x"
schedule:
interval: "daily"
# Associate with milestone 9.4.x
milestone: 3
ignore:
# Restrict updates in this branch to jetty in the 9.4.x space
- dependency-name: "javax.servlet:*"
@ -25,6 +27,8 @@ updates:
target-branch: "jetty-10.0.x"
schedule:
interval: "daily"
# Associate with milestone 10.0.x
milestone: 6
ignore:
# Restrict updates in this branch to jetty in the 10.x.x space
- dependency-name: "jakarta.servlet:*"
@ -39,12 +43,16 @@ updates:
versions: [ ">=2.0.0" ]
- dependency-name: "jakarta.websocket:*"
versions: [ ">=2.0.0" ]
- dependency-name: "jakarta.servlet.jsp.jstl:*"
versions: [ ">=2.0.0" ]
- package-ecosystem: "maven"
directory: "/"
target-branch: "jetty-11.0.x"
schedule:
interval: "weekly"
# Associate with milestone 11.0.x
milestone: 7
ignore:
# Restrict updates in this branch to jetty in the 11.x.x space
- dependency-name: "jakarta.servlet:*"
@ -59,3 +67,5 @@ updates:
versions: [ ">=3.0.0" ]
- dependency-name: "jakarta.websocket:*"
versions: [ ">=3.0.0" ]
- dependency-name: "jakarta.servlet.jsp.jstl:*"
versions: [ ">=3.0.0" ]

2
documentation/jetty-documentation/pom.xml
View File

@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.13</version>
<version>4.4.14</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>

5
jetty-maven-plugin/pom.xml
View File

@ -125,11 +125,6 @@
<artifactId>maven-artifact-transfer</artifactId>
<version>0.13.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>

3
jetty-runner/pom.xml
View File

@ -44,8 +44,7 @@
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<excludeScope>test</excludeScope>
<includeScope>runtime</includeScope>
<includeScope>compile</includeScope>
</configuration>
</execution>
</executions>

48
pom.xml
View File

@ -31,19 +31,21 @@
<infinispan.version>9.4.8.Final</infinispan.version>
<infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
<gson.version>2.8.8</gson.version>
<grpc.version>1.40.1</grpc.version>
<alpn.agent.version>2.0.10</alpn.agent.version>
<hazelcast.version>4.2.2</hazelcast.version>
<conscrypt.version>2.5.1</conscrypt.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>
<junit.version>5.7.2</junit.version>
<junit.version>5.8.0</junit.version>
<maven.version>3.8.2</maven.version>
<maven.resolver.version>1.7.1</maven.resolver.version>
<maven.resolver.version>1.7.2</maven.resolver.version>
<weld.version>3.1.8.Final</weld.version>
<plexus-utils.version>3.4.1</plexus-utils.version>
<jboss.logging.version>3.4.2.Final</jboss.logging.version>
<jetty.perf-helper.version>1.0.6</jetty.perf-helper.version>
<jetty.perf-helper.version>1.0.7</jetty.perf-helper.version>
<ant.version>1.10.11</ant.version>
<!-- OSGI import-package -->
<osgi.slf4j.import.packages>org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)"</osgi.slf4j.import.packages>
@ -55,11 +57,11 @@
<!-- some maven plugins versions -->
<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.1.2</maven.dependency.plugin.version>
<maven.dependency.plugin.version>3.2.0</maven.dependency.plugin.version>
<maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
<maven.war.plugin.version>3.3.1</maven.war.plugin.version>
<maven.plugin-tools.version>3.6.0</maven.plugin-tools.version>
<maven.war.plugin.version>3.3.2</maven.war.plugin.version>
<maven.plugin-tools.version>3.6.1</maven.plugin-tools.version>
<maven.install.plugin.version>3.0.0-M1</maven.install.plugin.version>
<maven.deploy.plugin.version>3.0.0-M1</maven.deploy.plugin.version>
<maven.exec.plugin.version>3.0.0</maven.exec.plugin.version>
@ -80,7 +82,7 @@
<invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<testcontainers.version>1.16.0</testcontainers.version>
<jna.version>5.8.0</jna.version>
<jna.version>5.9.0</jna.version>
<mariadb.version>2.7.0</mariadb.version>
</properties>
@ -426,7 +428,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
<configuration>
<configLocation>jetty-checkstyle.xml</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
@ -593,7 +595,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
<configuration>
<verbose>true</verbose>
<debug>true</debug>
@ -615,7 +617,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -720,7 +722,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.6</version>
<version>0.8.7</version>
</plugin>
<plugin>
<groupId>com.agilejava.docbkx</groupId>
@ -987,6 +989,17 @@
<artifactId>h2spec-maven-plugin</artifactId>
<version>1.0.7</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.8.1</version>
<configuration>
<processDependencies>true</processDependencies>
<processDependencyManagement>true</processDependencyManagement>
<processPluginDependencies>true</processPluginDependencies>
<processPluginDependenciesInPluginManagement>true</processPluginDependenciesInPluginManagement>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
@ -1125,7 +1138,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.3.0</version>
<version>${plexus-utils.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@ -1142,6 +1155,11 @@
<artifactId>maven-core</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
@ -1304,7 +1322,7 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<version>1.33.1</version>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
@ -1489,7 +1507,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>

2
tests/test-webapps/test-owb-cdi-webapp/pom.xml
View File

@ -13,7 +13,7 @@
<properties>
<bundle-symbolic-name>${project.groupId}.cdi.owb</bundle-symbolic-name>
<openwebbeans.version>2.0.20</openwebbeans.version>
<openwebbeans.version>2.0.23</openwebbeans.version>
</properties>
<build>