Repository: wicket Updated Branches: refs/heads/wicket-8.x 0b1f7a9af -> 6508189a4
Fix ridiculous maven-enforcer-plugin rules which came with the update to org.apache:apache:21 parent pom Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6508189a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6508189a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6508189a Branch: refs/heads/wicket-8.x Commit: 6508189a4113c67cef893fa76e1d38376865ad8c Parents: 0b1f7a9 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Sep 5 22:09:52 2018 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Sep 5 22:09:52 2018 +0300 ---------------------------------------------------------------------- archetypes/quickstart/pom.xml | 20 ++- pom.xml | 151 ++++++++++--------- testing/wicket-arquillian/pom.xml | 8 +- testing/wicket-js-tests/pom.xml | 39 +++-- wicket-core/pom.xml | 24 +-- wicket-examples/pom.xml | 44 +++--- .../wicket-http2/wicket-http2-jetty/pom.xml | 8 +- .../wicket-http2/wicket-http2-servlet4/pom.xml | 22 ++- .../wicket-http2/wicket-http2-tomcat/pom.xml | 22 ++- .../wicket-http2/wicket-http2-undertow/pom.xml | 22 ++- .../http2/markup/head/UndertowPushBuilder.java | 2 +- wicket-experimental/wicket-metrics/pom.xml | 8 +- wicket-ioc/pom.xml | 8 +- 13 files changed, 213 insertions(+), 165 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6508189a/archetypes/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml index aad0af9..e8f30c6 100644 --- a/archetypes/quickstart/pom.xml +++ b/archetypes/quickstart/pom.xml @@ -50,6 +50,20 @@ <version>2.4</version> </extension> </extensions> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <configuration> + <useDefaultDelimiters>false</useDefaultDelimiters> + <delimiters> + <delimiter>@</delimiter> + </delimiters> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -58,12 +72,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <configuration> - <useDefaultDelimiters>false</useDefaultDelimiters> - <delimiters> - <delimiter>@</delimiter> - </delimiters> - </configuration> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/wicket/blob/6508189a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 391c6e7..c6d9286 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ <!-- Project Versions --> <cglib.version>3.2.6</cglib.version> <jacoco.version>0.7.9</jacoco.version> - <jetty.version>9.4.10.v20180503</jetty.version> + <jetty.version>9.4.12.v20180830</jetty.version> <joda-time.version>2.9.9</joda-time.version> <junit.version>4.12</junit.version> <spring.version>4.3.10.RELEASE</spring.version> @@ -150,11 +150,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>23.0</version> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>javax.el-api</artifactId> <version>3.0.1-b04</version> @@ -185,28 +180,16 @@ <scope>provided</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-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> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-junit</artifactId> + <version>${hamcrest.version}</version> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jmx</artifactId> - <version>${jetty.version}</version> - <scope>test</scope> + <groupId>org.hamcrest</groupId> + <artifactId>java-hamcrest</artifactId> + <version>${hamcrest.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>cglib</groupId> @@ -227,6 +210,17 @@ <optional>true</optional> </dependency> <dependency> + <groupId>com.github.openjson</groupId> + <artifactId>openjson</artifactId> + <version>1.0.8</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>23.0</version> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <version>4.1.0</version> @@ -242,6 +236,11 @@ <version>2.5</version> </dependency> <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>${metrics.version}</version> + </dependency> + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> <version>1</version> @@ -379,12 +378,6 @@ </dependency> <dependency> <groupId>org.apache.wicket.experimental.wicket8</groupId> - <artifactId>wicket-metrics</artifactId> - <version>0.7-SNAPSHOT</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.apache.wicket.experimental.wicket8</groupId> <artifactId>wicket-http2-core</artifactId> <version>0.6-SNAPSHOT</version> <type>jar</type> @@ -408,15 +401,20 @@ <type>jar</type> </dependency> <dependency> - <groupId>org.danekja</groupId> - <artifactId>jdk-serializable-functional</artifactId> - <version>1.8.3</version> + <groupId>org.apache.wicket.experimental.wicket8</groupId> + <artifactId>wicket-metrics</artifactId> + <version>0.7-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> - <groupId>com.github.openjson</groupId> - <artifactId>openjson</artifactId> - <version>1.0.8</version> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>${aspectj.version}</version> + </dependency> + <dependency> + <groupId>org.danekja</groupId> + <artifactId>jdk-serializable-functional</artifactId> + <version>1.8.3</version> <type>jar</type> </dependency> <dependency> @@ -460,6 +458,11 @@ <version>${slf4j.version}</version> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${spring.version}</version> @@ -494,6 +497,30 @@ </exclusions> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</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</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> + <dependency> <groupId>org.glassfish</groupId> <artifactId>javax.el</artifactId> <version>3.0.1-b08</version> @@ -506,18 +533,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-junit</artifactId> - <version>${hamcrest.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>java-hamcrest</artifactId> - <version>${hamcrest.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> <version>5.4.2.Final</version> @@ -547,16 +562,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>${aspectj.version}</version> - </dependency> - <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>${metrics.version}</version> - </dependency> </dependencies> </dependencyManagement> <dependencies> @@ -565,6 +570,10 @@ <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-junit</artifactId> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> @@ -573,10 +582,6 @@ <artifactId>junit</artifactId> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-junit</artifactId> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> </dependency> @@ -1009,6 +1014,15 @@ </executions> </plugin> <plugin> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>${jetty.version}</version> + <configuration> + <scanIntervalSeconds>60</scanIntervalSeconds> + <webAppSourceDirectory>src/main/webapp</webAppSourceDirectory> + </configuration> + </plugin> + <plugin> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> @@ -1086,15 +1100,6 @@ </lifecycleMappingMetadata> </configuration> </plugin> - <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.version}</version> - <configuration> - <scanIntervalSeconds>60</scanIntervalSeconds> - <webAppSourceDirectory>src/main/webapp</webAppSourceDirectory> - </configuration> - </plugin> </plugins> </pluginManagement> </build> http://git-wip-us.apache.org/repos/asf/wicket/blob/6508189a/testing/wicket-arquillian/pom.xml ---------------------------------------------------------------------- diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml index 85eb5cb..26d5eec 100644 --- a/testing/wicket-arquillian/pom.xml +++ b/testing/wicket-arquillian/pom.xml @@ -174,7 +174,13 @@ <filename>target/${project.build.finalName}.war</filename> </configuration> </plugin> - + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/wicket/blob/6508189a/testing/wicket-js-tests/pom.xml ---------------------------------------------------------------------- diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml index f10e7a6..4c07546 100644 --- a/testing/wicket-js-tests/pom.xml +++ b/testing/wicket-js-tests/pom.xml @@ -32,6 +32,25 @@ <clirr.skip>true</clirr.skip> </properties> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + </dependency> + </dependencies> + <build> <plugins> <plugin> @@ -100,24 +119,4 @@ </build> </profile> </profiles> - - <dependencies> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jmx</artifactId> - </dependency> - <dependency> - <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/6508189a/wicket-core/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml index cafce24..ae219f6 100644 --- a/wicket-core/pom.xml +++ b/wicket-core/pom.xml @@ -43,6 +43,14 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-junit</artifactId> + </dependency> + <dependency> + <groupId>com.github.openjson</groupId> + <artifactId>openjson</artifactId> + </dependency> + <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-request</artifactId> </dependency> @@ -55,18 +63,6 @@ <artifactId>jdk-serializable-functional</artifactId> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-junit</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <dependency> - <groupId>com.github.openjson</groupId> - <artifactId>openjson</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <scope>test</scope> @@ -76,6 +72,10 @@ <artifactId>commons-lang3</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> </dependencies> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/wicket/blob/6508189a/wicket-examples/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml index 12984f4..16ce852 100644 --- a/wicket-examples/pom.xml +++ b/wicket-examples/pom.xml @@ -64,7 +64,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.hibernate</groupId> + <groupId>org.hibernate.validator</groupId> <artifactId>hibernate-validator</artifactId> <version>6.0.7.Final</version> </dependency> @@ -72,24 +72,6 @@ </dependencyManagement> <dependencies> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <scope>runtime</scope> - </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> <artifactId>javax.el-api</artifactId> </dependency> @@ -152,15 +134,15 @@ </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-spring</artifactId> + <artifactId>wicket-native-websocket-javax</artifactId> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-velocity</artifactId> + <artifactId>wicket-spring</artifactId> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-javax</artifactId> + <artifactId>wicket-velocity</artifactId> </dependency> <dependency> <groupId>org.codelibs</groupId> @@ -188,6 +170,24 @@ <artifactId>spring-web</artifactId> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <scope>runtime</scope> + </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>org.glassfish</groupId> <artifactId>javax.el</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/wicket/blob/6508189a/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 fd708c8..05924cd 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml +++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml @@ -34,13 +34,13 @@ </description> <dependencies> <dependency> - <groupId>org.apache.wicket.experimental.wicket8</groupId> - <artifactId>wicket-http2-core</artifactId> - </dependency> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.wicket.experimental.wicket8</groupId> + <artifactId>wicket-http2-core</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/6508189a/wicket-experimental/wicket-http2/wicket-http2-servlet4/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-http2/wicket-http2-servlet4/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-servlet4/pom.xml index 4f73806..19ac873 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-servlet4/pom.xml +++ b/wicket-experimental/wicket-http2/wicket-http2-servlet4/pom.xml @@ -32,16 +32,26 @@ is the Servlet 4 implementation to resolve the PushBuilder API and provide the IInitializer. </description> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>4.0.0</version><!--$NO-MVN-MAN-VER$--> + <scope>provided</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> - <groupId>org.apache.wicket.experimental.wicket8</groupId> - <artifactId>wicket-http2-core</artifactId> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>4.0.0</version><!--$NO-MVN-MAN-VER$--> - <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.wicket.experimental.wicket8</groupId> + <artifactId>wicket-http2-core</artifactId> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/6508189a/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml index 74b89df..78cedef 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml +++ b/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml @@ -32,16 +32,26 @@ is the Apache Tomcat 8.5+ implementation to resolve the PushBuilder API and provide the IInitializer. </description> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-catalina</artifactId> + <version>8.5.33</version> + <scope>provided</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> - <groupId>org.apache.wicket.experimental.wicket8</groupId> - <artifactId>wicket-http2-core</artifactId> - </dependency> - <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-catalina</artifactId> - <version>8.5.19</version> - <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.wicket.experimental.wicket8</groupId> + <artifactId>wicket-http2-core</artifactId> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/6508189a/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml index 7f8e3c5..596a346 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml +++ b/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml @@ -32,16 +32,26 @@ is the Undertow 2+ implementation to resolve the PushBuilder API and provide the IInitializer. </description> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>io.undertow</groupId> + <artifactId>undertow-servlet</artifactId> + <version>2.0.13.Final</version> + <scope>provided</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> - <groupId>org.apache.wicket.experimental.wicket8</groupId> - <artifactId>wicket-http2-core</artifactId> - </dependency> - <dependency> <groupId>io.undertow</groupId> <artifactId>undertow-servlet</artifactId> - <version>2.0.0.Alpha1</version> - <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.wicket.experimental.wicket8</groupId> + <artifactId>wicket-http2-core</artifactId> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/6508189a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java b/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java index 7833870..b0b1014 100644 --- a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java +++ b/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java @@ -40,7 +40,7 @@ public class UndertowPushBuilder implements PushBuilder HttpServletRequest httpRequest = (HttpServletRequest) request.getContainerRequest(); io.undertow.servlet.spec.HttpServletRequestImpl undertowRequest = (io.undertow.servlet.spec.HttpServletRequestImpl) httpRequest; // Added explicit cast here to ensure this is the implementation of undertow - io.undertow.servlet.spec.PushBuilderImpl pushBuilder = (io.undertow.servlet.spec.PushBuilderImpl)undertowRequest.getPushBuilder(); + io.undertow.servlet.spec.PushBuilderImpl pushBuilder = (io.undertow.servlet.spec.PushBuilderImpl)undertowRequest.newPushBuilder(); if (pushBuilder != null) { for (PushItem pushItem : pushItems) http://git-wip-us.apache.org/repos/asf/wicket/blob/6508189a/wicket-experimental/wicket-metrics/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-metrics/pom.xml b/wicket-experimental/wicket-metrics/pom.xml index b673fec..e0bac17 100644 --- a/wicket-experimental/wicket-metrics/pom.xml +++ b/wicket-experimental/wicket-metrics/pom.xml @@ -33,8 +33,8 @@ </description> <dependencies> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> <groupId>org.aspectj</groupId> @@ -46,8 +46,8 @@ <artifactId>metrics-core</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/6508189a/wicket-ioc/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml index b94221e..acad20a 100644 --- a/wicket-ioc/pom.xml +++ b/wicket-ioc/pom.xml @@ -32,6 +32,10 @@ </description> <dependencies> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-junit</artifactId> + </dependency> + <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> </dependency> @@ -54,10 +58,6 @@ <artifactId>asm-util</artifactId> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-junit</artifactId> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> </dependency>
