Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2016-02-01 12:59:12 +0000
committerJan Bartel2016-02-01 12:59:12 +0000
commita8c29334caf1f26e40f2fb3e8b93546523065cfa (patch)
treed8579a2ef3a5d3ce06cbb8a9b12982589c69f048 /tests/test-sessions/pom.xml
parentc122569d75c9cbb6cf69f191411e6ba624ced0b0 (diff)
parent8dc6e25b894678c11da3489f52235d7fed1d46ab (diff)
downloadorg.eclipse.jetty.project-a8c29334caf1f26e40f2fb3e8b93546523065cfa.tar.gz
org.eclipse.jetty.project-a8c29334caf1f26e40f2fb3e8b93546523065cfa.tar.xz
org.eclipse.jetty.project-a8c29334caf1f26e40f2fb3e8b93546523065cfa.zip
Merge branch 'master' into session-refactor
Conflicts: jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java jetty-server/src/main/java/org/eclipse/jetty/server/session/MemSession.java jetty-server/src/test/java/org/eclipse/jetty/server/session/FileSessionManagerTest.java tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerDeleteSessionTest.java tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerPreserveSessionTest.java
Diffstat (limited to 'tests/test-sessions/pom.xml')
-rw-r--r--tests/test-sessions/pom.xml17
1 files changed, 0 insertions, 17 deletions
diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml
index 18eb626f89..a33a34c046 100644
--- a/tests/test-sessions/pom.xml
+++ b/tests/test-sessions/pom.xml
@@ -1,21 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-// ========================================================================
-// Copyright (c) Webtide LLC
-//
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-//
-// The Eclipse Public License is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// The Apache License v2.0 is available at
-// http://www.apache.org/licenses/LICENSE-2.0.txt
-//
-// You may elect to redistribute this code under either of these licenses.
-// ========================================================================
- -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>

Back to the top