Author: lindner
Date: Thu Jan 15 05:55:35 2009
New Revision: 734708
URL: http://svn.apache.org/viewvc?rev=734708&view=rev
Log:
SHINDIG-858 | Patch from Vincent Siveton | Moving
org.apache.shindig.common.testing package from common main to common test
Added:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/
(props changed)
- copied from r734637,
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/
Removed:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/
Modified:
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/social-api/pom.xml
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=734708&r1=734707&r2=734708&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Thu Jan 15 05:55:35 2009
@@ -57,6 +57,17 @@
<directory>conf</directory>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/apache/shindig/common/testing/*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
Propchange:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=734708&r1=734707&r2=734708&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Thu Jan 15 05:55:35 2009
@@ -66,9 +66,9 @@
<compilerArguments>
<!-- A common distribution of hamcrest library includes .java
files that are newer than the corresponding
.class files. Because sourcepath defaults to classpath, if we do
not set this, then we end up with some
- of hamcrest's classes in our jar. This is silly and not what we
want, so we explicitly set sourcepath
- to something that is not a directory. If you have a directory
on your machine that is called
- /not_a_directory and contains .java files that are newer than
.class files with a similar name that are
+ of hamcrest's classes in our jar. This is silly and not what we
want, so we explicitly set sourcepath
+ to something that is not a directory. If you have a directory
on your machine that is called
+ /not_a_directory and contains .java files that are newer than
.class files with a similar name that are
imported by our code, then you will probably experience trouble.
-->
<sourcepath>/not_a_directory</sourcepath>
</compilerArguments>
@@ -102,6 +102,12 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<!--
external dependencies
@@ -116,17 +122,14 @@
<dependency>
<groupId>caja</groupId>
<artifactId>caja</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>caja</groupId>
<artifactId>json_simple</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>net.oauth</groupId>
<artifactId>core</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.collections</groupId>
@@ -139,12 +142,6 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>rome</groupId>
@@ -153,7 +150,6 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
@@ -167,5 +163,12 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
+
+ <!-- test -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=734708&r1=734707&r2=734708&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Thu Jan 15 05:55:35 2009
@@ -59,6 +59,13 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<!-- external depenencies -->
<dependency>
<groupId>org.json</groupId>
@@ -73,11 +80,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
</dependency>
@@ -98,41 +100,47 @@
<groupId>commons-collections</groupId>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>net.oauth</groupId>
<artifactId>core</artifactId>
- <scope>compile</scope>
</dependency>
+ <!-- may only be needed for JDK < 1.6 -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
- <!-- may only be needed for JDK < 1.6 -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>findbugs</groupId>
+ <artifactId>annotations</artifactId>
</dependency>
<dependency>
- <groupId>findbugs</groupId>
- <artifactId>annotations</artifactId>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
</dependency>
<dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
</dependency>
+
+ <!-- test -->
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx</artifactId>
- <scope>test</scope>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
