Author: rdonkin
Date: Mon Jun 1 20:35:24 2009
New Revision: 780817
URL: http://svn.apache.org/viewvc?rev=780817&view=rev
Log:
JSPF-74 Moved assembly to a separate module
https://issues.apache.org/jira/browse/JSPF-74
Added:
james/jspf/trunk/assemble/ (with props)
james/jspf/trunk/assemble/pom.xml (with props)
james/jspf/trunk/assemble/src/
james/jspf/trunk/assemble/src/assemble/
james/jspf/trunk/assemble/src/assemble/bin.xml (with props)
james/jspf/trunk/assemble/src/assemble/src.xml
- copied, changed from r780668, james/jspf/trunk/src/assemble/src.xml
Removed:
james/jspf/trunk/resolver/src/assemble/bin.xml
james/jspf/trunk/src/assemble/
Modified:
james/jspf/trunk/ (props changed)
james/jspf/trunk/pom.xml
james/jspf/trunk/resolver/ (props changed)
james/jspf/trunk/resolver/pom.xml
james/jspf/trunk/stage/pom.xml
james/jspf/trunk/tester/ (props changed)
james/jspf/trunk/tester/pom.xml
Propchange: james/jspf/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 1 20:35:24 2009
@@ -5,3 +5,4 @@
.classpath
.settings
+.metadata
Propchange: james/jspf/trunk/assemble/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 1 20:35:24 2009
@@ -0,0 +1,2 @@
+target
+.*
Added: james/jspf/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/assemble/pom.xml?rev=780817&view=auto
==============================================================================
--- james/jspf/trunk/assemble/pom.xml (added)
+++ james/jspf/trunk/assemble/pom.xml Mon Jun 1 20:35:24 2009
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james.jspf</groupId>
+ <artifactId>apache-jspf</artifactId>
+ <parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jspf-project</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <name>Apache JAMES jSPF Assembly</name>
+ <description>
+ Apache James jSPF is an SPF spec implementation written in Java.
+ This module assembles the release.
+ </description>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>uk.nominet</groupId>
+ <artifactId>dnsjnio</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jvyaml</groupId>
+ <artifactId>jvyaml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: james/jspf/trunk/assemble/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: james/jspf/trunk/assemble/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/assemble/src/assemble/bin.xml?rev=780817&view=auto
==============================================================================
--- james/jspf/trunk/assemble/src/assemble/bin.xml (added)
+++ james/jspf/trunk/assemble/src/assemble/bin.xml Mon Jun 1 20:35:24 2009
@@ -0,0 +1,63 @@
+<assembly>
+ <!--
+ 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.
+ -->
+ <id>bin</id>
+
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE.*</include>
+ <include>NOTICE.*</include>
+ <include>RELEASE_NOTES.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../resolver/target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>apache-jspf*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../tester/target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>apache-jspf*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../target/site/apidocs</directory>
+ <outputDirectory>/apidocs</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib/</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Propchange: james/jspf/trunk/assemble/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/jspf/trunk/assemble/src/assemble/src.xml (from r780668,
james/jspf/trunk/src/assemble/src.xml)
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/assemble/src/assemble/src.xml?p2=james/jspf/trunk/assemble/src/assemble/src.xml&p1=james/jspf/trunk/src/assemble/src.xml&r1=780668&r2=780817&rev=780817&view=diff
==============================================================================
--- james/jspf/trunk/src/assemble/src.xml (original)
+++ james/jspf/trunk/assemble/src/assemble/src.xml Mon Jun 1 20:35:24 2009
@@ -28,25 +28,15 @@
</formats>
<fileSets>
<fileSet>
- <directory>.</directory>
+ <directory>..</directory>
<outputDirectory></outputDirectory>
<excludes>
<exclude>**/target/**</exclude>
<exclude>.*</exclude>
<exclude>.*/**</exclude>
<exclude>**.bak</exclude>
- <exclude>NOTICE</exclude>
- <exclude>LICENSE</exclude>
</excludes>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
- <fileSet>
- <directory>target/maven-shared-archive-resources/META-INF/</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- </includes>
- </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Modified: james/jspf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/pom.xml?rev=780817&r1=780816&r2=780817&view=diff
==============================================================================
--- james/jspf/trunk/pom.xml (original)
+++ james/jspf/trunk/pom.xml Mon Jun 1 20:35:24 2009
@@ -20,7 +20,7 @@
-->
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
- <artifactId>apache-jspf</artifactId>
+ <artifactId>apache-jspf-project</artifactId>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
@@ -47,9 +47,10 @@
<!-- The stage module contains dependencies for this product -->
<!-- It make sure dependencies needed by other modules are -->
<!-- resolved/installed in the repository -->
- <module>stage</module>
+ <module>stage</module>
<module>tester</module>
<module>resolver</module>
+ <module>assemble</module>
</modules>
<issueManagement>
@@ -127,45 +128,20 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.4.3</version>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- </plugin>
</plugins>
</pluginManagement>
-
-
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
-
<descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
- <ignoreMissingDescriptor>true</ignoreMissingDescriptor>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- append to the packaging phase. -->
- <goals>
- <goal>attached</goal> <!-- goals == mojos -->
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.james.jspf</groupId>
- <artifactId>tester</artifactId>
+ <artifactId>apache-jspf-tester</artifactId>
<version>0.9.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.james.jspf</groupId>
- <artifactId>resolver</artifactId>
+ <artifactId>apache-jspf-resolver</artifactId>
<classifier>tests</classifier>
<version>0.9.7-SNAPSHOT</version>
</dependency>
Propchange: james/jspf/trunk/resolver/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 1 20:35:24 2009
@@ -1 +1,2 @@
target
+.*
Modified: james/jspf/trunk/resolver/pom.xml
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/resolver/pom.xml?rev=780817&r1=780816&r2=780817&view=diff
==============================================================================
--- james/jspf/trunk/resolver/pom.xml (original)
+++ james/jspf/trunk/resolver/pom.xml Mon Jun 1 20:35:24 2009
@@ -20,10 +20,10 @@
-->
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james.jspf</groupId>
- <artifactId>resolver</artifactId>
+ <artifactId>apache-jspf-resolver</artifactId>
<parent>
<groupId>org.apache.james</groupId>
- <artifactId>apache-jspf</artifactId>
+ <artifactId>apache-jspf-project</artifactId>
<version>0.9.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.james.jspf</groupId>
- <artifactId>tester</artifactId>
+ <artifactId>apache-jspf-tester</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -144,21 +144,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
-
<descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- append to the packaging phase. -->
- <goals>
- <goal>attached</goal> <!-- goals == mojos -->
- </goals>
- </execution>
- </executions>
- </plugin>
<!-- Add NOTICE and LICENSE to generated JAR -->
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
Modified: james/jspf/trunk/stage/pom.xml
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/stage/pom.xml?rev=780817&r1=780816&r2=780817&view=diff
==============================================================================
--- james/jspf/trunk/stage/pom.xml (original)
+++ james/jspf/trunk/stage/pom.xml Mon Jun 1 20:35:24 2009
@@ -23,7 +23,7 @@
<artifactId>stage</artifactId>
<parent>
<groupId>org.apache.james</groupId>
- <artifactId>apache-jspf</artifactId>
+ <artifactId>apache-jspf-project</artifactId>
<version>0.9.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Propchange: james/jspf/trunk/tester/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 1 20:35:24 2009
@@ -1 +1,2 @@
target
+.*
Modified: james/jspf/trunk/tester/pom.xml
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/tester/pom.xml?rev=780817&r1=780816&r2=780817&view=diff
==============================================================================
--- james/jspf/trunk/tester/pom.xml (original)
+++ james/jspf/trunk/tester/pom.xml Mon Jun 1 20:35:24 2009
@@ -20,10 +20,10 @@
-->
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james.jspf</groupId>
- <artifactId>tester</artifactId>
+ <artifactId>apache-jspf-tester</artifactId>
<parent>
<groupId>org.apache.james</groupId>
- <artifactId>apache-jspf</artifactId>
+ <artifactId>apache-jspf-project</artifactId>
<version>0.9.7-SNAPSHOT</version>
</parent>
<name>Apache JAMES OpenSPF Tester</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
