Author: bdudney
Date: Thu Jul 27 16:21:02 2006
New Revision: 426319
URL: http://svn.apache.org/viewvc?rev=426319&view=rev
Log:
more maven changes, modeler and cayenne compile but tests fail
Added:
incubator/cayenne/main/trunk/cayenne/cayenne-java/modeler/src/test/java/org/apache/cayenne/modeler/
- copied from r426309,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/test/java/org/apache/cayenne/modeler/
Removed:
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/test/java/org/apache/cayenne/modeler/
Modified:
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/pom.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/modeler/pom.xml
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/pom.xml?rev=426319&r1=426318&r2=426319&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/pom.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/pom.xml Thu Jul
27 16:21:02 2006
@@ -154,6 +154,21 @@
</includes>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-test-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/modeler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/modeler/pom.xml?rev=426319&r1=426318&r2=426319&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/modeler/pom.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/modeler/pom.xml Thu Jul
27 16:21:02 2006
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>hessian</groupId>
<artifactId>hessian</artifactId>
</dependency>
@@ -137,11 +142,19 @@
</dependency>
<dependency>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne</artifactId>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
@@ -150,6 +163,11 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>mockrunner</groupId>
+ <artifactId>mockrunner</artifactId>
</dependency>
</dependencies>
