Author: aadamchik
Date: Sat Nov 16 21:22:27 2013
New Revision: 1542585
URL: http://svn.apache.org/r1542585
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
* cleanup
Modified:
cayenne/main/trunk/pom.xml
Modified: cayenne/main/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1542585&r1=1542584&r2=1542585&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sat Nov 16 21:22:27 2013
@@ -1,21 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file
to
+ you under the Apache License, Version 2.0 (the "License"); you may not
use
+ this file except in compliance with the License. You may obtain a copy
of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
+ by applicable law or agreed to in writing, software distributed under
the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the
specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<modelVersion>4.0.0</modelVersion>
<artifactId>cayenne-parent</artifactId>
<groupId>org.apache.cayenne</groupId>
@@ -477,7 +473,7 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+
<repositories>
<repository>
<id>objectstyle</id>
@@ -508,15 +504,15 @@
</pluginRepositories>
<build>
<defaultGoal>install</defaultGoal>
-
+
<extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>1.0-beta-7</version>
- </extension>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>1.0-beta-7</version>
+ </extension>
</extensions>
-
+
<pluginManagement>
<plugins>
<!-- M2Eclipse configuration. Has no effect for
command line builds -->
@@ -583,7 +579,8 @@
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
-
<artifactId>dependency-maven-plugin</artifactId><versionRange>[1.0,)</versionRange>
+
<artifactId>dependency-maven-plugin</artifactId>
+
<versionRange>[1.0,)</versionRange>
<goals>
<goal>unpack</goal>
</goals>
@@ -649,6 +646,10 @@
</configuration>
</plugin>
<plugin>
+
<artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.cayenne.build-tools</groupId>
<artifactId>cayenne-build-maven-plugin</artifactId>
<version>${project.version}</version>
@@ -679,6 +680,15 @@
<version>2.5</version>
</plugin>
<plugin>
+
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.3.1</version>
</plugin>
@@ -687,6 +697,14 @@
<version>2.1.2</version>
</plugin>
<plugin>
+
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ </plugin>
+ <plugin>
+
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.8</version>
</plugin>
@@ -709,6 +727,11 @@
<version>1.0</version>
</plugin>
<plugin>
+ <groupId>org.apache.rat</groupId>
+
<artifactId>apache-rat-plugin</artifactId>
+ <version>0.8</version>
+ </plugin>
+ <plugin>
<groupId>org.objectstyle.woproject.maven2</groupId>
<artifactId>maven-japplication-plugin</artifactId>
<version>2.0.17</version>
@@ -716,14 +739,15 @@
</plugins>
</pluginManagement>
-
+
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
<configuration>
<argLine>
-
-DcayenneTestConnection=${cayenneTestConnection}
-Djava.net.preferIPv4Stack=true
-Dcayenne.runtime.db.collation.assume.ci=${collationCi}
+
-DcayenneTestConnection=${cayenneTestConnection}
+ -Djava.net.preferIPv4Stack=true
+
-Dcayenne.runtime.db.collation.assume.ci=${collationCi}
</argLine>
<systemPropertyVariables>
<property>
@@ -764,28 +788,13 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- </plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
<configuration>
<excludes>
<exclude>**/target</exclude>
@@ -809,7 +818,7 @@
<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
</repository>
</distributionManagement>
-
+
<profiles>
<!-- Profile that generates assemblies after the build -->
@@ -1005,7 +1014,7 @@
</dependency>
</dependencies>
</profile>
- <profile>
+ <profile>
<id>ingres</id>
<activation>
<property>
