Repository: wicket Updated Branches: refs/heads/master b74c1983b -> 4aa26cf40
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/4aa26cf4 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4aa26cf4 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4aa26cf4 Branch: refs/heads/master Commit: 4aa26cf4003e11336636e72a57325a4a3ab9fc6c Parents: b74c198 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Sep 5 23:03:00 2018 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Sep 5 23:03:00 2018 +0300 ---------------------------------------------------------------------- archetypes/quickstart/pom.xml | 20 +- pom.xml | 248 ++++++++++--------- testing/wicket-arquillian/pom.xml | 122 +++++---- testing/wicket-js-tests/pom.xml | 66 ++--- wicket-cdi-1.1/pom.xml | 46 ++-- wicket-core/pom.xml | 24 +- wicket-examples/pom.xml | 51 ++-- .../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 +- wicket-spring/pom.xml | 8 +- 15 files changed, 387 insertions(+), 290 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/4aa26cf4/archetypes/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml index 3f04703..523d5cf 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/4aa26cf4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 57d123a..4190dd2 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> <junit.version>4.12</junit.version> <spring.version>5.0.8.RELEASE</spring.version> <servlet-api.version>3.1.0</servlet-api.version> @@ -149,11 +149,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> @@ -184,28 +179,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> @@ -226,9 +209,20 @@ <optional>true</optional> </dependency> <dependency> + <groupId>com.github.openjson</groupId> + <artifactId>openjson</artifactId> + <version>1.0.10</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>26.0-jre</version> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <version>4.1.0</version> + <version>4.2.0</version> </dependency> <dependency> <groupId>commons-fileupload</groupId> @@ -241,6 +235,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> @@ -378,12 +377,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> @@ -407,54 +400,52 @@ <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> - <type>jar</type> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>${aspectj.version}</version> </dependency> <dependency> - <groupId>org.jboss.weld.servlet</groupId> - <artifactId>weld-servlet</artifactId> - <version>2.4.2.SP1</version> + <groupId>org.danekja</groupId> + <artifactId>jdk-serializable-functional</artifactId> + <version>1.8.3</version> + <type>jar</type> </dependency> <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api</artifactId> - <version>3.0.SP4</version> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + <version>3.0.SP4</version> </dependency> <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - <version>3.0.SP4</version> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>2.4.7.Final</version> </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-impl</artifactId> - <version>3.0.5.Final</version> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-impl</artifactId> + <version>3.0.5.Final</version> </dependency> - <dependency> - <groupId>org.jboss.weld.module</groupId> - <artifactId>weld-web</artifactId> - <version>3.0.4.Final</version> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + <version>3.0.SP4</version> </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>2.4.7.Final</version> + <groupId>org.jboss.weld.module</groupId> + <artifactId>weld-web</artifactId> + <version>3.0.4.Final</version> </dependency> <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se</artifactId> - <version>2.4.7.Final</version> - <scope>test</scope> + <groupId>org.jboss.weld.servlet</groupId> + <artifactId>weld-servlet</artifactId> + <version>2.4.2.SP1</version> </dependency> <dependency> <groupId>org.objenesis</groupId> @@ -487,6 +478,16 @@ <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-context</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${spring.version}</version> @@ -498,11 +499,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> <version>${spring.version}</version> @@ -526,6 +522,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> @@ -538,18 +558,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> @@ -562,6 +570,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.jboss.weld.se</groupId> + <artifactId>weld-se</artifactId> + <version>2.4.7.Final</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.jglue.cdi-unit</groupId> <artifactId>cdi-unit</artifactId> <version>4.0.2</version> @@ -579,16 +593,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> @@ -597,6 +601,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> @@ -605,10 +613,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> @@ -803,13 +807,13 @@ </file> </additionalConfig> </configuration> - <dependencies> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-eclipse-settings</artifactId> - <version>4</version> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-eclipse-settings</artifactId> + <version>4</version> + </dependency> + </dependencies> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -847,6 +851,26 @@ <dependency> <groupId>com.github.ferstl</groupId> <artifactId>pedantic-pom-enforcers</artifactId> + <version>1.3.1</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>2.3.0.1</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.3.0.1</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> <version>1.2.0</version> </dependency> </dependencies> @@ -1044,6 +1068,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> @@ -1121,15 +1154,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/4aa26cf4/testing/wicket-arquillian/pom.xml ---------------------------------------------------------------------- diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml index 023842e..10271b3 100644 --- a/testing/wicket-arquillian/pom.xml +++ b/testing/wicket-arquillian/pom.xml @@ -37,6 +37,20 @@ WAR version (everything in a single .war file). </description> + <repositories> + <repository> + <id>Apache Nexus</id> + <url>http://repository.jboss.org/nexus/content/groups/public/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <properties> <!-- port configuration --> <wicket.arquillian.server.port>18787</wicket.arquillian.server.port> @@ -54,13 +68,37 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>org.jboss.arquillian</groupId> - <artifactId>arquillian-bom</artifactId> - <version>${arquillian.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> + <dependency> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-javaee-7.0</artifactId> + <version>${jee.spec.version}</version> + <type>pom</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-weld</artifactId> + <version>${wildfly.version}</version> + <exclusions> + <exclusion> + <groupId>sun.jdk</groupId> + <artifactId>jconsole</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.wildfly.arquillian</groupId> + <artifactId>wildfly-arquillian-container-embedded</artifactId> + <version>2.1.0.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-bom</artifactId> + <version>${arquillian.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> </dependencies> </dependencyManagement> @@ -68,38 +106,7 @@ <dependency> <groupId>org.jboss.spec</groupId> <artifactId>jboss-javaee-7.0</artifactId> - <version>${jee.spec.version}</version> <type>pom</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.wildfly</groupId> - <artifactId>wildfly-weld</artifactId> - <version>${wildfly.version}</version> - <exclusions> - <exclusion> - <groupId>sun.jdk</groupId> - <artifactId>jconsole</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.wildfly.arquillian</groupId> - <artifactId>wildfly-arquillian-container-embedded</artifactId> - <version>2.1.0.Final</version> - <scope>test</scope> - </dependency> - - - <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - <scope>test</scope> </dependency> <!-- Wicket CDI integration. --> <dependency> @@ -117,7 +124,23 @@ <groupId>org.jboss.shrinkwrap.resolver</groupId> <artifactId>shrinkwrap-resolver-impl-maven</artifactId> </dependency> - + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-weld</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.wildfly.arquillian</groupId> + <artifactId>wildfly-arquillian-container-embedded</artifactId> + </dependency> </dependencies> <build> @@ -181,7 +204,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> @@ -199,18 +228,5 @@ </plugin> </plugins> </build> - <repositories> - <repository> - <id>Apache Nexus</id> - <url>http://repository.jboss.org/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/4aa26cf4/testing/wicket-js-tests/pom.xml ---------------------------------------------------------------------- diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml index 1941ad8..627b93b 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> @@ -39,18 +58,18 @@ <artifactId>maven-deploy-plugin</artifactId> </plugin> </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <!-- Just tests. No need to deploy --> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </pluginManagement> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <!-- Just tests. No need to deploy --> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> <profiles> <profile> @@ -91,8 +110,8 @@ <goal>grunt</goal> </goals> <configuration> - <!--<arguments> - -verbose </arguments>--> - </configuration> + <!--<arguments> - -verbose </arguments>--> + </configuration> </execution> </executions> </plugin> @@ -101,23 +120,4 @@ </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/4aa26cf4/wicket-cdi-1.1/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml index 9bfa684..18448d4 100644 --- a/wicket-cdi-1.1/pom.xml +++ b/wicket-cdi-1.1/pom.xml @@ -53,29 +53,41 @@ <artifactId>wicket-core</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.jglue.cdi-unit</groupId> - <artifactId>cdi-unit</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - </dependency> - <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-core</artifactId> </dependency> - <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </dependency> <dependency> <groupId>org.jboss.weld.module</groupId> <artifactId>weld-web</artifactId> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.weld.se</groupId> + <artifactId>weld-se</artifactId> + </dependency> + <dependency> + <groupId>org.jglue.cdi-unit</groupId> + <artifactId>cdi-unit</artifactId> + </dependency> </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/4aa26cf4/wicket-core/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml index 3d8d7d0..f3e4d52 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/4aa26cf4/wicket-examples/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml index 856373f..bc010a3 100644 --- a/wicket-examples/pom.xml +++ b/wicket-examples/pom.xml @@ -59,7 +59,7 @@ </dependency> <dependency> - <groupId>org.hibernate</groupId> + <groupId>org.hibernate.validator</groupId> <artifactId>hibernate-validator</artifactId> <version>6.0.7.Final</version> </dependency> @@ -67,24 +67,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> @@ -147,15 +129,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> @@ -183,6 +165,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> @@ -284,6 +284,13 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </pluginManagement> </build> http://git-wip-us.apache.org/repos/asf/wicket/blob/4aa26cf4/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/4aa26cf4/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/4aa26cf4/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/4aa26cf4/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..3494b83 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> + <groupId>io.undertow</groupId> + <artifactId>undertow-servlet</artifactId> </dependency> <dependency> - <groupId>io.undertow</groupId> - <artifactId>undertow-servlet</artifactId> - <version>2.0.0.Alpha1</version> - <scope>provided</scope> + <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/4aa26cf4/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/4aa26cf4/wicket-experimental/wicket-metrics/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-metrics/pom.xml b/wicket-experimental/wicket-metrics/pom.xml index 44ce43b..55de84b 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/4aa26cf4/wicket-ioc/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml index 76a0bba..d2eba4f 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> http://git-wip-us.apache.org/repos/asf/wicket/blob/4aa26cf4/wicket-spring/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-spring/pom.xml b/wicket-spring/pom.xml index 24213e8..bd615c4 100644 --- a/wicket-spring/pom.xml +++ b/wicket-spring/pom.xml @@ -34,10 +34,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </dependency> - <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> <version>${project.version}</version> @@ -46,5 +42,9 @@ <groupId>org.apache.wicket</groupId> <artifactId>wicket-ioc</artifactId> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> </dependencies> </project>
