Author: aadamchik
Date: Sun Dec 17 09:18:54 2006
New Revision: 488013
URL: http://svn.apache.org/viewvc?view=rev&rev=488013
Log:
CAY-719: Finalize Maven assembly scripts for the upcoming 3.0 milestone
releases (adding cayenne-jars module to assemble filtered jars)
Added:
incubator/cayenne/main/trunk/assembly/cayenne-jars/
incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/agent.xml
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/client.xml
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/server-deps.xml
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/server.xml
Modified:
incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
incubator/cayenne/main/trunk/assembly/pom.xml
Modified: incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml?view=diff&rev=488013&r1=488012&r2=488013
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml Sun Dec 17
09:18:54 2006
@@ -27,7 +27,7 @@
</parent>
<artifactId>cayenne-assembly-generic</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>Cayenne :: Generic Assembly</name>
<description>An assembly of Cayenne into a genericly runnable
package.</description>
@@ -45,7 +45,7 @@
<artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cayenne.core</groupId>
<artifactId>cayenne-jpa</artifactId>
@@ -225,8 +225,8 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+
<executions>
<execution>
<id>bin</id>
@@ -242,7 +242,6 @@
<outputDirectory>
${project.build.directory}/assembly/out
</outputDirectory>
-
<workDirectory>${project.build.directory}/assembly/work</workDirectory>
</configuration>
</execution>
</executions>
Modified:
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml?view=diff&rev=488013&r1=488012&r2=488013
==============================================================================
---
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
(original)
+++
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
Sun Dec 17 09:18:54 2006
@@ -1,72 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed 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.
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed 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.
-->
-
-<!-- $Rev$ $Date$ -->
-
<assembly>
- <id>main</id>
-
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
-
- <includeBaseDirectory>true</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.cayenne.core:cayenne-jdk1.4</include>
- <include>org.apache.cayenne.core:cayenne-jdk1.5</include>
- <include>org.apache.cayenne.core:cayenne-jpa</include>
- </includes>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>lib/modeler</outputDirectory>
- <includes>
- <include>org.apache.cayenne.modeler:cayenne-modeler</include>
- <include>commons-dbcp:commons-dbcp</include>
- <include>commons-pool:commons-pool</include>
- <include>jgoodies:forms</include>
- <include>hsqldb:hsqldb</include>
- <include>jgoodies:looks</include>
- <include>ognl:ognl</include>
- <include>org.scopemvc:scopemvc</include>
- </includes>
- </dependencySet>
-
- </dependencySets>
-
- <fileSets>
- <fileSet>
- <directory>target/doc</directory>
- <outputDirectory>doc</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>target/src</directory>
- <outputDirectory>src</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>target/modeler/bin</directory>
- <outputDirectory>bin</outputDirectory>
- </fileSet>
- </fileSets>
+ <id>main</id>
+
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib/modeler</outputDirectory>
+ <includes>
+
<include>org.apache.cayenne.modeler:cayenne-modeler</include>
+ <include>commons-dbcp:commons-dbcp</include>
+ <include>commons-pool:commons-pool</include>
+ <include>jgoodies:forms</include>
+ <include>hsqldb:hsqldb</include>
+ <include>jgoodies:looks</include>
+ <include>ognl:ognl</include>
+ <include>org.scopemvc:scopemvc</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+
<directory>../cayenne-jars/target/assembly/out</directory>
+ <outputDirectory>lib</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/doc</directory>
+ <outputDirectory>doc</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/src</directory>
+ <outputDirectory>src</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/modeler/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
Added: incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml?view=auto&rev=488013
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml (added)
+++ incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml Sun Dec 17
09:18:54 2006
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed 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>
+
+ <parent>
+ <groupId>org.apache.cayenne.assembly</groupId>
+ <artifactId>cayenne-assembly-parent</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cayenne-jars</artifactId>
+ <packaging>pom</packaging>
+ <name>Cayenne :: Jars Assembly</name>
+
+ <description>An assembly of Cayenne jar files.</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jpa</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+
<finalName>cayenne</finalName>
+ <outputDirectory>
+
${project.build.directory}/assembly/out
+ </outputDirectory>
+ <descriptors>
+
<descriptor>${pom.basedir}/src/main/assembly/agent.xml</descriptor>
+
<descriptor>${pom.basedir}/src/main/assembly/client.xml</descriptor>
+
<descriptor>${pom.basedir}/src/main/assembly/server.xml</descriptor>
+ <descriptor>
+
${pom.basedir}/src/main/assembly/server-deps.xml
+ </descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added:
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/agent.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/agent.xml?view=auto&rev=488013
==============================================================================
---
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/agent.xml
(added)
+++
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/agent.xml
Sun Dec 17 09:18:54 2006
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed 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.
+-->
+<assembly>
+ <id>agent</id>
+
+ <formats>
+ <format>jar</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <includes>
+
<include>org.apache.cayenne.core:cayenne-agent</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Added:
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/client.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/client.xml?view=auto&rev=488013
==============================================================================
---
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/client.xml
(added)
+++
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/client.xml
Sun Dec 17 09:18:54 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed 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.
+-->
+<assembly>
+ <id>client</id>
+
+ <formats>
+ <format>jar</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <includes>
+
<include>org.apache.cayenne.core:cayenne-jdk1.4</include>
+
<include>org.apache.cayenne.core:cayenne-jdk1.5</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Added:
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/server-deps.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/server-deps.xml?view=auto&rev=488013
==============================================================================
---
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/server-deps.xml
(added)
+++
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/server-deps.xml
Sun Dec 17 09:18:54 2006
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed 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.
+-->
+<assembly>
+ <id>server-deps</id>
+
+ <formats>
+ <format>jar</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <includes>
+
<include>org.apache.cayenne.core:cayenne-jdk1.4</include>
+
<include>org.apache.cayenne.core:cayenne-jdk1.5</include>
+
<include>org.apache.cayenne.core:cayenne-jpa</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Added:
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/server.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/server.xml?view=auto&rev=488013
==============================================================================
---
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/server.xml
(added)
+++
incubator/cayenne/main/trunk/assembly/cayenne-jars/src/main/assembly/server.xml
Sun Dec 17 09:18:54 2006
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed 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.
+-->
+<assembly>
+ <id>server</id>
+
+ <formats>
+ <format>jar</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <includes>
+
<include>org.apache.cayenne.core:cayenne-jdk1.4</include>
+
<include>org.apache.cayenne.core:cayenne-jdk1.5</include>
+
<include>org.apache.cayenne.core:cayenne-jpa</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Modified: incubator/cayenne/main/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/pom.xml?view=diff&rev=488013&r1=488012&r2=488013
==============================================================================
--- incubator/cayenne/main/trunk/assembly/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/pom.xml Sun Dec 17 09:18:54 2006
@@ -31,12 +31,11 @@
<packaging>pom</packaging>
<name>Cayenne :: Assembly</name>
- <!-- Build the generic distribution in all cases. -->
<modules>
+ <module>cayenne-jars</module>
<module>cayenne-generic</module>
</modules>
- <!-- Set up the OS-specific distributions. -->
<profiles>
<profile>
