You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/12/19 11:46:37 UTC
svn commit: r1220682 - in /wicket/branches/wicket-1.5.x: ./
wicket-core/src/test/java/org/apache/wicket/page/
wicket-core/src/test/java/org/apache/wicket/protocol/http/
wicket-objectssizeof-agent/ wicket-util/src/test/java/org/apache/wicket/util/
Author: mgrigorov
Date: Mon Dec 19 10:46:36 2011
New Revision: 1220682
URL: http://svn.apache.org/viewvc?rev=1220682&view=rev
Log:
WICKET-4281
Simplify Maven build for development
Added:
wicket/branches/wicket-1.5.x/wicket-util/src/test/java/org/apache/wicket/util/SlowTests.java
Modified:
wicket/branches/wicket-1.5.x/pom.xml
wicket/branches/wicket-1.5.x/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java
wicket/branches/wicket-1.5.x/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java
wicket/branches/wicket-1.5.x/wicket-objectssizeof-agent/pom.xml
Modified: wicket/branches/wicket-1.5.x/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/pom.xml?rev=1220682&r1=1220681&r2=1220682&view=diff
==============================================================================
--- wicket/branches/wicket-1.5.x/pom.xml (original)
+++ wicket/branches/wicket-1.5.x/pom.xml Mon Dec 19 10:46:36 2011
@@ -33,55 +33,43 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>7.4.2.v20110526</jetty.version>
<spring.version>3.0.5.RELEASE</spring.version>
+ <maven.javadoc.version>2.8</maven.javadoc.version>
+ <maven.surefire.version>2.11</maven.surefire.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-spring</module>
+ <module>wicket-velocity</module>
+ <module>wicket-auth-roles</module>
+ <module>wicket-guice</module>
+ <module>wicket-jmx</module>
+ <module>wicket-objectssizeof-agent</module>
+ <module>wicket-examples</module>
+ <module>archetypes/quickstart</module>
+ </modules>
+
<profiles>
<profile>
<id>release</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <!--
- modules parent and parent are defined not to process their
- submodules: their release profile is empty. This way we can
- define which projects to release with a Wicket release from
- the parent.
- -->
- <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-spring</module>
- <module>wicket-velocity</module>
- <module>wicket-auth-roles</module>
- <module>wicket-guice</module>
- <module>wicket-jmx</module>
- <module>wicket-objectssizeof-agent</module>
- <module>wicket-examples</module>
- <module>archetypes/quickstart</module>
- </modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<inherited>true</inherited>
@@ -89,21 +77,6 @@
<aggregate>true</aggregate>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
</plugins>
</build>
@@ -119,58 +92,15 @@
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <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-spring</module>
- <module>wicket-velocity</module>
- <module>wicket-auth-roles</module>
- <module>wicket-guice</module>
- <module>wicket-jmx</module>
- <module>wicket-objectssizeof-agent</module>
- <module>wicket-examples</module>
- <module>archetypes/quickstart</module>
- </modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<inherited>true</inherited>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
</plugins>
</build>
-
<!-- distribution management is inherited from the parent pom -->
</profile>
<profile>
@@ -179,28 +109,38 @@
<activeByDefault>true</activeByDefault>
</activation>
<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-spring</module>
- <module>wicket-velocity</module>
- <module>wicket-auth-roles</module>
- <module>wicket-guice</module>
- <module>wicket-jmx</module>
- <module>wicket-objectssizeof-agent</module>
- <module>wicket-examples</module>
- <module>archetypes/quickstart</module>
<module>testing/wicket-threadtest</module>
</modules>
-
-
<!-- distribution management is inherited from the parent pom -->
</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>
</profiles>
<url>http://wicket.apache.org/${project.artifactId}</url>
<inceptionYear>2006</inceptionYear>
@@ -553,11 +493,25 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<version>2.3</version>
<configuration>
- <comparisonVersion>1.5.2</comparisonVersion>
+ <comparisonVersion>1.5.3</comparisonVersion>
<failOnError>false</failOnError>
<logResults>true</logResults>
</configuration>
@@ -574,11 +528,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
</plugin>
@@ -597,6 +546,12 @@
<artifactId>maven-bundle-plugin</artifactId>
<inherited>true</inherited>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
+ <inherited>true</inherited>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -699,7 +654,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>${maven.javadoc.version}</version>
<configuration>
<minmemory>128m</minmemory>
<maxmemory>256m</maxmemory>
@@ -740,17 +695,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
+ <version>${maven.surefire.version}</version>
<configuration>
<includes>
<include>**/*Test.java</include>
</includes>
</configuration>
+ <dependencies>
+ <dependency> <!-- force 4.7 runner to enable excludedGroups on Categories (& parallel) -->
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${maven.surefire.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.6</version>
+ <version>${maven.surefire.version}</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -832,7 +794,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>${maven.javadoc.version}</version>
</plugin>
</plugins>
</reporting>
Modified: wicket/branches/wicket-1.5.x/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java?rev=1220682&r1=1220681&r2=1220682&view=diff
==============================================================================
--- wicket/branches/wicket-1.5.x/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java (original)
+++ wicket/branches/wicket-1.5.x/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java Mon Dec 19 10:46:36 2011
@@ -23,12 +23,14 @@ import java.util.concurrent.atomic.Atomi
import org.apache.wicket.MockPage;
import org.apache.wicket.mock.MockPageManager;
import org.apache.wicket.page.PageAccessSynchronizer.PageLock;
+import org.apache.wicket.util.SlowTests;
import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.rules.MethodRule;
import org.junit.rules.Timeout;
import org.slf4j.Logger;
@@ -36,6 +38,7 @@ import org.slf4j.LoggerFactory;
/**
*/
+@Category(SlowTests.class)
public class PageAccessSynchronizerTest extends Assert
{
private static final Logger logger = LoggerFactory.getLogger(PageAccessSynchronizerTest.class);
Modified: wicket/branches/wicket-1.5.x/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java?rev=1220682&r1=1220681&r2=1220682&view=diff
==============================================================================
--- wicket/branches/wicket-1.5.x/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java (original)
+++ wicket/branches/wicket-1.5.x/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java Mon Dec 19 10:46:36 2011
@@ -22,6 +22,7 @@ import java.util.concurrent.CopyOnWriteA
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.wicket.util.SlowTests;
import org.apache.wicket.util.time.Duration;
import org.junit.Assert;
import org.junit.Ignore;
@@ -31,6 +32,7 @@ import org.junit.experimental.categories
/**
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3209">WICKET-3209</a>
*/
+@Category(SlowTests.class)
public class StoredResponsesMapTest extends Assert
{
/**
@@ -92,7 +94,6 @@ public class StoredResponsesMapTest exte
* @throws InterruptedException
*/
@Test
- @Ignore
public void heavyLoad() throws InterruptedException
{
final int numberOfThreads = 100;
Modified: wicket/branches/wicket-1.5.x/wicket-objectssizeof-agent/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-objectssizeof-agent/pom.xml?rev=1220682&r1=1220681&r2=1220682&view=diff
==============================================================================
--- wicket/branches/wicket-1.5.x/wicket-objectssizeof-agent/pom.xml (original)
+++ wicket/branches/wicket-1.5.x/wicket-objectssizeof-agent/pom.xml Mon Dec 19 10:46:36 2011
@@ -37,6 +37,13 @@
<artifactId>wicket-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
Added: wicket/branches/wicket-1.5.x/wicket-util/src/test/java/org/apache/wicket/util/SlowTests.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-util/src/test/java/org/apache/wicket/util/SlowTests.java?rev=1220682&view=auto
==============================================================================
--- wicket/branches/wicket-1.5.x/wicket-util/src/test/java/org/apache/wicket/util/SlowTests.java (added)
+++ wicket/branches/wicket-1.5.x/wicket-util/src/test/java/org/apache/wicket/util/SlowTests.java Mon Dec 19 10:46:36 2011
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.util;
+
+/**
+ * JUnit Category marker.
+ * Used to mark slow running tests which are not executed with Maven profile 'fast'
+ */
+public interface SlowTests {
+
+}