You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/10/03 14:53:15 UTC
wicket git commit: Bump the version to 8.0.0-SNAPSHOT
Repository: wicket
Updated Branches:
refs/heads/master 1f7457046 -> e6abe957a
Bump the version to 8.0.0-SNAPSHOT
Actually remove wicket-native-websocket-jetty (7.x)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e6abe957
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e6abe957
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e6abe957
Branch: refs/heads/master
Commit: e6abe957a8356f3d7549a73c7ed38e010e722654
Parents: 1f74570
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Oct 3 14:52:16 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Oct 3 14:52:16 2015 +0200
----------------------------------------------------------------------
archetypes/quickstart/pom.xml | 2 +-
pom.xml | 52 ++++-----
testing/wicket-arquillian/pom.xml | 2 +-
testing/wicket-common-tests/pom.xml | 12 +-
testing/wicket-js-tests/pom.xml | 2 +-
wicket-auth-roles/pom.xml | 2 +-
wicket-bean-validation/pom.xml | 2 +-
wicket-cdi-1.1/pom.xml | 2 +-
wicket-cdi/pom.xml | 2 +-
wicket-core/pom.xml | 2 +-
wicket-datetime/pom.xml | 2 +-
wicket-devutils/pom.xml | 2 +-
wicket-examples/pom.xml | 2 +-
wicket-experimental/pom.xml | 2 +-
wicket-experimental/wicket-atmosphere/pom.xml | 2 +-
wicket-extensions/pom.xml | 2 +-
wicket-guice/pom.xml | 2 +-
wicket-ioc/pom.xml | 2 +-
wicket-jmx/pom.xml | 2 +-
wicket-native-websocket/pom.xml | 2 +-
.../wicket-native-websocket-core/pom.xml | 2 +-
.../wicket-native-websocket-javax/pom.xml | 2 +-
.../wicket-native-websocket-jetty/pom.xml | 50 --------
.../ws/jetty/Jetty7WebSocketFilter.java | 117 -------------------
.../ws/jetty/JettyWebSocketConnection.java | 82 -------------
.../ws/jetty/JettyWebSocketProcessor.java | 83 -------------
.../util/license/ApacheLicenceHeaderTest.java | 34 ------
.../wicket-native-websocket-tomcat/pom.xml | 2 +-
wicket-objectsizeof-agent/pom.xml | 2 +-
wicket-request/pom.xml | 2 +-
wicket-spring/pom.xml | 2 +-
wicket-user-guide/pom.xml | 2 +-
wicket-util/pom.xml | 2 +-
wicket-velocity/pom.xml | 2 +-
wicket/pom.xml | 2 +-
35 files changed, 49 insertions(+), 437 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index 035deda..d46dba5 100644
--- a/archetypes/quickstart/pom.xml
+++ b/archetypes/quickstart/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>wicket-archetype-quickstart</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a8d369f..5acc00c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Wicket Parent</name>
<description>Wicket is a Java-based open source component web application framework.</description>
@@ -278,7 +278,7 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<!-- It seems there is a bug in Maven (2.2.1 & 3.0.1) and
type 'pom' is not properly inherited. I.e. the
dependency management doesn't work -->
@@ -287,43 +287,43 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-bean-validation</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-cdi</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-cdi-1.1</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-datetime</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-devutils</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
@@ -334,79 +334,67 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-guice</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-ioc</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-jmx</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-core</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-javax</artifactId>
- <version>7.1.0-SNAPSHOT</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-native-websocket-jetty</artifactId>
- <version>7.1.0-SNAPSHOT</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-native-websocket-jetty9</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-tomcat</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-velocity</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index e5f22f9..2aa54f5 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/testing/wicket-common-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml
index 65156fc..9c31e60 100644
--- a/testing/wicket-common-tests/pom.xml
+++ b/testing/wicket-common-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>wicket-common-tests</artifactId>
@@ -94,16 +94,6 @@
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-native-websocket-jetty</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-native-websocket-jetty9</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-tomcat</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/testing/wicket-js-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml
index 38c0143..51bf5d9 100644
--- a/testing/wicket-js-tests/pom.xml
+++ b/testing/wicket-js-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>wicket-js-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-auth-roles/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/pom.xml b/wicket-auth-roles/pom.xml
index f2f0518..4ee971e 100644
--- a/wicket-auth-roles/pom.xml
+++ b/wicket-auth-roles/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-auth-roles</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-bean-validation/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml
index e50d805..260bfa2 100644
--- a/wicket-bean-validation/pom.xml
+++ b/wicket-bean-validation/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-bean-validation</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-cdi-1.1/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml
index b655a0c..c05d568 100644
--- a/wicket-cdi-1.1/pom.xml
+++ b/wicket-cdi-1.1/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-cdi-1.1</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml
index 1e44b25..7412d49 100644
--- a/wicket-cdi/pom.xml
+++ b/wicket-cdi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-cdi</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index cccd9b9..fdc1f4d 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-core</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-datetime/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-datetime/pom.xml b/wicket-datetime/pom.xml
index b77d2c2..d873f5e 100644
--- a/wicket-datetime/pom.xml
+++ b/wicket-datetime/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-datetime</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-devutils/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-devutils/pom.xml b/wicket-devutils/pom.xml
index fc1d68d..50db14b 100644
--- a/wicket-devutils/pom.xml
+++ b/wicket-devutils/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-devutils</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index ba68adf..0f310fe 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-experimental/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/pom.xml b/wicket-experimental/pom.xml
index fd020a8..e77b7d4 100644
--- a/wicket-experimental/pom.xml
+++ b/wicket-experimental/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.wicket.experimental.wicket7</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-experimental/wicket-atmosphere/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/pom.xml b/wicket-experimental/wicket-atmosphere/pom.xml
index 6573680..dd8c108 100644
--- a/wicket-experimental/wicket-atmosphere/pom.xml
+++ b/wicket-experimental/wicket-atmosphere/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket.experimental.wicket7</groupId>
<artifactId>wicket-experimental</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-atmosphere</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-extensions/pom.xml b/wicket-extensions/pom.xml
index b6af86c..481dcd0 100644
--- a/wicket-extensions/pom.xml
+++ b/wicket-extensions/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-guice/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-guice/pom.xml b/wicket-guice/pom.xml
index 1ee5b20..9d8d2a8 100644
--- a/wicket-guice/pom.xml
+++ b/wicket-guice/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-guice</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-ioc/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index 35eba31..cb7919f 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-ioc</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-jmx/pom.xml b/wicket-jmx/pom.xml
index 0f9537d..d292a3f 100644
--- a/wicket-jmx/pom.xml
+++ b/wicket-jmx/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-jmx</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-native-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/pom.xml b/wicket-native-websocket/pom.xml
index 2a1d4ec..d7f27b9 100644
--- a/wicket-native-websocket/pom.xml
+++ b/wicket-native-websocket/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-native-websocket/wicket-native-websocket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/pom.xml b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
index 096e43c..723222b 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
index 25709be..0a394c3 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket-javax</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml b/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml
deleted file mode 100644
index f95d5af..0000000
--- a/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-native-websocket</artifactId>
- <version>7.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>wicket-native-websocket-jetty</artifactId>
- <packaging>jar</packaging>
- <name>Wicket Native WebSocket Jetty</name>
- <description>Provides the code specific to integrate with Jetty web container</description>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-websocket</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-websocket</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-native-websocket-core</artifactId>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/Jetty7WebSocketFilter.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/Jetty7WebSocketFilter.java b/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/Jetty7WebSocketFilter.java
deleted file mode 100644
index eebdd6c..0000000
--- a/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/Jetty7WebSocketFilter.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.protocol.ws.jetty;
-
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.ws.AbstractUpgradeFilter;
-import org.eclipse.jetty.websocket.WebSocket;
-import org.eclipse.jetty.websocket.WebSocketFactory;
-
-import java.io.IOException;
-
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * An upgrade filter that uses Jetty's WebSocketFactory to decide whether to upgrade or not.
- */
-public class Jetty7WebSocketFilter extends AbstractUpgradeFilter implements WebSocketFactory.Acceptor
-{
- private WebSocketFactory _webSocketFactory;
-
- public Jetty7WebSocketFilter()
- {
- super();
- }
-
- public Jetty7WebSocketFilter(WebApplication application)
- {
- super(application);
- }
-
- @Override
- public void init(final boolean isServlet, final FilterConfig filterConfig)
- throws ServletException
- {
- super.init(isServlet, filterConfig);
-
- try
- {
- String bs = filterConfig.getInitParameter("bufferSize");
- _webSocketFactory = new WebSocketFactory(this, bs == null ? 8192 : Integer.parseInt(bs));
- _webSocketFactory.start();
-
- String max = filterConfig.getInitParameter("maxIdleTime");
- if (max != null)
- _webSocketFactory.setMaxIdleTime(Integer.parseInt(max));
-
- max = filterConfig.getInitParameter("maxTextMessageSize");
- if (max != null)
- _webSocketFactory.setMaxTextMessageSize(Integer.parseInt(max));
-
- max = filterConfig.getInitParameter("maxBinaryMessageSize");
- if (max != null)
- _webSocketFactory.setMaxBinaryMessageSize(Integer.parseInt(max));
- }
- catch (ServletException x)
- {
- throw x;
- }
- catch (Exception x)
- {
- throw new ServletException(x);
- }
- }
-
- @Override
- protected boolean acceptWebSocket(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
- {
- return super.acceptWebSocket(req, resp) && _webSocketFactory.acceptWebSocket(req, resp);
- }
-
- @Override
- public WebSocket doWebSocketConnect(HttpServletRequest request, String protocol)
- {
- JettyWebSocketProcessor webSocketHandler = new JettyWebSocketProcessor(request, getApplication());
- return webSocketHandler.new JettyWebSocket();
- }
-
- /* ------------------------------------------------------------ */
- @Override
- public boolean checkOrigin(HttpServletRequest request, String origin)
- {
- return true;
- }
-
- /* ------------------------------------------------------------ */
- @Override
- public void destroy()
- {
- try
- {
- _webSocketFactory.stop();
- }
- catch (Exception x)
- {
- x.printStackTrace();
- }
-
- super.destroy();
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketConnection.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketConnection.java b/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketConnection.java
deleted file mode 100644
index 9f6451e..0000000
--- a/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketConnection.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.protocol.ws.jetty;
-
-import java.io.IOException;
-
-import org.apache.wicket.protocol.ws.api.AbstractWebSocketConnection;
-import org.apache.wicket.protocol.ws.api.AbstractWebSocketProcessor;
-import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
-import org.apache.wicket.util.lang.Args;
-import org.eclipse.jetty.websocket.WebSocket;
-
-/**
- * A wrapper around Jetty's native WebSocket.Connection
- *
- * @since 6.0
- */
-public class JettyWebSocketConnection extends AbstractWebSocketConnection
-{
- private WebSocket.Connection connection;
-
- public JettyWebSocketConnection(final WebSocket.Connection connection, final AbstractWebSocketProcessor webSocketProcessor)
- {
- super(webSocketProcessor);
- this.connection = Args.notNull(connection, "connection");
- }
-
- @Override
- public boolean isOpen()
- {
- return connection.isOpen();
- }
-
- @Override
- public void close(int code, String reason)
- {
- if (isOpen())
- {
- connection.close(code, reason);
- }
- }
-
- @Override
- public IWebSocketConnection sendMessage(String message) throws IOException
- {
- checkClosed();
-
- connection.sendMessage(message);
- return this;
- }
-
- @Override
- public IWebSocketConnection sendMessage(byte[] message, int offset, int length) throws IOException
- {
- checkClosed();
-
- connection.sendMessage(message, offset, length);
- return this;
- }
-
- private void checkClosed()
- {
- if (!isOpen())
- {
- throw new IllegalStateException("The connection is closed.");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketProcessor.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketProcessor.java b/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketProcessor.java
deleted file mode 100644
index bab53e4..0000000
--- a/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/JettyWebSocketProcessor.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.protocol.ws.jetty;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.ws.api.AbstractWebSocketProcessor;
-import org.eclipse.jetty.websocket.WebSocket;
-
-/**
- * An {@link org.apache.wicket.protocol.ws.api.IWebSocketProcessor processor} that integrates
- * with Jetty 7.x {@link WebSocket web socket} implementation.
- *
- * @since 6.0
- */
-public class JettyWebSocketProcessor extends AbstractWebSocketProcessor
-{
- public class JettyWebSocket implements WebSocket.OnTextMessage, WebSocket.OnBinaryMessage
- {
- @Override
- public void onMessage(byte[] bytes, int offset, int length)
- {
- JettyWebSocketProcessor.this.onMessage(bytes, offset, length);
- }
-
- @Override
- public void onMessage(String message)
- {
- JettyWebSocketProcessor.this.onMessage(message);
- }
-
- @Override
- public void onOpen(Connection connection)
- {
- JettyWebSocketProcessor.this.onOpen(connection);
- }
-
- @Override
- public void onClose(int code, String message)
- {
- JettyWebSocketProcessor.this.onClose(code, message);
- }
- }
-
- /**
- * Constructor.
- *
- * @param request
- * the http request that was used to create the TomcatWebSocketProcessor
- * @param application
- * the current Wicket Application
- */
- public JettyWebSocketProcessor(final HttpServletRequest request, final WebApplication application)
- {
- super(request, application);
- }
-
-
- @Override
- public void onOpen(Object connection)
- {
- if (!(connection instanceof WebSocket.Connection))
- {
- throw new IllegalArgumentException(JettyWebSocketProcessor.class.getName() + " can work only with " + WebSocket.Connection.class.getName());
- }
- onConnect(new JettyWebSocketConnection((WebSocket.Connection) connection, this));
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-native-websocket/wicket-native-websocket-jetty/src/test/java/org/apache/wicket/protocol/ws/util/license/ApacheLicenceHeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-jetty/src/test/java/org/apache/wicket/protocol/ws/util/license/ApacheLicenceHeaderTest.java b/wicket-native-websocket/wicket-native-websocket-jetty/src/test/java/org/apache/wicket/protocol/ws/util/license/ApacheLicenceHeaderTest.java
deleted file mode 100644
index 9e3759d..0000000
--- a/wicket-native-websocket/wicket-native-websocket-jetty/src/test/java/org/apache/wicket/protocol/ws/util/license/ApacheLicenceHeaderTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.protocol.ws.util.license;
-
-import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase;
-
-/**
- * Test that the license headers are in place in this project. The tests are run from
- * {@link org.apache.wicket.util.license.ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed.
- */
-public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
-{
- /**
- * Construct.
- */
- public ApacheLicenceHeaderTest()
- {
- // addHeaders = true;
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml b/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
index 8219cd1..3042f85 100644
--- a/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-native-websocket-tomcat</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-objectsizeof-agent/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-objectsizeof-agent/pom.xml b/wicket-objectsizeof-agent/pom.xml
index 3e4975a..65e9dd3 100644
--- a/wicket-objectsizeof-agent/pom.xml
+++ b/wicket-objectsizeof-agent/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-objectsizeof-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-request/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-request/pom.xml b/wicket-request/pom.xml
index 0bbdbdc..a86cb2c 100755
--- a/wicket-request/pom.xml
+++ b/wicket-request/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>wicket-parent</artifactId>
<groupId>org.apache.wicket</groupId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-spring/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-spring/pom.xml b/wicket-spring/pom.xml
index 25e7306..661a4d2 100644
--- a/wicket-spring/pom.xml
+++ b/wicket-spring/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-spring</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-user-guide/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-user-guide/pom.xml b/wicket-user-guide/pom.xml
index 1bd04e5..9abf995 100644
--- a/wicket-user-guide/pom.xml
+++ b/wicket-user-guide/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-user-guide</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-util/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index 932809d..af63e96 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-util</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket-velocity/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-velocity/pom.xml b/wicket-velocity/pom.xml
index d8c7a33..ab6baec 100644
--- a/wicket-velocity/pom.xml
+++ b/wicket-velocity/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-velocity</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6abe957/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/wicket/pom.xml b/wicket/pom.xml
index 6280b62..f696216 100644
--- a/wicket/pom.xml
+++ b/wicket/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket</artifactId>