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

Merge branch 'jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
olivier lamy 2020-11-10 16:07:36 +10:00
parent 9f30779f63 f192edc1d6
commit a683bc855c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
View File

@ -13,7 +13,7 @@ session-store
sessions sessions
[files] [files]
maven://com.hazelcast/hazelcast/4.0.1|lib/hazelcast/hazelcast-4.0.1.jar maven://com.hazelcast/hazelcast/4.1|lib/hazelcast/hazelcast-4.1.jar
[xml] [xml]
etc/sessions/hazelcast/default.xml etc/sessions/hazelcast/default.xml

2
jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
View File

@ -13,7 +13,7 @@ session-store
sessions sessions
[files] [files]
maven://com.hazelcast/hazelcast/4.0.1|lib/hazelcast/hazelcast-4.0.1.jar maven://com.hazelcast/hazelcast/4.1|lib/hazelcast/hazelcast-4.1.jar
[xml] [xml]
etc/sessions/hazelcast/remote.xml etc/sessions/hazelcast/remote.xml

5
pom.xml
View File

@ -75,6 +75,7 @@
<invoker.mergeUserSettings>false</invoker.mergeUserSettings> <invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount> <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<testcontainers.version>1.15.0</testcontainers.version> <testcontainers.version>1.15.0</testcontainers.version>
<derby.version>10.15.2.0</derby.version>
</properties> </properties>
<licenses> <licenses>
@ -1152,12 +1153,12 @@
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<version>10.15.2.0</version> <version>${derby.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId> <artifactId>derbytools</artifactId>
<version>10.15.2.0</version> <version>${derby.version}</version>
</dependency> </dependency>
<!-- avoid depending on a range dependency from a transitive dependency --> <!-- avoid depending on a range dependency from a transitive dependency -->
<dependency> <dependency>