Repository: wicket Updated Branches: refs/heads/master 92a2d4ae1 -> bf118fbf6
Enabled Maven POM Enforcer Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bf118fbf Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bf118fbf Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bf118fbf Branch: refs/heads/master Commit: bf118fbf67ab4d8f39aba57ddca746390eb07b8a Parents: 92a2d4a Author: Martijn Dashorst <[email protected]> Authored: Mon Sep 22 00:55:01 2014 +0200 Committer: Martijn Dashorst <[email protected]> Committed: Mon Sep 22 00:55:01 2014 +0200 ---------------------------------------------------------------------- pom.xml | 913 +++++++++++-------- testing/wicket-common-tests/pom.xml | 62 +- testing/wicket-js-tests/pom.xml | 32 +- wicket-bean-validation/pom.xml | 23 +- wicket-cdi-1.1/pom.xml | 23 +- wicket-cdi/pom.xml | 22 +- wicket-core/pom.xml | 53 +- wicket-datetime/pom.xml | 9 +- wicket-examples/pom.xml | 209 +++-- wicket-experimental/wicket-atmosphere/pom.xml | 93 +- wicket-extensions/pom.xml | 9 +- wicket-guice/pom.xml | 8 +- wicket-ioc/pom.xml | 16 +- wicket-jmx/pom.xml | 12 +- .../wicket-native-websocket-javax/pom.xml | 65 +- .../wicket-native-websocket-jetty/pom.xml | 22 +- .../wicket-native-websocket-jetty9/pom.xml | 22 +- .../wicket-native-websocket-tomcat/pom.xml | 36 +- wicket-objectsizeof-agent/pom.xml | 15 +- wicket-spring/pom.xml | 10 +- wicket-util/pom.xml | 12 +- wicket-velocity/pom.xml | 9 +- wicket/pom.xml | 1 - 23 files changed, 935 insertions(+), 741 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a04767b..7d0ed1c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,8 +14,12 @@ 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";> +--> +<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> + <prerequisites> + <maven>3.0.4</maven> + </prerequisites> <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> @@ -27,181 +31,7 @@ <packaging>pom</packaging> <name>Wicket Parent</name> <description>Wicket is a Java-based open source component web application framework.</description> - <prerequisites> - <maven>3.0.4</maven> - </prerequisites> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <mvn.build.java.version>1.7</mvn.build.java.version> - <jacoco.version>0.7.1.201405082137</jacoco.version> - <jetty.version>8.1.16.v20140903</jetty.version> - <jetty9.version>9.0.7.v20131107</jetty9.version> - <spring.version>4.1.0.RELEASE</spring.version> - <servlet-api.version>3.0.1</servlet-api.version> - <maven.javadoc.version>2.9.1</maven.javadoc.version> - <maven.surefire.version>2.17</maven.surefire.version> - <mockito.version>1.9.5</mockito.version> - <slf4j.version>1.7.7</slf4j.version> - <hamcrest.version>1.3</hamcrest.version> - </properties> - <modules> - <module>wicket</module> - <module>wicket-core</module> - <module>wicket-util</module> - <module>wicket-datetime</module> - <module>wicket-request</module> - <module>wicket-devutils</module> - <module>wicket-extensions</module> - <module>wicket-ioc</module> - <module>wicket-cdi</module> - <module>wicket-spring</module> - <module>wicket-velocity</module> - <module>wicket-auth-roles</module> - <module>wicket-guice</module> - <module>wicket-jmx</module> - <module>wicket-objectsizeof-agent</module> - <module>wicket-examples</module> - <module>wicket-experimental</module> - <module>archetypes/quickstart</module> - <module>testing/wicket-common-tests</module> - <module>testing/wicket-js-tests</module> - <module>wicket-native-websocket</module> - <module>wicket-bean-validation</module> - <module>wicket-cdi-1.1</module> - </modules> - <profiles> - <profile> - <id>release</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <inherited>true</inherited> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <aggregate>true</aggregate> - </configuration> - </plugin> - </plugins> - </build> - <distributionManagement> - <site> - <id>local</id> - <url>file:target/site</url> - </site> - </distributionManagement> - </profile> - <profile> - <id>apache-nexus-deploy</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <inherited>true</inherited> - </plugin> - </plugins> - </build> - <!-- distribution management is inherited from the parent pom --> - </profile> - <profile> - <id>all</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - </profile> - <profile> - <id>fast</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <excludedGroups>org.apache.wicket.util.SlowTests</excludedGroups> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <inherited>false</inherited> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>coverage</id> - <build> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.version}</version> - - <executions> - <execution> - <id>jacoco-initialize</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>jacoco-site</id> - <phase>package</phase> - <goals> - <goal>report</goal> - </goals> - </execution> - </executions> - - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>Java 8</id> - <activation> - <jdk>1.8</jdk> - </activation> - <properties> - <!-- Disable javadoc linter when building with Java 8 - http://mail-archives.apache.org/mod_mbox/maven-users/201403.mbox/%3ccanwgjs5xhwige+lecey+mzvbj9via4juwsabeztqr2aqneb...@mail.gmail.com%3E - http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html - --> - <additionalparam>-Xdoclint:none</additionalparam> - </properties> - </profile> - - </profiles> - <url>http://wicket.apache.org/${project.artifactId}</url> - <inceptionYear>2006</inceptionYear> - <organization> - <name>Apache Software Foundation</name> - <url>http://apache.org</url> - </organization> + <url>http://wicket.apache.org</url> <licenses> <license> <name>The Apache Software License, Version 2.0</name> @@ -209,20 +39,15 @@ <distribution>repo</distribution> </license> </licenses> - <issueManagement> - <system>jira</system> - <url>http://issues.apache.org/jira/browse/WICKET</url> - </issueManagement> + <organization> + <name>Apache Software Foundation</name> + <url>http://apache.org</url> + </organization> + <inceptionYear>2006</inceptionYear> <ciManagement> <system>hudson</system> <url>https://hudson.apache.org/hudson/job/Apache%20Wicket%201.5.x/</url> </ciManagement> - <scm> - <connection>scm:git:http://git-wip-us.apache.org/repos/asf/wicket.git</connection> - <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/wicket.git</developerConnection> - <url>http://git-wip-us.apache.org/repos/asf/wicket/repo?p=wicket.git</url> - <tag>HEAD</tag> - </scm> <mailingLists> <mailingList> <name>Wicket Announcements List</name> @@ -252,8 +77,170 @@ <archive>http://mail-archives.apache.org/mod_mbox/wicket-commits/</archive> </mailingList> </mailingLists> + <issueManagement> + <system>jira</system> + <url>http://issues.apache.org/jira/browse/WICKET</url> + </issueManagement> + <scm> + <connection>scm:git:http://git-wip-us.apache.org/repos/asf/wicket.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/wicket.git</developerConnection> + <url>http://git-wip-us.apache.org/repos/asf/wicket/repo?p=wicket.git</url> + <tag>HEAD</tag> + </scm> + <modules> + <module>wicket</module> + <module>wicket-core</module> + <module>wicket-util</module> + <module>wicket-datetime</module> + <module>wicket-request</module> + <module>wicket-devutils</module> + <module>wicket-extensions</module> + <module>wicket-ioc</module> + <module>wicket-cdi</module> + <module>wicket-spring</module> + <module>wicket-velocity</module> + <module>wicket-auth-roles</module> + <module>wicket-guice</module> + <module>wicket-jmx</module> + <module>wicket-objectsizeof-agent</module> + <module>wicket-examples</module> + <module>wicket-experimental</module> + <module>archetypes/quickstart</module> + <module>testing/wicket-common-tests</module> + <module>testing/wicket-js-tests</module> + <module>wicket-native-websocket</module> + <module>wicket-bean-validation</module> + <module>wicket-cdi-1.1</module> + </modules> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <mvn.build.java.version>1.7</mvn.build.java.version> + <jacoco.version>0.7.1.201405082137</jacoco.version> + <jetty.version>8.1.16.v20140903</jetty.version> + <jetty9.version>9.0.7.v20131107</jetty9.version> + <spring.version>4.1.0.RELEASE</spring.version> + <servlet-api.version>3.0.1</servlet-api.version> + <maven.javadoc.version>2.9.1</maven.javadoc.version> + <maven.surefire.version>2.17</maven.surefire.version> + <mockito.version>1.9.5</mockito.version> + <slf4j.version>1.7.7</slf4j.version> + <hamcrest.version>1.3</hamcrest.version> + </properties> <dependencyManagement> <dependencies> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>3.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> + <version>3.0.1-b04</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${servlet-api.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>javax.servlet.jsp-api</artifactId> + <scope>provided</scope> + <version>2.3.2-b01</version> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.1.0.Final</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.websocket</groupId> + <artifactId>javax.websocket-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>mx4j</groupId> + <artifactId>mx4j</artifactId> + <version>3.0.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.aggregate</groupId> + <artifactId>jetty-all-server</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>3.1</version> + <exclusions> + <!-- excluded due to conflict with asm 5 in wicket-ioc --> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.4.1.3</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>17.0</version> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.3.1</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>de.agilecoders.wicket.webjars</groupId> + <artifactId>wicket-webjars</artifactId> + <version>0.5.0-M2</version> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.7</version> + </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket</artifactId> @@ -265,121 +252,121 @@ </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> + <artifactId>wicket-auth-roles</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-cdi</artifactId> + <artifactId>wicket-bean-validation</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-cdi-1.1</artifactId> + <artifactId>wicket-cdi</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-devutils</artifactId> + <artifactId>wicket-cdi-1.1</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-request</artifactId> + <artifactId>wicket-core</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-extensions</artifactId> + <artifactId>wicket-datetime</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-util</artifactId> + <artifactId>wicket-devutils</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-guice</artifactId> + <artifactId>wicket-extensions</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-ioc</artifactId> + <artifactId>wicket-guice</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-jmx</artifactId> + <artifactId>wicket-ioc</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-spring</artifactId> + <artifactId>wicket-jmx</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-auth-roles</artifactId> + <artifactId>wicket-native-websocket-core</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-datetime</artifactId> + <artifactId>wicket-native-websocket-javax</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-velocity</artifactId> + <artifactId>wicket-native-websocket-jetty</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-bean-validation</artifactId> + <artifactId>wicket-native-websocket-jetty9</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-core</artifactId> + <artifactId>wicket-native-websocket-tomcat</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-jetty</artifactId> + <artifactId>wicket-request</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-jetty9</artifactId> + <artifactId>wicket-spring</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-tomcat</artifactId> + <artifactId>wicket-util</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-javax</artifactId> + <artifactId>wicket-velocity</artifactId> <version>7.0.0-SNAPSHOT</version> <type>jar</type> </dependency> @@ -389,35 +376,25 @@ <version>0.10-SNAPSHOT</version> <type>jar</type> </dependency> + <dependency> + <groupId>org.jboss.seam.conversation</groupId> + <artifactId>seam-conversation-spi</artifactId> + <version>3.0.0.Final</version> + </dependency> + <dependency> + <groupId>org.jboss.weld.servlet</groupId> + <artifactId>weld-servlet</artifactId> + <version>2.2.4.Final</version> + </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> - <version>${hamcrest.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <version>${hamcrest.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-util</artifactId> + <version>5.0.3</version> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet-api.version}</version> - <scope>provided</scope> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -435,17 +412,6 @@ <version>${slf4j.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - <optional>true</optional> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${spring.version}</version> @@ -468,52 +434,72 @@ </exclusions> </dependency> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-all-server</artifactId> - <version>${jetty.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>mx4j</groupId> - <artifactId>mx4j</artifactId> - <version>3.0.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-util</artifactId> - <version>5.0.3</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.el</artifactId> + <version>3.0.1-b05</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <version>2.2</version> + <scope>test</scope> + </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>${hamcrest.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>3.0</version> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <version>${hamcrest.version}</version> + <scope>test</scope> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>5.1.2.Final</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.httpunit</groupId> <artifactId>httpunit</artifactId> <version>1.7.2</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jglue.cdi-unit</groupId> + <artifactId>cdi-unit</artifactId> + <version>2.2.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.version}</version> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement> <dependencies> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -524,22 +510,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>jcl-over-slf4j</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> </dependencies> @@ -635,58 +612,54 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>${maven.javadoc.version}</version> <inherited>true</inherited> - <configuration> - <additionalDependencies> - <additionalDependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <version>${hamcrest.version}</version> - </additionalDependency> - </additionalDependencies> - </configuration> </plugin> </plugins> <pluginManagement> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.1</version> + <groupId>net.alchim31.maven</groupId> + <artifactId>yuicompressor-maven-plugin</artifactId> + <version>1.4.0</version> <configuration> - <retryFailedDeploymentCount>10</retryFailedDeploymentCount> + <statistics>true</statistics> + <jswarn>false</jswarn> + <suffix>.min</suffix> </configuration> + <executions> + <execution> + <goals> + <goal>compress</goal> + </goals> + </execution> + </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.5.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.5</version> - <inherited>true</inherited> - <configuration> - <pushChanges>false</pushChanges> - <tagNameFormat>wicket-@{project.version}</tagNameFormat> - </configuration> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.5.0</version> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + <configuration> + <instructions> + <Export-Package>*</Export-Package> + <Import-Package>org.apache.wicket*</Import-Package> + <DynamicImport-Package>*</DynamicImport-Package> + <_nouses>true</_nouses> + </instructions> + </configuration> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <configuration> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - <dependencies> - <dependency> <!-- remove me when maven-resources-plugin upgrades to plexus-utils:3.0.7 --> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>3.0.17</version> - </dependency> - </dependencies> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.2</version> </plugin> <plugin> <inherited>true</inherited> @@ -705,12 +678,45 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.1</version> + <configuration> + <retryFailedDeploymentCount>10</retryFailedDeploymentCount> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> <version>2.9</version> <configuration> <downloadSources>true</downloadSources> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.3.1</version> + <configuration> + <rules> + <dependencyConvergence /> + <compound implementation="com.github.ferstl.maven.pomenforcers.CompoundPedanticEnforcer"> + <!-- Enforcers --> + <enforcers>POM_SECTION_ORDER,DEPENDENCY_MANAGEMENT_ORDER,DEPENDENCY_ORDER,DEPENDENCY_CONFIGURATION,PLUGIN_MANAGEMENT_ORDER,PLUGIN_CONFIGURATION</enforcers> + <dependencyManagementOrderBy>scope,groupId,artifactId</dependencyManagementOrderBy> + <dependencyManagementScopePriorities>provided,compile,runtime,test,import</dependencyManagementScopePriorities> + <dependenciesScopePriorities>import,provided,compile,runtime,test</dependenciesScopePriorities> + </compound> + </rules> + <fail>true</fail> + </configuration> + <dependencies> + <dependency> + <groupId>com.github.ferstl</groupId> + <artifactId>pedantic-pom-enforcers</artifactId> + <version>1.1.2</version> + </dependency> + </dependencies> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> @@ -727,11 +733,8 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.4</version> - <configuration> - <warName>${project.artifactId}</warName> - </configuration> + <artifactId>maven-install-plugin</artifactId> + <version>2.5.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -754,6 +757,13 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>${maven.javadoc.version}</version> <configuration> + <additionalDependencies> + <additionalDependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>${hamcrest.version}</version> + </additionalDependency> + </additionalDependencies> <minmemory>128m</minmemory> <maxmemory>256m</maxmemory> <quiet>true</quiet> @@ -772,6 +782,49 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.5</version> + <inherited>true</inherited> + <configuration> + <pushChanges>false</pushChanges> + <tagNameFormat>wicket-@{project.version}</tagNameFormat> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <version>1.5</version> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + <configuration> + <resourceBundles> + <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle> + </resourceBundles> + </configuration> + </execution> + </executions> + <inherited>true</inherited> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + <dependencies> + <dependency> <!-- remove me when maven-resources-plugin upgrades to plexus-utils:3.0.7 --> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>3.0.17</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <version>3.4</version> </plugin> @@ -814,75 +867,12 @@ <version>${maven.surefire.version}</version> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.version}</version> - <configuration> - <scanIntervalSeconds>60</scanIntervalSeconds> - <webAppSourceDirectory>src/main/webapp</webAppSourceDirectory> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-remote-resources-plugin</artifactId> - <version>1.5</version> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - <configuration> - <resourceBundles> - <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle> - </resourceBundles> - </configuration> - </execution> - </executions> - <inherited>true</inherited> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.5.0</version> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - <configuration> - <instructions> - <Export-Package>*</Export-Package> - <Import-Package>org.apache.wicket*</Import-Package> - <DynamicImport-Package>*</DynamicImport-Package> - <_nouses>true</_nouses> - </instructions> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-archetype-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>yuicompressor-maven-plugin</artifactId> - <version>1.4.0</version> + <artifactId>maven-war-plugin</artifactId> + <version>2.4</version> <configuration> - <statistics>true</statistics> - <jswarn>false</jswarn> - <suffix>.min</suffix> + <warName>${project.artifactId}</warName> </configuration> - <executions> - <execution> - <goals> - <goal>compress</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -937,9 +927,142 @@ </lifecycleMappingMetadata> </configuration> </plugin> + <plugin> + <groupId>org.mortbay.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> + <profiles> + <profile> + <id>release</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <inherited>true</inherited> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <aggregate>true</aggregate> + </configuration> + </plugin> + </plugins> + </build> + <distributionManagement> + <site> + <id>local</id> + <url>file:target/site</url> + </site> + </distributionManagement> + </profile> + <profile> + <id>apache-nexus-deploy</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <inherited>true</inherited> + </plugin> + </plugins> + </build> + <!-- distribution management is inherited from the parent pom --> + </profile> + <profile> + <id>all</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + <profile> + <id>fast</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <excludedGroups>org.apache.wicket.util.SlowTests</excludedGroups> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <inherited>false</inherited> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>coverage</id> + <build> + <plugins> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>${jacoco.version}</version> + + <executions> + <execution> + <id>jacoco-initialize</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>jacoco-site</id> + <phase>package</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + </executions> + + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>Java 8</id> + <activation> + <jdk>1.8</jdk> + </activation> + <properties> + <!-- Disable javadoc linter when building with Java 8 + http://mail-archives.apache.org/mod_mbox/maven-users/201403.mbox/%3ccanwgjs5xhwige+lecey+mzvbj9via4juwsabeztqr2aqneb...@mail.gmail.com%3E + http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html + --> + <additionalparam>-Xdoclint:none</additionalparam> + </properties> + </profile> + </profiles> <reporting> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/testing/wicket-common-tests/pom.xml ---------------------------------------------------------------------- diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml index 1589412..b8207cd 100644 --- a/testing/wicket-common-tests/pom.xml +++ b/testing/wicket-common-tests/pom.xml @@ -29,104 +29,104 @@ <description>Tests for all Wicket modules</description> <dependencies> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> - <scope>test</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-extensions</artifactId> + <artifactId>wicket-auth-roles</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-datetime</artifactId> + <artifactId>wicket-bean-validation</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-ioc</artifactId> + <artifactId>wicket-cdi</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-guice</artifactId> + <artifactId>wicket-core</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-spring</artifactId> + <artifactId>wicket-datetime</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-auth-roles</artifactId> + <artifactId>wicket-devutils</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-devutils</artifactId> + <artifactId>wicket-extensions</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-jmx</artifactId> + <artifactId>wicket-guice</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-velocity</artifactId> + <artifactId>wicket-ioc</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-core</artifactId> + <artifactId>wicket-jmx</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-jetty</artifactId> + <artifactId>wicket-native-websocket-core</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-jetty9</artifactId> + <artifactId>wicket-native-websocket-javax</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-tomcat</artifactId> + <artifactId>wicket-native-websocket-jetty</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-javax</artifactId> + <artifactId>wicket-native-websocket-jetty9</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.wicket.experimental.wicket7</groupId> - <artifactId>wicket-atmosphere</artifactId> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-native-websocket-tomcat</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-cdi</artifactId> + <artifactId>wicket-objectsizeof-agent</artifactId> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-bean-validation</artifactId> + <artifactId>wicket-spring</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-objectsizeof-agent</artifactId> - <version>${project.version}</version> + <artifactId>wicket-velocity</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.apache.wicket.experimental.wicket7</groupId> + <artifactId>wicket-atmosphere</artifactId> + <scope>test</scope> </dependency> </dependencies> <build> @@ -134,14 +134,18 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <!-- Just tests. No need to deploy them --> - <skip>true</skip> - </configuration> </plugin> </plugins> <pluginManagement> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <!-- Just tests. No need to deploy them --> + <skip>true</skip> + </configuration> + </plugin> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin> <groupId>org.eclipse.m2e</groupId> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/testing/wicket-js-tests/pom.xml ---------------------------------------------------------------------- diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml index 313ebd7..59fa830 100644 --- a/testing/wicket-js-tests/pom.xml +++ b/testing/wicket-js-tests/pom.xml @@ -27,6 +27,26 @@ <packaging>jar</packaging> <name>Wicket JavaScript Tests</name> <description>JavaScript tests for all Wicket modules</description> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <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> + </build> <profiles> <profile> <id>js-test</id> @@ -72,16 +92,4 @@ </build> </profile> </profiles> - <build> - <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> - </build> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-bean-validation/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml index b91e4e7..aabc849 100644 --- a/wicket-bean-validation/pom.xml +++ b/wicket-bean-validation/pom.xml @@ -13,35 +13,28 @@ <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> </dependency> <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.1.0.Final</version> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>javax.el-api</artifactId> - <version>3.0.1-b04</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>5.1.2.Final</version> - <scope>test</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> </dependency> <dependency> <groupId>org.glassfish.web</groupId> <artifactId>el-impl</artifactId> - <version>2.2</version> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-cdi-1.1/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml index f42da11..715b02e 100644 --- a/wicket-cdi-1.1/pom.xml +++ b/wicket-cdi-1.1/pom.xml @@ -32,16 +32,25 @@ Also enables propagation of conversations between wicket artifacts such as pages and resources. </description> + <dependencyManagement> + <dependencies> + <!-- local management because we can only define one GAV in the parent --> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> - </dependency> - <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> - <version>1.1</version> - <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> </dependency> <dependency> <groupId>junit</groupId> @@ -50,8 +59,6 @@ <dependency> <groupId>org.jglue.cdi-unit</groupId> <artifactId>cdi-unit</artifactId> - <version>2.2.1</version> - <scope>test</scope> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml index 4e8626a..87f5461 100644 --- a/wicket-cdi/pom.xml +++ b/wicket-cdi/pom.xml @@ -32,25 +32,33 @@ Also enables propagation of conversations between wicket artifacts such as pages and resources. </description> + <dependencyManagement> + <dependencies> + <!-- local management because we can only define one GAV in the parent --> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.0-SP4</version> + <scope>provided</scope> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> - </dependency> - <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> - <version>1.0-SP4</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> </dependency> <dependency> <groupId>org.jboss.seam.conversation</groupId> <artifactId>seam-conversation-spi</artifactId> - <version>3.0.0.Final</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-core/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml index 7ab8b05..d9e9eda 100644 --- a/wicket-core/pom.xml +++ b/wicket-core/pom.xml @@ -37,24 +37,15 @@ </description> <dependencies> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-util</artifactId> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-request</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>provided</scope> <!-- provided because of the -test jar we build? --> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> <scope>provided</scope> - <!-- provided because of the -test jar we build? --> </dependency> <dependency> <groupId>org.hamcrest</groupId> @@ -62,34 +53,42 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> <scope>provided</scope> + <!-- provided because of the -test jar we build? --> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-request</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-util</artifactId> </dependency> </dependencies> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clover-plugin</artifactId> - <version>2.4</version> - <configuration> - <cloverOutputDirectory>${project.build.directory}/clover</cloverOutputDirectory> - <licenseLocation>${basedir}/../../../common/lib/clover.license</licenseLocation> - </configuration> - </plugin> - <plugin> <groupId>net.alchim31.maven</groupId> <artifactId>yuicompressor-maven-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/jquery*.js</exclude> - </excludes> - </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clover-plugin</artifactId> </plugin> </plugins> <pluginManagement> <plugins> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>yuicompressor-maven-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/jquery*.js</exclude> + </excludes> + </configuration> + </plugin> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin> <groupId>org.eclipse.m2e</groupId> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-datetime/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-datetime/pom.xml b/wicket-datetime/pom.xml index 356e2be..29e44a0 100644 --- a/wicket-datetime/pom.xml +++ b/wicket-datetime/pom.xml @@ -29,14 +29,13 @@ <description>Date/Time components and utilities for Wicket</description> <dependencies> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> + </dependency> </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-examples/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml index 3345a19..eee87bc 100644 --- a/wicket-examples/pom.xml +++ b/wicket-examples/pom.xml @@ -30,45 +30,91 @@ Examples displaying a component reference and several components in action. </description> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.github.axet</groupId> + <artifactId>kaptcha</artifactId> + <version>0.0.9</version> + </dependency> + <dependency> + <groupId>com.github.cage</groupId> + <artifactId>cage</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>com.uwyn</groupId> + <artifactId>jhighlight</artifactId> + <version>1.0</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.aggregate</groupId> + <artifactId>jetty-all-server</artifactId> + <version>${jetty.version}</version> + <exclusions> + <exclusion> + <!-- exclude because the same jar comes from JBoss Weld and the following error occurs: + class "javax.annotation.ManagedBean"'s signer information does not match signer + information of other classes in the same package + --> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.annotation</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <dependency> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> + <groupId>javax.servlet.jsp</groupId> + <artifactId>javax.servlet.jsp-api</artifactId> </dependency> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-extensions</artifactId> + <groupId>com.github.axet</groupId> + <artifactId>kaptcha</artifactId> </dependency> <dependency> - <groupId>org.apache.wicket.experimental.wicket7</groupId> - <artifactId>wicket-atmosphere</artifactId> + <groupId>com.github.cage</groupId> + <artifactId>cage</artifactId> </dependency> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-guice</artifactId> + <groupId>com.uwyn</groupId> + <artifactId>jhighlight</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> </dependency> - <!-- bean validation --> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-bean-validation</artifactId> + <artifactId>wicket-auth-roles</artifactId> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>5.1.2.Final</version> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-bean-validation</artifactId> </dependency> - <!-- / bean validation --> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-jmx</artifactId> + <artifactId>wicket-cdi-1.1</artifactId> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-auth-roles</artifactId> + <artifactId>wicket-core</artifactId> </dependency> <dependency> <groupId>org.apache.wicket</groupId> @@ -76,60 +122,44 @@ </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-velocity</artifactId> + <artifactId>wicket-devutils</artifactId> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-spring</artifactId> + <artifactId>wicket-extensions</artifactId> </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-devutils</artifactId> + <artifactId>wicket-guice</artifactId> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-jmx</artifactId> </dependency> <dependency> - <groupId>velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.4</version> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-spring</artifactId> </dependency> <dependency> - <groupId>com.uwyn</groupId> - <artifactId>jhighlight</artifactId> - <version>1.0</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-velocity</artifactId> </dependency> <dependency> - <groupId>org.httpunit</groupId> - <artifactId>httpunit</artifactId> + <groupId>org.apache.wicket.experimental.wicket7</groupId> + <artifactId>wicket-atmosphere</artifactId> </dependency> <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all-server</artifactId> - <exclusions> - <exclusion> - <!-- exclude because the same jar comes from JBoss Weld and the following error occurs: - class "javax.annotation.ManagedBean"'s signer information does not match signer - information of other classes in the same package - --> - <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>javax.annotation</artifactId> - </exclusion> - </exclusions> </dependency> - <!-- EL impl for bean validation demo --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>compile</scope> + </dependency> <dependency> - <groupId>org.glassfish</groupId> - <artifactId>javax.el</artifactId> - <version>3.0.1-b05</version> - <scope>test</scope> + <groupId>org.jboss.weld.servlet</groupId> + <artifactId>weld-servlet</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -140,39 +170,16 @@ <artifactId>slf4j-log4j12</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.weld.servlet</groupId> - <artifactId>weld-servlet</artifactId> - <version>2.2.4.Final</version> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-cdi-1.1</artifactId> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>javax.el-api</artifactId> - <version>3.0.1-b04</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>javax.servlet.jsp-api</artifactId> - <scope>provided</scope> - <version>2.3.2-b01</version> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> </dependency> <dependency> - <groupId>com.github.axet</groupId> - <artifactId>kaptcha</artifactId> - <version>0.0.9</version> + <groupId>org.glassfish</groupId> + <artifactId>javax.el</artifactId> </dependency> <dependency> - <groupId>com.github.cage</groupId> - <artifactId>cage</artifactId> - <version>1.0</version> + <groupId>org.httpunit</groupId> + <artifactId>httpunit</artifactId> </dependency> </dependencies> <build> @@ -216,22 +223,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <configuration> - <!-- include the manifest entries so that we can emit the version of the examples. --> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - </manifest> - </archive> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> </plugin> <plugin> <groupId>org.mortbay.jetty</groupId> @@ -240,6 +235,26 @@ </plugins> <pluginManagement> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <!-- include the manifest entries so that we can emit the version of the examples. --> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + </manifest> + </archive> + </configuration> + </plugin> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin> <groupId>org.eclipse.m2e</groupId> @@ -270,6 +285,18 @@ </lifecycleMappingMetadata> </configuration> </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>${jetty.version}</version> + <dependencies> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.1.0.Final</version> + </dependency> + </dependencies> + </plugin> </plugins> </pluginManagement> </build> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-experimental/wicket-atmosphere/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/pom.xml b/wicket-experimental/wicket-atmosphere/pom.xml index 33e2743..6ca804c 100644 --- a/wicket-experimental/wicket-atmosphere/pom.xml +++ b/wicket-experimental/wicket-atmosphere/pom.xml @@ -26,54 +26,75 @@ <artifactId>wicket-atmosphere</artifactId> <version>0.10-SNAPSHOT</version> <packaging>jar</packaging> + <name>Wicket-Atmosphere</name> + <description>Wicket-Atmosphere provides integration of the Atmosphere Framework in Wicket.</description> + <repositories> + <repository> + <id>Sonatype OSS snapshots</id> + <url>https://oss.sonatype.org/content/repositories/snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> <properties> <atmosphere.version>2.1.8</atmosphere.version> <jquery.atmosphere.version>2.1.6</jquery.atmosphere.version> </properties> - <name>Wicket-Atmosphere</name> - <description>Wicket-Atmosphere provides integration of the Atmosphere Framework in Wicket.</description> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.atmosphere</groupId> + <artifactId>atmosphere-runtime</artifactId> + <version>${atmosphere.version}</version> + <exclusions> + <exclusion> + <groupId>org.atmosphere</groupId> + <artifactId>atmosphere-compat-jetty</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>jquery-atmosphere</artifactId> + <version>${jquery.atmosphere.version}</version> + <exclusions> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>jquery</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>17.0</version> </dependency> <dependency> - <groupId>org.atmosphere</groupId> - <artifactId>atmosphere-runtime</artifactId> - <version>${atmosphere.version}</version> - <exclusions> - <exclusion> - <groupId>org.atmosphere</groupId> - <artifactId>atmosphere-compat-jetty</artifactId> - </exclusion> - </exclusions> + <groupId>de.agilecoders.wicket.webjars</groupId> + <artifactId>wicket-webjars</artifactId> </dependency> <dependency> - <groupId>org.webjars</groupId> - <artifactId>jquery-atmosphere</artifactId> - <version>${jquery.atmosphere.version}</version> - <exclusions> - <exclusion> - <groupId>org.webjars</groupId> - <artifactId>jquery</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> </dependency> <dependency> - <groupId>de.agilecoders.wicket.webjars</groupId> - <artifactId>wicket-webjars</artifactId> - <version>0.5.0-M2</version> + <groupId>org.atmosphere</groupId> + <artifactId>atmosphere-runtime</artifactId> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - <version>3.0.0</version> - <scope>provided</scope> + <groupId>org.webjars</groupId> + <artifactId>jquery-atmosphere</artifactId> </dependency> </dependencies> <build> @@ -150,16 +171,4 @@ </plugins> </pluginManagement> </build> - <repositories> - <repository> - <id>Sonatype OSS snapshots</id> - <url>https://oss.sonatype.org/content/repositories/snapshots/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-extensions/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-extensions/pom.xml b/wicket-extensions/pom.xml index c1a6fa2..f1e9553 100644 --- a/wicket-extensions/pom.xml +++ b/wicket-extensions/pom.xml @@ -29,15 +29,14 @@ <description>Wicket Extensions is a rich component library for the Wicket framework.</description> <dependencies> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.4.1.3</version> <optional>true</optional> </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> + </dependency> </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-guice/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-guice/pom.xml b/wicket-guice/pom.xml index 60f13d5..f09bc51 100644 --- a/wicket-guice/pom.xml +++ b/wicket-guice/pom.xml @@ -32,6 +32,10 @@ </description> <dependencies> <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> + <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> </dependency> @@ -39,10 +43,6 @@ <groupId>org.apache.wicket</groupId> <artifactId>wicket-ioc</artifactId> </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> </dependencies> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-ioc/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml index 7391f9b..3ca1e5c 100644 --- a/wicket-ioc/pom.xml +++ b/wicket-ioc/pom.xml @@ -32,23 +32,23 @@ </description> <dependencies> <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - </dependency> - <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-util</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-jmx/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-jmx/pom.xml b/wicket-jmx/pom.xml index c9b07d9..1617c69 100644 --- a/wicket-jmx/pom.xml +++ b/wicket-jmx/pom.xml @@ -29,17 +29,13 @@ <description>Wicket Java Management Extensions</description> <dependencies> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> - </dependency> - <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> </dependency> -<!-- <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-util</artifactId> - </dependency> --> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> + </dependency> </dependencies> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/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 329fdc0..32ed59e 100644 --- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml +++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml @@ -17,68 +17,75 @@ --> <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.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>wicket-native-websocket-javax</artifactId> <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> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </dependency> + <dependency> + <groupId>javax.websocket</groupId> + <artifactId>javax.websocket-api</artifactId> + </dependency> + <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> </dependency> - <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-native-websocket-core</artifactId> </dependency> - - <dependency> - <groupId>javax.websocket</groupId> - <artifactId>javax.websocket-api</artifactId> - <version>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> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> - </dependency> - </dependencies> - </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/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 index fb58dd2..65ed028 100644 --- a/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml +++ b/wicket-native-websocket/wicket-native-websocket-jetty/pom.xml @@ -27,19 +27,25 @@ <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.apache.wicket</groupId> - <artifactId>wicket-native-websocket-core</artifactId> - </dependency> - - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-websocket</artifactId> - <version>${jetty.version}</version> - <scope>provided</scope> </dependency> - + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-native-websocket-core</artifactId> + </dependency> </dependencies> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml b/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml index 8ccc025..8b1bbf1 100644 --- a/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml +++ b/wicket-native-websocket/wicket-native-websocket-jetty9/pom.xml @@ -27,19 +27,25 @@ <packaging>jar</packaging> <name>Wicket Native WebSocket Jetty 9</name> <description>Provides the code specific to integrate with Jetty 9 web container</description> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-server</artifactId> + <version>${jetty9.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-core</artifactId> - </dependency> - - <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-server</artifactId> - <version>${jetty9.version}</version> - <scope>provided</scope> </dependency> - + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-native-websocket-core</artifactId> + </dependency> </dependencies> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/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 ed5e690..9f00357 100644 --- a/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml +++ b/wicket-native-websocket/wicket-native-websocket-tomcat/pom.xml @@ -27,34 +27,39 @@ <packaging>jar</packaging> <name>Wicket Native WebSocket Tomcat 7.x</name> <description>Provides the code specific to integrate with Tomcat web container</description> - <properties> <tomcat.version>7.0.55</tomcat.version> </properties> - + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-catalina</artifactId> + <version>${tomcat.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-coyote</artifactId> + <version>${tomcat.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> - - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-core</artifactId> - </dependency> - <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-catalina</artifactId> - <version>${tomcat.version}</version> - <scope>provided</scope> </dependency> - <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-coyote</artifactId> - <version>${tomcat.version}</version> - <scope>provided</scope> </dependency> - + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-native-websocket-core</artifactId> + </dependency> </dependencies> - <build> <pluginManagement> <plugins> @@ -91,5 +96,4 @@ </plugins> </pluginManagement> </build> - </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-objectsizeof-agent/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-objectsizeof-agent/pom.xml b/wicket-objectsizeof-agent/pom.xml index edb47df..758f968 100644 --- a/wicket-objectsizeof-agent/pom.xml +++ b/wicket-objectsizeof-agent/pom.xml @@ -31,7 +31,6 @@ <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> - <version>${project.version}</version> </dependency> </dependencies> <build> @@ -39,15 +38,19 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> </plugin> </plugins> <pluginManagement> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin> <groupId>org.eclipse.m2e</groupId> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-spring/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-spring/pom.xml b/wicket-spring/pom.xml index 4a85d13..ff8f3f7 100644 --- a/wicket-spring/pom.xml +++ b/wicket-spring/pom.xml @@ -29,6 +29,11 @@ <description>Integration project to use Spring injection in your Wicket applications. See the wicket-spring-examples for integration patterns.</description> <dependencies> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> <version>${project.version}</version> @@ -37,11 +42,6 @@ <groupId>org.apache.wicket</groupId> <artifactId>wicket-ioc</artifactId> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <scope>provided</scope> - </dependency> </dependencies> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-util/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml index dcb531c..2c60bd3 100755 --- a/wicket-util/pom.xml +++ b/wicket-util/pom.xml @@ -27,19 +27,17 @@ <name>Wicket Util</name> <dependencies> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.3.1</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>provided</scope> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket-velocity/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-velocity/pom.xml b/wicket-velocity/pom.xml index e3d2642..52bc834 100644 --- a/wicket-velocity/pom.xml +++ b/wicket-velocity/pom.xml @@ -33,13 +33,12 @@ </description> <dependencies> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> - </dependency> - <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> - <version>1.7</version> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/wicket/blob/bf118fbf/wicket/pom.xml ---------------------------------------------------------------------- diff --git a/wicket/pom.xml b/wicket/pom.xml index 00169fa..9bc535f 100644 --- a/wicket/pom.xml +++ b/wicket/pom.xml @@ -35,7 +35,6 @@ <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> - <version>${project.parent.version}</version> </dependency> </dependencies> <build>
