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 2013/11/16 22:19:58 UTC
svn commit: r1542579 - in /cayenne/main/trunk/docs: doc/pom.xml
docbook/cayenne-guide/pom.xml docbook/docbook-stylesheets/pom.xml
docbook/getting-started-rop/pom.xml docbook/getting-started/pom.xml
docbook/pom.xml docbook/upgrade-guide/pom.xml pom.xml
Author: aadamchik
Date: Sat Nov 16 21:19:58 2013
New Revision: 1542579
URL: http://svn.apache.org/r1542579
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
* fixing docs maven structure
Modified:
cayenne/main/trunk/docs/doc/pom.xml
cayenne/main/trunk/docs/docbook/cayenne-guide/pom.xml
cayenne/main/trunk/docs/docbook/docbook-stylesheets/pom.xml
cayenne/main/trunk/docs/docbook/getting-started-rop/pom.xml
cayenne/main/trunk/docs/docbook/getting-started/pom.xml
cayenne/main/trunk/docs/docbook/pom.xml
cayenne/main/trunk/docs/docbook/upgrade-guide/pom.xml
cayenne/main/trunk/docs/pom.xml
Modified: cayenne/main/trunk/docs/doc/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/pom.xml?rev=1542579&r1=1542578&r2=1542579&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/pom.xml (original)
+++ cayenne/main/trunk/docs/doc/pom.xml Sat Nov 16 21:19:58 2013
@@ -22,13 +22,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-parent</artifactId>
+ <groupId>org.apache.cayenne.docs</groupId>
+ <artifactId>cayenne-docs-parent</artifactId>
<version>3.2M2-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <groupId>org.apache.cayenne.docs</groupId>
<artifactId>cayenne-doc</artifactId>
<packaging>jar</packaging>
<name>Cayenne Documentation</name>
@@ -164,15 +162,34 @@
<goals>
<goal>unpack</goal>
</goals>
+ <!-- TODO generate javadocs per module, not for the entire thing at once... -->
<configuration>
<outputDirectory>target/sources</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-di</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-client</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -210,13 +227,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>
Modified: cayenne/main/trunk/docs/docbook/cayenne-guide/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/cayenne-guide/pom.xml?rev=1542579&r1=1542578&r2=1542579&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/cayenne-guide/pom.xml (original)
+++ cayenne/main/trunk/docs/docbook/cayenne-guide/pom.xml Sat Nov 16 21:19:58 2013
@@ -24,8 +24,8 @@
<artifactId>cayenne-docbook</artifactId>
<version>3.2M2-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.cayenne.docs</groupId>
<artifactId>cayenne-guide</artifactId>
<name>Docbook: Cayenne Guide</name>
</project>
Modified: cayenne/main/trunk/docs/docbook/docbook-stylesheets/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/docbook-stylesheets/pom.xml?rev=1542579&r1=1542578&r2=1542579&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/docbook-stylesheets/pom.xml (original)
+++ cayenne/main/trunk/docs/docbook/docbook-stylesheets/pom.xml Sat Nov 16 21:19:58 2013
@@ -26,9 +26,7 @@
<version>3.2M2-SNAPSHOT</version>
</parent>
- <groupId>org.apache.cayenne.docs</groupId>
<artifactId>docbook-stylesheets</artifactId>
- <version>3.2M2-SNAPSHOT</version>
<name>Docbook: Cayenne Stylesheets</name>
<properties>
Modified: cayenne/main/trunk/docs/docbook/getting-started-rop/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started-rop/pom.xml?rev=1542579&r1=1542578&r2=1542579&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started-rop/pom.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started-rop/pom.xml Sat Nov 16 21:19:58 2013
@@ -25,7 +25,6 @@
<version>3.2M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.cayenne.docs</groupId>
<artifactId>getting-started-rop</artifactId>
<packaging>jar</packaging>
<name>Docbook: Getting Started with Cayenne ROP</name>
Modified: cayenne/main/trunk/docs/docbook/getting-started/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started/pom.xml?rev=1542579&r1=1542578&r2=1542579&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started/pom.xml (original)
+++ cayenne/main/trunk/docs/docbook/getting-started/pom.xml Sat Nov 16 21:19:58 2013
@@ -24,8 +24,8 @@
<artifactId>cayenne-docbook</artifactId>
<version>3.2M2-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.cayenne.docs</groupId>
<artifactId>getting-started</artifactId>
<packaging>jar</packaging>
<name>Docbook: Getting Started with Cayenne</name>
Modified: cayenne/main/trunk/docs/docbook/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/pom.xml?rev=1542579&r1=1542578&r2=1542579&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/pom.xml (original)
+++ cayenne/main/trunk/docs/docbook/pom.xml Sat Nov 16 21:19:58 2013
@@ -24,10 +24,9 @@
</prerequisites>
<parent>
- <groupId>org.apache.cayenne.parents</groupId>
+ <groupId>org.apache.cayenne.docs</groupId>
<artifactId>cayenne-docs-parent</artifactId>
<version>3.2M2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<modules>
@@ -42,7 +41,6 @@
<project.stylesheetdir>${project.parent.basedir}/docbook-stylesheets/target/classes</project.stylesheetdir>
</properties>
- <groupId>org.apache.cayenne.docs</groupId>
<artifactId>cayenne-docbook</artifactId>
<packaging>pom</packaging>
<name>Cayenne Docbook Documentation</name>
Modified: cayenne/main/trunk/docs/docbook/upgrade-guide/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/upgrade-guide/pom.xml?rev=1542579&r1=1542578&r2=1542579&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/upgrade-guide/pom.xml (original)
+++ cayenne/main/trunk/docs/docbook/upgrade-guide/pom.xml Sat Nov 16 21:19:58 2013
@@ -25,7 +25,6 @@
<version>3.2M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.cayenne.docs</groupId>
<artifactId>upgrade-guide</artifactId>
<name>Docbook: Cayenne New Features and Upgrade Guide</name>
Modified: cayenne/main/trunk/docs/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/pom.xml?rev=1542579&r1=1542578&r2=1542579&view=diff
==============================================================================
--- cayenne/main/trunk/docs/pom.xml (original)
+++ cayenne/main/trunk/docs/pom.xml Sat Nov 16 21:19:58 2013
@@ -28,7 +28,7 @@
<version>3.2M2-SNAPSHOT</version>
</parent>
- <groupId>org.apache.cayenne.parents</groupId>
+ <groupId>org.apache.cayenne.docs</groupId>
<artifactId>cayenne-docs-parent</artifactId>
<name>Cayenne Documenation Parent</name>
<packaging>pom</packaging>