Author: aadamchik Date: Sat Nov 16 21:18:00 2013 New Revision: 1542573 URL: http://svn.apache.org/r1542573 Log: CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
* removing aggregation from server and client - they are normal modules now
Modified:
cayenne/main/trunk/cayenne-client/pom.xml
cayenne/main/trunk/cayenne-server/pom.xml
Modified: cayenne/main/trunk/cayenne-client/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-client/pom.xml?rev=1542573&r1=1542572&r2=1542573&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-client/pom.xml (original)
+++ cayenne/main/trunk/cayenne-client/pom.xml Sat Nov 16 21:18:00 2013
@@ -32,13 +32,11 @@
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-di</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-core</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.buildtools</groupId>
@@ -63,35 +61,35 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.cayenne.buildtools</groupId>
-
<artifactId>cayenne-build-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
- <id>aggregate-all</id>
+ <id>bundle-source-jar</id>
<phase>package</phase>
<goals>
-
<goal>aggregate-bin</goal>
-
<goal>aggregate-sources</goal>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+
<artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
</goals>
+ <phase>process-resources</phase>
<configuration>
-
<excludesFile>src/main/aggregator/excludes.txt</excludesFile>
- <artifactItems>
- <artifactItem>
-
<groupId>org.apache.cayenne</groupId>
-
<artifactId>cayenne-di</artifactId>
-
<version>${project.version}</version>
- </artifactItem>
- <artifactItem>
-
<groupId>org.apache.cayenne</groupId>
-
<artifactId>cayenne-core</artifactId>
-
<version>${project.version}</version>
- </artifactItem>
- <artifactItem>
-
<groupId>org.apache.cayenne.buildtools</groupId>
-
<artifactId>cayenne-legal</artifactId>
-
<version>${project.version}</version>
- </artifactItem>
- </artifactItems>
+ <outputDirectory>
+
${project.build.directory}/classes
+ </outputDirectory>
+ <resourceBundles>
+ <resourceBundle>
+
org.apache.cayenne.buildtools:cayenne-legal:${project.version}
+
</resourceBundle>
+ </resourceBundles>
</configuration>
</execution>
</executions>
Modified: cayenne/main/trunk/cayenne-server/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/pom.xml?rev=1542573&r1=1542572&r2=1542573&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/cayenne-server/pom.xml Sat Nov 16 21:18:00 2013
@@ -32,13 +32,11 @@
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-di</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-core</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cayenne.buildtools</groupId>
@@ -62,34 +60,35 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.cayenne.buildtools</groupId>
-
<artifactId>cayenne-build-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
- <id>aggregate-all</id>
+ <id>bundle-source-jar</id>
<phase>package</phase>
<goals>
-
<goal>aggregate-bin</goal>
-
<goal>aggregate-sources</goal>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+
<artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
</goals>
+ <phase>process-resources</phase>
<configuration>
- <artifactItems>
- <artifactItem>
-
<groupId>org.apache.cayenne</groupId>
-
<artifactId>cayenne-di</artifactId>
-
<version>${project.version}</version>
- </artifactItem>
- <artifactItem>
-
<groupId>org.apache.cayenne</groupId>
-
<artifactId>cayenne-core</artifactId>
-
<version>${project.version}</version>
- </artifactItem>
- <artifactItem>
-
<groupId>org.apache.cayenne.buildtools</groupId>
-
<artifactId>cayenne-legal</artifactId>
-
<version>${project.version}</version>
- </artifactItem>
- </artifactItems>
+ <outputDirectory>
+
${project.build.directory}/classes
+ </outputDirectory>
+ <resourceBundles>
+ <resourceBundle>
+
org.apache.cayenne.buildtools:cayenne-legal:${project.version}
+
</resourceBundle>
+ </resourceBundles>
</configuration>
</execution>
</executions>
