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 2017/04/27 20:15:53 UTC
wicket git commit: WICKET-6363 Do not use jetty-all but specific
dependencies
Repository: wicket
Updated Branches:
refs/heads/master c0181dd0d -> 9e42a9548
WICKET-6363 Do not use jetty-all but specific dependencies
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9e42a954
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9e42a954
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9e42a954
Branch: refs/heads/master
Commit: 9e42a9548adb0da540e4e87d491f5824e778537e
Parents: c0181dd
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Apr 27 22:15:05 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Apr 27 22:15:05 2017 +0200
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 22 ++++++++++---
pom.xml | 24 ++++++++++++--
testing/wicket-js-tests/pom.xml | 15 +++------
.../testing/jstest/StartJavaScriptTests.java | 3 ++
testing/wicket-threadtest/pom.xml | 2 +-
wicket-examples/pom.xml | 13 ++++++--
wicket-examples/src/main/webapp/WEB-INF/web.xml | 2 +-
.../wicket-http2/wicket-http2-jetty/pom.xml | 1 -
.../wicket-native-websocket-javax/pom.xml | 34 ++------------------
9 files changed, 60 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9e42a954/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index b599b4b..38ce480 100644
--- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -87,12 +87,26 @@
<!-- JETTY DEPENDENCIES FOR TESTING -->
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <scope>test</scope>
<version>${jetty9.version}</version>
- <classifier>uber</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- uncomment if WebSocket support is needed
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>javax-websocket-server-impl</artifactId>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
+ -->
</dependencies>
<build>
<resources>
@@ -132,7 +146,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.6.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9e42a954/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7886878..51069a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,6 +144,7 @@
<aspectj.version>1.8.10</aspectj.version>
<metrics.version>3.2.2</metrics.version>
</properties>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -188,11 +189,28 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>javax-websocket-server-impl</artifactId>
+ <version>${jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
- <classifier>uber</classifier>
</dependency>
<dependency>
<groupId>cglib</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9e42a954/testing/wicket-js-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml
index ccbe44b..99287ef 100644
--- a/testing/wicket-js-tests/pom.xml
+++ b/testing/wicket-js-tests/pom.xml
@@ -105,26 +105,19 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
+ <artifactId>jetty-jmx</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jmx</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9e42a954/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java b/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java
index 8b5da32..3197a95 100644
--- a/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java
+++ b/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java
@@ -34,6 +34,9 @@ import org.eclipse.jetty.webapp.WebAppContext;
/**
* Separate startup class for people that want to run the examples directly. Use parameter
* -Dcom.sun.management.jmxremote to startup JMX (and e.g. connect with jconsole).
+ *
+ *
+ * @see <a href="http://localhost:8080/ajax-tests/test/js/all.html?2.2.4">JavaScript tests</a>
*/
public class StartJavaScriptTests
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/9e42a954/testing/wicket-threadtest/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-threadtest/pom.xml b/testing/wicket-threadtest/pom.xml
index 387e439..a1f594f 100644
--- a/testing/wicket-threadtest/pom.xml
+++ b/testing/wicket-threadtest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>6.22.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>wicket-threadtest</artifactId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9e42a954/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index 63d6298..3ba56d1 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -58,9 +58,16 @@
</dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <classifier>uber</classifier>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>javax-websocket-server-impl</artifactId>
</dependency>
<dependency>
<groupId>javax.el</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9e42a954/wicket-examples/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/webapp/WEB-INF/web.xml b/wicket-examples/src/main/webapp/WEB-INF/web.xml
index 97bef54..67f11f4 100644
--- a/wicket-examples/src/main/webapp/WEB-INF/web.xml
+++ b/wicket-examples/src/main/webapp/WEB-INF/web.xml
@@ -879,7 +879,7 @@
<session-config>
<session-timeout>5</session-timeout>
- <!--<tracking-mode>URL</tracking-mode>-->
+ <!--<tracking-mode>URL</tracking-mode>-->
</session-config>
</web-app>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9e42a954/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
index a77c9f8..1091153 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
@@ -40,7 +40,6 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/9e42a954/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 0a394c3..aabc073 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
@@ -27,38 +27,8 @@
<packaging>jar</packaging>
<name>Wicket Native WebSocket Javax</name>
<description>Provides the common code needed for the different integrations with web container's WebSocket implementations</description>
- <properties>
- <jetty.version>9.2.2.v20140723</jetty.version>
- </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>javax-websocket-server-impl</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
+
+ <dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>