Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2015-12-03 05:57:51 +0000
committerJan Bartel2015-12-03 05:57:51 +0000
commit9ff55cb301fa9f55215d35fa462ece42f71925a0 (patch)
tree76623ca74b0bf813bfb080eab1faae7d6b0c50ed /tests/test-sessions/pom.xml
parent82ffc4f3554ef9d6070e2d2d8bfaf1ec7a9a44a7 (diff)
parent4bbd060ca8468f3289ef049379a7cf4ec20ececa (diff)
downloadorg.eclipse.jetty.project-9ff55cb301fa9f55215d35fa462ece42f71925a0.tar.gz
org.eclipse.jetty.project-9ff55cb301fa9f55215d35fa462ece42f71925a0.tar.xz
org.eclipse.jetty.project-9ff55cb301fa9f55215d35fa462ece42f71925a0.zip
Merge branch 'master' into session-refactor
Conflicts: jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionManager.java jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractInvalidationSessionTest.java
Diffstat (limited to 'tests/test-sessions/pom.xml')
-rw-r--r--tests/test-sessions/pom.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml
index 8dccc12ed9..18eb626f89 100644
--- a/tests/test-sessions/pom.xml
+++ b/tests/test-sessions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>9.3.4-SNAPSHOT</version>
+ <version>9.4.0-SNAPSHOT</version>
</parent>
<artifactId>test-sessions-parent</artifactId>
<name>Jetty Tests :: Sessions :: Parent</name>
@@ -36,5 +36,6 @@
<module>test-jdbc-sessions</module>
<module>test-mongodb-sessions</module>
<module>test-infinispan-sessions</module>
+ <module>test-gcloud-sessions</module>
</modules>
</project>

Back to the top