Author: aadamchik
Date: Sun Nov 17 10:01:14 2013
New Revision: 1542684
URL: http://svn.apache.org/r1542684
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
pom cleanup
Modified:
cayenne/main/trunk/cayenne-lifecycle/pom.xml
cayenne/main/trunk/cayenne-tools/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler/pom.xml
Modified: cayenne/main/trunk/cayenne-lifecycle/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-lifecycle/pom.xml?rev=1542684&r1=1542683&r2=1542684&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-lifecycle/pom.xml (original)
+++ cayenne/main/trunk/cayenne-lifecycle/pom.xml Sun Nov 17 10:01:14 2013
@@ -49,16 +49,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.cayenne.buildtools</groupId>
- <artifactId>cayenne-legal</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: cayenne/main/trunk/cayenne-tools/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-tools/pom.xml?rev=1542684&r1=1542683&r2=1542684&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-tools/pom.xml (original)
+++ cayenne/main/trunk/cayenne-tools/pom.xml Sun Nov 17 10:01:14 2013
@@ -73,14 +73,7 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cayenne.buildtools</groupId>
- <artifactId>cayenne-legal</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
Modified: cayenne/main/trunk/modeler/cayenne-modeler/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/pom.xml?rev=1542684&r1=1542683&r2=1542684&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/pom.xml Sun Nov 17 10:01:14 2013
@@ -1,14 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
+<!--
+ 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.
+-->
<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";>
@@ -63,17 +71,9 @@
</dependency>
<dependency>
- <groupId>org.apache.cayenne.buildtools</groupId>
- <artifactId>cayenne-legal</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
