Author: aadamchik
Date: Sat Nov 16 08:28:07 2013
New Revision: 1542481
URL: http://svn.apache.org/r1542481
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
* extracting plugins dep version management to the parent pom
Modified:
cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/pom.xml
cayenne/main/trunk/plugins/maven-cayenne-plugin/pom.xml
cayenne/main/trunk/plugins/pom.xml
Modified: cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/pom.xml?rev=1542481&r1=1542480&r2=1542481&view=diff
==============================================================================
--- cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/pom.xml (original)
+++ cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/pom.xml Sat Nov 16
08:28:07 2013
@@ -35,25 +35,21 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
- <version>2.0.5</version>
</dependency>
<dependency>
Modified: cayenne/main/trunk/plugins/maven-cayenne-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-plugin/pom.xml?rev=1542481&r1=1542480&r2=1542481&view=diff
==============================================================================
--- cayenne/main/trunk/plugins/maven-cayenne-plugin/pom.xml (original)
+++ cayenne/main/trunk/plugins/maven-cayenne-plugin/pom.xml Sat Nov 16 08:28:07
2013
@@ -26,33 +26,23 @@
<dependencies>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
- <version>2.0.5</version>
</dependency>
<dependency>
@@ -79,6 +69,13 @@
</exclusions>
</dependency>
+ <!-- Test deps -->
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -88,7 +85,6 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.0-beta-1</version>
<scope>test</scope>
</dependency>
Modified: cayenne/main/trunk/plugins/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/pom.xml?rev=1542481&r1=1542480&r2=1542481&view=diff
==============================================================================
--- cayenne/main/trunk/plugins/pom.xml (original)
+++ cayenne/main/trunk/plugins/pom.xml Sat Nov 16 08:28:07 2013
@@ -33,4 +33,35 @@
<module>maven-cayenne-plugin</module>
<module>maven-cayenne-modeler-plugin</module>
</modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-tools-api</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+
<artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.0-beta-1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
