Author: aadamchik
Date: Fri Nov 15 19:19:39 2013
New Revision: 1542374
URL: http://svn.apache.org/r1542374
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
* moving cayenne-legal-unpublished to buildtools (that are unpublished by
definition)
Added:
cayenne/main/trunk/buildtools/cayenne-legal/
cayenne/main/trunk/buildtools/cayenne-legal/pom.xml
- copied, changed from r1542372,
cayenne/main/trunk/framework/cayenne-legal-unpublished/pom.xml
cayenne/main/trunk/buildtools/cayenne-legal/src/
cayenne/main/trunk/buildtools/cayenne-legal/src/main/
cayenne/main/trunk/buildtools/cayenne-legal/src/main/resources/
cayenne/main/trunk/buildtools/cayenne-legal/src/main/resources/META-INF/
cayenne/main/trunk/buildtools/cayenne-legal/src/main/resources/META-INF/cayenne/
cayenne/main/trunk/buildtools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt
- copied, changed from r1542372,
cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/LICENSE.txt
cayenne/main/trunk/buildtools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt
- copied, changed from r1542372,
cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt
Removed:
cayenne/main/trunk/framework/cayenne-legal-unpublished/
Modified:
cayenne/main/trunk/assembly/pom.xml
cayenne/main/trunk/buildtools/pom.xml
cayenne/main/trunk/framework/cayenne-client/pom.xml
cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml
cayenne/main/trunk/framework/cayenne-server/pom.xml
cayenne/main/trunk/framework/cayenne-tools/pom.xml
cayenne/main/trunk/framework/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler/pom.xml
Modified: cayenne/main/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/assembly/pom.xml?rev=1542374&r1=1542373&r2=1542374&view=diff
==============================================================================
--- cayenne/main/trunk/assembly/pom.xml (original)
+++ cayenne/main/trunk/assembly/pom.xml Fri Nov 15 19:19:39 2013
@@ -87,7 +87,7 @@
<configuration>
<outputDirectory>${project.build.directory}/legal</outputDirectory>
<resourceBundles>
-
<resourceBundle>org.apache.cayenne.unpublished:cayenne-legal-unpublished:${project.version}</resourceBundle>
+
<resourceBundle>org.apache.cayenne.buildtools:cayenne-legal:${project.version}</resourceBundle>
</resourceBundles>
</configuration>
</execution>
Copied: cayenne/main/trunk/buildtools/cayenne-legal/pom.xml (from r1542372,
cayenne/main/trunk/framework/cayenne-legal-unpublished/pom.xml)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/cayenne-legal/pom.xml?p2=cayenne/main/trunk/buildtools/cayenne-legal/pom.xml&p1=cayenne/main/trunk/framework/cayenne-legal-unpublished/pom.xml&r1=1542372&r2=1542374&rev=1542374&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-legal-unpublished/pom.xml (original)
+++ cayenne/main/trunk/buildtools/cayenne-legal/pom.xml Fri Nov 15 19:19:39 2013
@@ -22,14 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-parent</artifactId>
+ <groupId>org.apache.cayenne.buildtools</groupId>
+ <artifactId>build-tools-parent</artifactId>
<version>3.2M2-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <groupId>org.apache.cayenne.unpublished</groupId>
- <artifactId>cayenne-legal-unpublished</artifactId>
+ <artifactId>cayenne-legal</artifactId>
<name>Cayenne License and Notice Bundle</name>
<description>Cayenne License and Notice Bundle</description>
<packaging>jar</packaging>
@@ -80,13 +78,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Copied:
cayenne/main/trunk/buildtools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt
(from r1542372,
cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/LICENSE.txt)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt?p2=cayenne/main/trunk/buildtools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt&p1=cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/LICENSE.txt&r1=1542372&r2=1542374&rev=1542374&view=diff
==============================================================================
(empty)
Copied:
cayenne/main/trunk/buildtools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt
(from r1542372,
cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt?p2=cayenne/main/trunk/buildtools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt&p1=cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt&r1=1542372&r2=1542374&rev=1542374&view=diff
==============================================================================
(empty)
Modified: cayenne/main/trunk/buildtools/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/pom.xml?rev=1542374&r1=1542373&r2=1542374&view=diff
==============================================================================
--- cayenne/main/trunk/buildtools/pom.xml (original)
+++ cayenne/main/trunk/buildtools/pom.xml Fri Nov 15 19:19:39 2013
@@ -34,6 +34,7 @@
<modules>
<module>cayenne-build-maven-plugin</module>
+ <module>cayenne-legal</module>
<module>cayenne-test-utilities</module>
</modules>
Modified: cayenne/main/trunk/framework/cayenne-client/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-client/pom.xml?rev=1542374&r1=1542373&r2=1542374&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-client/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-client/pom.xml Fri Nov 15 19:19:39 2013
@@ -43,8 +43,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.cayenne.unpublished</groupId>
- <artifactId>cayenne-legal-unpublished</artifactId>
+ <groupId>org.apache.cayenne.buildtools</groupId>
+ <artifactId>cayenne-legal</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -89,8 +89,8 @@
<version>${project.version}</version>
</artifactItem>
<artifactItem>
-
<groupId>org.apache.cayenne.unpublished</groupId>
-
<artifactId>cayenne-legal-unpublished</artifactId>
+
<groupId>org.apache.cayenne.buildtools</groupId>
+
<artifactId>cayenne-legal</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
Modified: cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml?rev=1542374&r1=1542373&r2=1542374&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml Fri Nov 15 19:19:39
2013
@@ -55,8 +55,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.cayenne.unpublished</groupId>
- <artifactId>cayenne-legal-unpublished</artifactId>
+ <groupId>org.apache.cayenne.buildtools</groupId>
+ <artifactId>cayenne-legal</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -96,7 +96,7 @@
</outputDirectory>
<resourceBundles>
<resourceBundle>
-
org.apache.cayenne.unpublished:cayenne-legal-unpublished:${project.version}
+
org.apache.cayenne.buildtools:cayenne-legal:${project.version}
</resourceBundle>
</resourceBundles>
</configuration>
Modified: cayenne/main/trunk/framework/cayenne-server/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-server/pom.xml?rev=1542374&r1=1542373&r2=1542374&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-server/pom.xml Fri Nov 15 19:19:39 2013
@@ -43,8 +43,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.cayenne.unpublished</groupId>
- <artifactId>cayenne-legal-unpublished</artifactId>
+ <groupId>org.apache.cayenne.buildtools</groupId>
+ <artifactId>cayenne-legal</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -87,8 +87,8 @@
<version>${project.version}</version>
</artifactItem>
<artifactItem>
-
<groupId>org.apache.cayenne.unpublished</groupId>
-
<artifactId>cayenne-legal-unpublished</artifactId>
+
<groupId>org.apache.cayenne.buildtools</groupId>
+
<artifactId>cayenne-legal</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
Modified: cayenne/main/trunk/framework/cayenne-tools/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/pom.xml?rev=1542374&r1=1542373&r2=1542374&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-tools/pom.xml Fri Nov 15 19:19:39 2013
@@ -76,8 +76,8 @@
</dependency>
<dependency>
- <groupId>org.apache.cayenne.unpublished</groupId>
- <artifactId>cayenne-legal-unpublished</artifactId>
+ <groupId>org.apache.cayenne.buildtools</groupId>
+ <artifactId>cayenne-legal</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -123,7 +123,7 @@
</outputDirectory>
<resourceBundles>
<resourceBundle>
-
org.apache.cayenne.unpublished:cayenne-legal-unpublished:${project.version}
+
org.apache.cayenne.buildtools:cayenne-legal:${project.version}
</resourceBundle>
</resourceBundles>
</configuration>
Modified: cayenne/main/trunk/framework/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/pom.xml?rev=1542374&r1=1542373&r2=1542374&view=diff
==============================================================================
--- cayenne/main/trunk/framework/pom.xml (original)
+++ cayenne/main/trunk/framework/pom.xml Fri Nov 15 19:19:39 2013
@@ -30,7 +30,6 @@
<packaging>pom</packaging>
<modules>
- <module>cayenne-legal-unpublished</module>
<module>cayenne-di-unpublished</module>
<module>cayenne-core-unpublished</module>
<module>cayenne-wocompat-unpublished</module>
Modified: cayenne/main/trunk/modeler/cayenne-modeler/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/pom.xml?rev=1542374&r1=1542373&r2=1542374&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/pom.xml Fri Nov 15 19:19:39 2013
@@ -70,8 +70,8 @@
</dependency>
<dependency>
- <groupId>org.apache.cayenne.unpublished</groupId>
- <artifactId>cayenne-legal-unpublished</artifactId>
+ <groupId>org.apache.cayenne.buildtools</groupId>
+ <artifactId>cayenne-legal</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -139,7 +139,7 @@
</outputDirectory>
<resourceBundles>
<resourceBundle>
-
org.apache.cayenne.unpublished:cayenne-legal-unpublished:${project.version}
+
org.apache.cayenne.buildtools:cayenne-legal:${project.version}
</resourceBundle>
</resourceBundles>
</configuration>
