Author: aadamchik
Date: Fri Nov 15 19:17:11 2013
New Revision: 1542372
URL: http://svn.apache.org/r1542372
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
* renaming maven-cayenne-build-plugin to cayenne-build-maven-plugin to follow
modern maven conventions
Added:
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/pom.xml
- copied, changed from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/pom.xml
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/AbstractAggregatorMojo.java
- copied, changed from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/AbstractAggregatorMojo.java
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/ArtifactItem.java
- copied, changed from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/ArtifactItem.java
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java
- copied, changed from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/SourcesAggregatorMojo.java
- copied, changed from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/SourcesAggregatorMojo.java
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/DateMojo.java
- copied, changed from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/DateMojo.java
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/util/
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/util/PatternGroup.java
- copied, changed from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/util/PatternGroup.java
Removed:
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/
Modified:
cayenne/main/trunk/buildtools/pom.xml
cayenne/main/trunk/docs/doc/pom.xml
cayenne/main/trunk/framework/cayenne-client/pom.xml
cayenne/main/trunk/framework/cayenne-core-unpublished/pom.xml
cayenne/main/trunk/framework/cayenne-di-unpublished/pom.xml
cayenne/main/trunk/framework/cayenne-legal-unpublished/pom.xml
cayenne/main/trunk/framework/cayenne-server/pom.xml
cayenne/main/trunk/pom.xml
Copied: cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/pom.xml (from
r1542371, cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/pom.xml)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/pom.xml?p2=cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/pom.xml&p1=cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/pom.xml&r1=1542371&r2=1542372&rev=1542372&view=diff
==============================================================================
--- cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/pom.xml (original)
+++ cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/pom.xml Fri Nov 15
19:17:11 2013
@@ -27,7 +27,7 @@
<version>3.2M2-SNAPSHOT</version>
</parent>
- <artifactId>maven-cayenne-build-plugin</artifactId>
+ <artifactId>cayenne-build-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Cayenne Internal Build Plugin</name>
Copied:
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/AbstractAggregatorMojo.java
(from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/AbstractAggregatorMojo.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/AbstractAggregatorMojo.java?p2=cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/AbstractAggregatorMojo.java&p1=cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/AbstractAggregatorMojo.java&r1=1542371&r2=1542372&rev=1542372&view=diff
==============================================================================
(empty)
Copied:
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/ArtifactItem.java
(from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/ArtifactItem.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/ArtifactItem.java?p2=cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/ArtifactItem.java&p1=cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/ArtifactItem.java&r1=1542371&r2=1542372&rev=1542372&view=diff
==============================================================================
(empty)
Copied:
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java
(from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java?p2=cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java&p1=cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/BinAggregatorMojo.java&r1=1542371&r2=1542372&rev=1542372&view=diff
==============================================================================
(empty)
Copied:
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/SourcesAggregatorMojo.java
(from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/SourcesAggregatorMojo.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/SourcesAggregatorMojo.java?p2=cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/SourcesAggregatorMojo.java&p1=cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/aggregator/SourcesAggregatorMojo.java&r1=1542371&r2=1542372&rev=1542372&view=diff
==============================================================================
(empty)
Copied:
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/DateMojo.java
(from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/DateMojo.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/DateMojo.java?p2=cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/DateMojo.java&p1=cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/DateMojo.java&r1=1542371&r2=1542372&rev=1542372&view=diff
==============================================================================
(empty)
Copied:
cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/util/PatternGroup.java
(from r1542371,
cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/util/PatternGroup.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/util/PatternGroup.java?p2=cayenne/main/trunk/buildtools/cayenne-build-maven-plugin/src/main/java/org/apache/cayenne/maven/plugin/util/PatternGroup.java&p1=cayenne/main/trunk/buildtools/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/util/PatternGroup.java&r1=1542371&r2=1542372&rev=1542372&view=diff
==============================================================================
(empty)
Modified: cayenne/main/trunk/buildtools/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/pom.xml?rev=1542372&r1=1542371&r2=1542372&view=diff
==============================================================================
--- cayenne/main/trunk/buildtools/pom.xml (original)
+++ cayenne/main/trunk/buildtools/pom.xml Fri Nov 15 19:17:11 2013
@@ -33,8 +33,8 @@
<packaging>pom</packaging>
<modules>
+ <module>cayenne-build-maven-plugin</module>
<module>cayenne-test-utilities</module>
- <module>maven-cayenne-build-plugin</module>
</modules>
<build>
Modified: cayenne/main/trunk/docs/doc/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/pom.xml?rev=1542372&r1=1542371&r2=1542372&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/pom.xml (original)
+++ cayenne/main/trunk/docs/doc/pom.xml Fri Nov 15 19:17:11 2013
@@ -200,7 +200,7 @@
</plugin>
<plugin>
<groupId>org.apache.cayenne.buildtools</groupId>
-
<artifactId>maven-cayenne-build-plugin</artifactId>
+
<artifactId>cayenne-build-maven-plugin</artifactId>
<executions>
<execution>
<id>date</id>
Modified: cayenne/main/trunk/framework/cayenne-client/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-client/pom.xml?rev=1542372&r1=1542371&r2=1542372&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-client/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-client/pom.xml Fri Nov 15 19:17:11 2013
@@ -66,7 +66,7 @@
<plugins>
<plugin>
<groupId>org.apache.cayenne.buildtools</groupId>
-
<artifactId>maven-cayenne-build-plugin</artifactId>
+
<artifactId>cayenne-build-maven-plugin</artifactId>
<executions>
<execution>
<id>aggregate-all</id>
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/pom.xml?rev=1542372&r1=1542371&r2=1542372&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/pom.xml Fri Nov 15
19:17:11 2013
@@ -199,7 +199,7 @@
</plugin>
<plugin>
<groupId>org.apache.cayenne.buildtools</groupId>
-
<artifactId>maven-cayenne-build-plugin</artifactId>
+
<artifactId>cayenne-build-maven-plugin</artifactId>
<executions>
<execution>
<id>date</id>
Modified: cayenne/main/trunk/framework/cayenne-di-unpublished/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-di-unpublished/pom.xml?rev=1542372&r1=1542371&r2=1542372&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-di-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-di-unpublished/pom.xml Fri Nov 15
19:17:11 2013
@@ -59,7 +59,7 @@
</plugin>
<plugin>
<groupId>org.apache.cayenne.buildtools</groupId>
-
<artifactId>maven-cayenne-build-plugin</artifactId>
+
<artifactId>cayenne-build-maven-plugin</artifactId>
<executions>
<execution>
<id>date</id>
Modified: cayenne/main/trunk/framework/cayenne-legal-unpublished/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-legal-unpublished/pom.xml?rev=1542372&r1=1542371&r2=1542372&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-legal-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-legal-unpublished/pom.xml Fri Nov 15
19:17:11 2013
@@ -46,7 +46,7 @@
<plugins>
<plugin>
<groupId>org.apache.cayenne.buildtools</groupId>
-
<artifactId>maven-cayenne-build-plugin</artifactId>
+
<artifactId>cayenne-build-maven-plugin</artifactId>
<executions>
<execution>
<id>date</id>
Modified: cayenne/main/trunk/framework/cayenne-server/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-server/pom.xml?rev=1542372&r1=1542371&r2=1542372&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-server/pom.xml Fri Nov 15 19:17:11 2013
@@ -65,7 +65,7 @@
<plugins>
<plugin>
<groupId>org.apache.cayenne.buildtools</groupId>
-
<artifactId>maven-cayenne-build-plugin</artifactId>
+
<artifactId>cayenne-build-maven-plugin</artifactId>
<executions>
<execution>
<id>aggregate-all</id>
Modified: cayenne/main/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1542372&r1=1542371&r2=1542372&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Fri Nov 15 19:17:11 2013
@@ -523,7 +523,7 @@
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.cayenne.buildtools</groupId>
-
<artifactId>maven-cayenne-build-plugin</artifactId>
+
<artifactId>cayenne-build-maven-plugin</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
<goal>date</goal>
@@ -578,7 +578,7 @@
</plugin>
<plugin>
<groupId>org.apache.cayenne.build-tools</groupId>
-
<artifactId>maven-cayenne-build-plugin</artifactId>
+
<artifactId>cayenne-build-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
<plugin>
