Author: aadamchik
Date: Sat Nov 16 21:22:50 2013
New Revision: 1542586
URL: http://svn.apache.org/r1542586
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
* cleaning up adding NOTICE/LICENSE files to all jars
Modified:
cayenne/main/trunk/assembly/pom.xml
cayenne/main/trunk/buildtools/pom.xml
cayenne/main/trunk/cayenne-client/pom.xml
cayenne/main/trunk/cayenne-lifecycle/pom.xml
cayenne/main/trunk/cayenne-server/pom.xml
cayenne/main/trunk/cayenne-tools/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler/pom.xml
cayenne/main/trunk/pom.xml
Modified: cayenne/main/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/assembly/pom.xml?rev=1542586&r1=1542585&r2=1542586&view=diff
==============================================================================
--- cayenne/main/trunk/assembly/pom.xml (original)
+++ cayenne/main/trunk/assembly/pom.xml Sat Nov 16 21:22:50 2013
@@ -1,23 +1,16 @@
<?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
-
- 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";>
+<!-- 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";>
<modelVersion>4.0.0</modelVersion>
@@ -48,18 +41,18 @@
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-tools</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-lifecycle</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cayenne.modeler</groupId>
<artifactId>cayenne-modeler</artifactId>
@@ -78,20 +71,9 @@
<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
-
<outputDirectory>${project.build.directory}/legal</outputDirectory>
- <resourceBundles>
-
<resourceBundle>org.apache.cayenne.buildtools:cayenne-legal:${project.version}</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+
<outputDirectory>${project.build.directory}/legal</outputDirectory>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -172,9 +154,9 @@
</plugins>
</build>
</profile>
-
+
<profile>
- <!-- MAC assembly (can only be run on Mac)-->
+ <!-- MAC assembly (can only be run on Mac) -->
<id>mac</id>
<dependencies>
<dependency>
@@ -196,7 +178,7 @@
</goals>
<configuration>
<rules>
- <requireOS>
+
<requireOS>
<family>mac</family>
</requireOS>
</rules>
@@ -223,15 +205,14 @@
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
- <!-- chmod executable
... while japplication plugin produces the correct permissions,
- jar/unjar
operation resets 'x' flag, so the app becomes non-executable. Must
- fix that manually
- -->
+ <!-- chmod executable
... while japplication plugin produces the correct
+ permissions,
jar/unjar operation resets 'x' flag, so the app becomes non-executable.
+ Must fix that
manually -->
<execution>
<id>chmod-modeler</id>
<phase>package</phase>
@@ -246,7 +227,7 @@
</arguments>
</configuration>
</execution>
-
+
<!-- Package into .dmg
-->
<execution>
<id>dmg-distro</id>
@@ -273,9 +254,9 @@
</plugins>
</build>
</profile>
-
+
<profile>
- <!-- WINDOWS assembly (can only be run on Windows)-->
+ <!-- WINDOWS assembly (can only be run on Windows) -->
<id>windows</id>
<dependencies>
<dependency>
@@ -297,7 +278,7 @@
</goals>
<configuration>
<rules>
- <requireOS>
+
<requireOS>
<family>windows</family>
</requireOS>
</rules>
Modified: cayenne/main/trunk/buildtools/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/buildtools/pom.xml?rev=1542586&r1=1542585&r2=1542586&view=diff
==============================================================================
--- cayenne/main/trunk/buildtools/pom.xml (original)
+++ cayenne/main/trunk/buildtools/pom.xml Sat Nov 16 21:22:50 2013
@@ -1,23 +1,16 @@
<?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
-
- 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";>
+<!-- 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";>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +30,7 @@
<module>cayenne-legal</module>
<module>cayenne-test-utilities</module>
</modules>
-
+
<build>
<plugins>
<plugin>
@@ -47,6 +40,14 @@
<skip>true</skip>
</configuration>
</plugin>
+ <!-- Disable adding NOTICE/LICENSE into internal
projects, one of which
+ is the license and notice holder -->
+ <plugin>
+
<artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: cayenne/main/trunk/cayenne-client/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-client/pom.xml?rev=1542586&r1=1542585&r2=1542586&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-client/pom.xml (original)
+++ cayenne/main/trunk/cayenne-client/pom.xml Sat Nov 16 21:22:50 2013
@@ -58,29 +58,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
-
<artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <outputDirectory>
-
${project.build.directory}/classes
- </outputDirectory>
- <resourceBundles>
- <resourceBundle>
-
org.apache.cayenne.buildtools:cayenne-legal:${project.version}
-
</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: cayenne/main/trunk/cayenne-lifecycle/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-lifecycle/pom.xml?rev=1542586&r1=1542585&r2=1542586&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-lifecycle/pom.xml (original)
+++ cayenne/main/trunk/cayenne-lifecycle/pom.xml Sat Nov 16 21:22:50 2013
@@ -66,29 +66,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
-
<artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <outputDirectory>
-
${project.build.directory}/classes
- </outputDirectory>
- <resourceBundles>
- <resourceBundle>
-
org.apache.cayenne.buildtools:cayenne-legal:${project.version}
-
</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: cayenne/main/trunk/cayenne-server/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/pom.xml?rev=1542586&r1=1542585&r2=1542586&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/cayenne-server/pom.xml Sat Nov 16 21:22:50 2013
@@ -57,29 +57,4 @@
<artifactId>velocity</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
-
<artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <outputDirectory>
-
${project.build.directory}/classes
- </outputDirectory>
- <resourceBundles>
- <resourceBundle>
-
org.apache.cayenne.buildtools:cayenne-legal:${project.version}
-
</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: cayenne/main/trunk/cayenne-tools/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-tools/pom.xml?rev=1542586&r1=1542585&r2=1542586&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-tools/pom.xml (original)
+++ cayenne/main/trunk/cayenne-tools/pom.xml Sat Nov 16 21:22:50 2013
@@ -10,7 +10,8 @@
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";>
+<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";>
<parent>
<artifactId>cayenne-parent</artifactId>
@@ -104,31 +105,4 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
-
<artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <outputDirectory>
-
${project.build.directory}/classes
- </outputDirectory>
- <resourceBundles>
- <resourceBundle>
-
org.apache.cayenne.buildtools:cayenne-legal:${project.version}
-
</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
</project>
\ No newline at end of file
Modified: cayenne/main/trunk/modeler/cayenne-modeler/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/pom.xml?rev=1542586&r1=1542585&r2=1542586&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/pom.xml Sat Nov 16 21:22:50 2013
@@ -1,22 +1,16 @@
<?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
-
- 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";>
+<!-- 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";>
<modelVersion>4.0.0</modelVersion>
@@ -29,13 +23,13 @@
<artifactId>cayenne-modeler</artifactId>
<name>Cayenne Modeler</name>
<packaging>jar</packaging>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
-
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -74,26 +68,26 @@
<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</groupId>
<artifactId>cayenne-project</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-tools</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cayenne.modeler</groupId>
<artifactId>cayenne-wocompat</artifactId>
@@ -109,42 +103,15 @@
<groupId>mockrunner</groupId>
<artifactId>mockrunner</artifactId>
</dependency>
-
- <dependency>
- <groupId>net.sf.jedit-syntax</groupId>
- <artifactId>jedit-syntax</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jgraph</groupId>
- <artifactId>jgraph</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
-
<artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <outputDirectory>
-
${project.build.directory}/classes
- </outputDirectory>
- <resourceBundles>
- <resourceBundle>
-
org.apache.cayenne.buildtools:cayenne-legal:${project.version}
-
</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependency>
+ <groupId>net.sf.jedit-syntax</groupId>
+ <artifactId>jedit-syntax</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jgraph</groupId>
+ <artifactId>jgraph</artifactId>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified: cayenne/main/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1542586&r1=1542585&r2=1542586&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sat Nov 16 21:22:50 2013
@@ -570,6 +570,7 @@
<versionRange>[1.0,)</versionRange>
<goals>
<goal>bundle</goal>
+
<goal>process</goal>
</goals>
</pluginExecutionFilter>
<action>
@@ -774,25 +775,33 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
- <id>bundle-source-jar</id>
- <phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>process</goal>
</goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <outputDirectory>
+
${project.build.directory}/classes
+ </outputDirectory>
+ <resourceBundles>
+ <resourceBundle>
+
org.apache.cayenne.buildtools:cayenne-legal:${project.version}
+
</resourceBundle>
+ </resourceBundles>
+ </configuration>
</execution>
</executions>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
