You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/02/27 15:12:10 UTC
svn commit: r512261 - in /cayenne/main/trunk:
framework/cayenne-modeler/pom.xml modeler/cayenne-modeler-java/pom.xml
modeler/cayenne-modeler-mac/pom.xml modeler/cayenne-modeler-win/pom.xml
Author: aadamchik
Date: Tue Feb 27 06:12:06 2007
New Revision: 512261
URL: http://svn.apache.org/viewvc?view=rev&rev=512261
Log:
CAY-759 Maven 2.0.5 builds junk in Cayenne Modeler. The fix was mostly on WOProject side, but I had to clean the poms as well
Modified:
cayenne/main/trunk/framework/cayenne-modeler/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml
Modified: cayenne/main/trunk/framework/cayenne-modeler/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/pom.xml?view=diff&rev=512261&r1=512260&r2=512261
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/pom.xml Tue Feb 27 06:12:06 2007
@@ -57,11 +57,13 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
Modified: cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml?view=diff&rev=512261&r1=512260&r2=512261
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml Tue Feb 27 06:12:06 2007
@@ -7,9 +7,9 @@
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
-
+
+ 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
@@ -38,6 +38,23 @@
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-modeler</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <!--
+ adding cayenne runtime dependencies explicitly,
+ as they are marked as "provided" in the modeler pom
+ and won't be included in the jar
+ -->
+ <dependency>
+ <groupId>org.apache.cayenne.unpublished</groupId>
+ <artifactId>cayenne-jdk1.4-unpublished</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.unpublished</groupId>
+ <artifactId>cayenne-jdk1.5-unpublished</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
Modified: cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml?view=diff&rev=512261&r1=512260&r2=512261
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml Tue Feb 27 06:12:06 2007
@@ -45,6 +45,23 @@
<artifactId>cayenne-modeler-mac-ext</artifactId>
<version>${version}</version>
</dependency>
+
+ <!--
+ adding cayenne runtime dependencies explicitly,
+ as they are marked as "provided" in the modeler pom
+ and won't be included in the jar
+ -->
+ <dependency>
+ <groupId>org.apache.cayenne.unpublished</groupId>
+ <artifactId>cayenne-jdk1.4-unpublished</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.unpublished</groupId>
+ <artifactId>cayenne-jdk1.5-unpublished</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
<build>
Modified: cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml?view=diff&rev=512261&r1=512260&r2=512261
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml Tue Feb 27 06:12:06 2007
@@ -40,6 +40,23 @@
<artifactId>cayenne-modeler</artifactId>
<version>${version}</version>
</dependency>
+
+ <!--
+ adding cayenne runtime dependencies explicitly,
+ as they are marked as "provided" in the modeler pom
+ and won't be included in the jar
+ -->
+ <dependency>
+ <groupId>org.apache.cayenne.unpublished</groupId>
+ <artifactId>cayenne-jdk1.4-unpublished</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.unpublished</groupId>
+ <artifactId>cayenne-jdk1.5-unpublished</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
<build>