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 2006/09/29 17:59:29 UTC

svn commit: r451331 - in /incubator/cayenne/main/trunk/assembly: cayenne-generic/pom.xml cayenne-osx/pom.xml cayenne-win/pom.xml

Author: aadamchik
Date: Fri Sep 29 08:59:28 2006
New Revision: 451331

URL: http://svn.apache.org/viewvc?view=rev&rev=451331
Log:
removing unused (at this point) dependency on JPA

Modified:
    incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
    incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml
    incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml

Modified: incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml?view=diff&rev=451331&r1=451330&r2=451331
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml Fri Sep 29 08:59:28 2006
@@ -1,251 +1,247 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2006 The Apache Software Foundation
-
-    Licensed 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.
+	Copyright 2006 The Apache Software Foundation
+	
+	Licensed 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.
 -->
-<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.cayenne.assembly</groupId>
-    <artifactId>cayenne-assembly-parent</artifactId>
-    <version>3.0-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>cayenne-assembly-generic</artifactId>
-  <packaging>jar</packaging>
-  <name>Cayenne :: Generic Assembly</name>
-
-  <description>
-    An assembly of Cayenne into a genericly runnable package.
-  </description>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.apache.cayenne.core</groupId>
-      <artifactId>cayenne-jdk1.4</artifactId>
-      <version>${version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.cayenne.core</groupId>
-      <artifactId>cayenne-jdk1.5</artifactId>
-      <version>${version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.cayenne.core</groupId>
-      <artifactId>cayenne-jpa</artifactId>
-      <version>${version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.cayenne.modeler</groupId>
-      <artifactId>cayenne-modeler</artifactId>
-      <version>${version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>velocity</groupId>
-      <artifactId>velocity</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.objectstyle.ashwood</groupId>
-      <artifactId>ashwood</artifactId>
-    </dependency>
-
-    <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>
-      <groupId>jgoodies</groupId>
-      <artifactId>forms</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>jgoodies</groupId>
-      <artifactId>looks</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ognl</groupId>
-      <artifactId>ognl</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.scopemvc</groupId>
-      <artifactId>scopemvc</artifactId>
-    </dependency>
-
-  </dependencies>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>dependency-maven-plugin</artifactId>
-	<executions>
-	  <execution>
-	    <id>copy-javadoc</id>
-	    <phase>package</phase>
-	    <goals>
-	      <goal>copy</goal>
-	    </goals>
-            <configuration>
-              <artifactItems>
-
-                <artifactItem>
-                  <groupId>org.apache.cayenne.core</groupId>
-                  <artifactId>cayenne-jdk1.4</artifactId>
-                  <version>${version}</version>
-                  <classifier>javadoc</classifier>
-                </artifactItem>
-
-                <artifactItem>
-                  <groupId>org.apache.cayenne.core</groupId>
-                  <artifactId>cayenne-jdk1.5</artifactId>
-                  <version>${version}</version>
-                  <classifier>javadoc</classifier>
-                </artifactItem>
-
-                <artifactItem>
-                  <groupId>org.apache.cayenne.core</groupId>
-                  <artifactId>cayenne-jpa</artifactId>
-                  <version>${version}</version>
-                  <classifier>javadoc</classifier>
-                </artifactItem>
-
-              </artifactItems>
-	      <outputDirectory>${project.build.directory}/doc/javadoc</outputDirectory>
-            </configuration>
-	  </execution>
-
-	  <execution>
-	    <id>copy-source</id>
-	    <phase>package</phase>
-	    <goals>
-	      <goal>copy</goal>
-	    </goals>
-            <configuration>
-              <artifactItems>
-
-                <artifactItem>
-                  <groupId>org.apache.cayenne.core</groupId>
-                  <artifactId>cayenne-jdk1.4</artifactId>
-                  <version>${version}</version>
-                  <classifier>sources</classifier>
-                </artifactItem>
-
-                <artifactItem>
-                  <groupId>org.apache.cayenne.core</groupId>
-                  <artifactId>cayenne-jdk1.5</artifactId>
-                  <version>${version}</version>
-                  <classifier>sources</classifier>
-                </artifactItem>
-
-                <artifactItem>
-                  <groupId>org.apache.cayenne.core</groupId>
-                  <artifactId>cayenne-jpa</artifactId>
-                  <version>${version}</version>
-                  <classifier>sources</classifier>
-                </artifactItem>
-
-              </artifactItems>
-	      <outputDirectory>${project.build.directory}/src</outputDirectory>
-            </configuration>
-	  </execution>
-
-	  <execution>
-	    <id>copy-bin</id>
-	    <phase>package</phase>
-	    <goals>
-	      <goal>unpack</goal>
-	    </goals>
-            <configuration>
-              <artifactItems>
-
-                <artifactItem>
-                  <groupId>org.apache.cayenne.modeler</groupId>
-                  <artifactId>cayenne-modeler</artifactId>
-                  <version>${version}</version>
-                </artifactItem>
-
-              </artifactItems>
-
-	      <outputDirectory>${project.build.directory}/modeler</outputDirectory>
-            </configuration>
-	  </execution>
-
-	</executions>
-      </plugin>
-
-      <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-	<artifactId>maven-assembly-plugin</artifactId>
-	<executions>
-          <execution>
-            <id>bin</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attached</goal>
-            </goals>
-	    <configuration>
-	      <descriptors>
-		<descriptor>${pom.basedir}/src/main/assembly/main.xml</descriptor>
-	      </descriptors>
-	      <finalName>cayenne-generic-${version}</finalName>
-	      <outputDirectory>${project.build.directory}/assembly/out</outputDirectory>
-	      <workDirectory>${project.build.directory}/assembly/work</workDirectory>
-	    </configuration>
-          </execution>
-	</executions>
-      </plugin>
-    </plugins>
-  </build>
+<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.cayenne.assembly</groupId>
+		<artifactId>cayenne-assembly-parent</artifactId>
+		<version>3.0-incubating-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>cayenne-assembly-generic</artifactId>
+	<packaging>jar</packaging>
+	<name>Cayenne :: Generic Assembly</name>
+
+	<description>An assembly of Cayenne into a genericly runnable package.</description>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.apache.cayenne.core</groupId>
+			<artifactId>cayenne-jdk1.4</artifactId>
+			<version>${version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.cayenne.core</groupId>
+			<artifactId>cayenne-jdk1.5</artifactId>
+			<version>${version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.cayenne.modeler</groupId>
+			<artifactId>cayenne-modeler</artifactId>
+			<version>${version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>velocity</groupId>
+			<artifactId>velocity</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.objectstyle.ashwood</groupId>
+			<artifactId>ashwood</artifactId>
+		</dependency>
+
+		<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>
+			<groupId>jgoodies</groupId>
+			<artifactId>forms</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>jgoodies</groupId>
+			<artifactId>looks</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>ognl</groupId>
+			<artifactId>ognl</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.scopemvc</groupId>
+			<artifactId>scopemvc</artifactId>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>dependency-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-javadoc</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+
+								<artifactItem>
+									<groupId>org.apache.cayenne.core</groupId>
+									<artifactId>cayenne-jdk1.4</artifactId>
+									<version>${version}</version>
+									<classifier>javadoc</classifier>
+								</artifactItem>
+
+								<artifactItem>
+									<groupId>org.apache.cayenne.core</groupId>
+									<artifactId>cayenne-jdk1.5</artifactId>
+									<version>${version}</version>
+									<classifier>javadoc</classifier>
+								</artifactItem>
+
+								<artifactItem>
+									<groupId>org.apache.cayenne.core</groupId>
+									<artifactId>cayenne-jpa</artifactId>
+									<version>${version}</version>
+									<classifier>javadoc</classifier>
+								</artifactItem>
+
+							</artifactItems>
+							<outputDirectory>
+								${project.build.directory}/doc/javadoc
+							</outputDirectory>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>copy-source</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+
+								<artifactItem>
+									<groupId>org.apache.cayenne.core</groupId>
+									<artifactId>cayenne-jdk1.4</artifactId>
+									<version>${version}</version>
+									<classifier>sources</classifier>
+								</artifactItem>
+
+								<artifactItem>
+									<groupId>org.apache.cayenne.core</groupId>
+									<artifactId>cayenne-jdk1.5</artifactId>
+									<version>${version}</version>
+									<classifier>sources</classifier>
+								</artifactItem>
+
+								<artifactItem>
+									<groupId>org.apache.cayenne.core</groupId>
+									<artifactId>cayenne-jpa</artifactId>
+									<version>${version}</version>
+									<classifier>sources</classifier>
+								</artifactItem>
+
+							</artifactItems>
+							<outputDirectory>${project.build.directory}/src</outputDirectory>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>copy-bin</id>
+						<phase>package</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+
+								<artifactItem>
+									<groupId>org.apache.cayenne.modeler</groupId>
+									<artifactId>cayenne-modeler</artifactId>
+									<version>${version}</version>
+								</artifactItem>
+
+							</artifactItems>
+
+							<outputDirectory>${project.build.directory}/modeler</outputDirectory>
+						</configuration>
+					</execution>
+
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>bin</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attached</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>${pom.basedir}/src/main/assembly/main.xml</descriptor>
+							</descriptors>
+							<finalName>cayenne-generic-${version}</finalName>
+							<outputDirectory>
+								${project.build.directory}/assembly/out
+							</outputDirectory>
+							<workDirectory>${project.build.directory}/assembly/work</workDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 
 </project>

Modified: incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml?view=diff&rev=451331&r1=451330&r2=451331
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml Fri Sep 29 08:59:28 2006
@@ -51,12 +51,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.cayenne.core</groupId>
-      <artifactId>cayenne-jpa</artifactId>
-      <version>${version}</version>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.cayenne.modeler</groupId>
       <artifactId>cayenne-modeler</artifactId>
       <version>${version}</version>

Modified: incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml?view=diff&rev=451331&r1=451330&r2=451331
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml Fri Sep 29 08:59:28 2006
@@ -51,12 +51,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.cayenne.core</groupId>
-      <artifactId>cayenne-jpa</artifactId>
-      <version>${version}</version>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.cayenne.modeler</groupId>
       <artifactId>cayenne-modeler</artifactId>
       <version>${version}</version>