You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2007/09/30 16:17:35 UTC
svn commit: r580728 - in /james/server/trunk: ./ core-library/
phoenix-deployment/ smtpserver-function/ stage/org.apache.james/jars/
stage/org.apache.james/poms/
Author: bago
Date: Sun Sep 30 07:17:34 2007
New Revision: 580728
URL: http://svn.apache.org/viewvc?rev=580728&view=rev
Log:
Fix for broken nightly builds.
m2 updates for jspf to apache-jspf artifact name changes and unused dependency exclusions.
Added:
james/server/trunk/stage/org.apache.james/jars/maven-skin-1.1.jar (with props)
james/server/trunk/stage/org.apache.james/poms/apache-jspf-0.9.5.pom
james/server/trunk/stage/org.apache.james/poms/maven-skin-1.1.pom
Modified:
james/server/trunk/core-library/pom.xml
james/server/trunk/include.properties
james/server/trunk/phoenix-deployment/pom.xml
james/server/trunk/pom.xml
james/server/trunk/smtpserver-function/pom.xml
Modified: james/server/trunk/core-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=580728&r1=580727&r2=580728&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Sun Sep 30 07:17:34 2007
@@ -42,18 +42,6 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk14-workaround</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>jspf</artifactId>
- <version>0.9-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>jsieve</artifactId>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- -->
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
Modified: james/server/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=580728&r1=580727&r2=580728&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Sun Sep 30 07:17:34 2007
@@ -186,7 +186,7 @@
bcmail-workaround.jar=${path.lib.bouncycastle}/${jarname.bcmail-workaround.jar}
# ----- jSPF -----
-jarname.jspf.jar=jspf-0.9-SNAPSHOT.jar
+jarname.jspf.jar=apache-jspf-0.9.5.jar
jspf.jar=${path.lib.james}/${jarname.jspf.jar}
# ----- mstor -----
Modified: james/server/trunk/phoenix-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?rev=580728&r1=580727&r2=580728&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/pom.xml (original)
+++ james/server/trunk/phoenix-deployment/pom.xml Sun Sep 30 07:17:34 2007
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>jspf</artifactId>
+ <artifactId>apache-jspf</artifactId>
</dependency>
<dependency>
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=580728&r1=580727&r2=580728&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sun Sep 30 07:17:34 2007
@@ -324,8 +324,23 @@
-->
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>jspf</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <artifactId>apache-jspf</artifactId>
+ <version>0.9.5</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-cli</artifactId>
+ <groupId>commons-cli</groupId>
+ </exclusion>
+ <!-- only used for the asynchronous executors -->
+ <exclusion>
+ <artifactId>dnsjnio</artifactId>
+ <groupId>uk.nominet</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/smtpserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/pom.xml?rev=580728&r1=580727&r2=580728&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/pom.xml (original)
+++ james/server/trunk/smtpserver-function/pom.xml Sun Sep 30 07:17:34 2007
@@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>jspf</artifactId>
+ <artifactId>apache-jspf</artifactId>
</dependency>
<dependency>
Added: james/server/trunk/stage/org.apache.james/jars/maven-skin-1.1.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/maven-skin-1.1.jar?rev=580728&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/stage/org.apache.james/jars/maven-skin-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/stage/org.apache.james/poms/apache-jspf-0.9.5.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-jspf-0.9.5.pom?rev=580728&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/apache-jspf-0.9.5.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/apache-jspf-0.9.5.pom Sun Sep 30 07:17:34 2007
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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</groupId>
+ <artifactId>apache-jspf</artifactId>
+ <parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
+ <version>1.2</version>
+ <!-- Either this really points to the james-project/pom.xml or you
+ will have to tune the local repository, later, in this file -->
+ <relativePath>../james-project/project/pom.xml</relativePath>
+ </parent>
+ <name>Apache JAMES jSPF</name>
+ <version>0.9.5</version>
+ <description>
+ Apache James jSPF is an SPF spec implementation written in Java
+ </description>
+ <url>http://james.apache.org/jspf</url>
+ <inceptionYear>2006</inceptionYear>
+
+ <distributionManagement>
+ <site>
+ <id>jspf-website</id>
+ <url>scp://people.apache.org/www/james.apache.org/jspf/</url>
+ </site>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.nominet</groupId>
+ <artifactId>dnsjnio</artifactId>
+ <version>0.9.8</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jvyaml</groupId>
+ <artifactId>jvyaml</artifactId>
+ <version>0.2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.apache.org/jira/browse/JSPF</url>
+ </issueManagement>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/james/jspf/tags/apache-jspf-0.9.5</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/jspf/tags/apache-jspf-0.9.5</developerConnection>
+ <url>http://svn.apache.org/viewvc/james/jspf/tags/apache-jspf-0.9.5</url>
+ </scm>
+
+ <repositories>
+ <repository>
+ <id>local-jspf-stage-repository</id>
+ <name>Local jSPF stage repository</name>
+ <!-- Please note that due to http://jira.codehaus.org/browse/MNG-2896 -->
+ <!-- If you don't have james-project checked out in ../james-project -->
+ <!-- you will have to place your absolute path to the project instead -->
+ <!-- of ${basedir}, or, otherwise, manually install the parent poms -->
+ <!--
+ #windows:
+ mvn -fignorepom.xml install:install-file
+ -Dfile=stage\org.apache.james\poms\james-parent-1.1.pom
+ -Dpackaging=pom
+ -DgroupId=org.apache.james
+ -DartifactId=james-parent
+ -Dversion=1.1
+ mvn -fignorepom.xml install:install-file
+ -Dfile=stage\org.apache.james\poms\james-project-1.2.pom
+ -Dpackaging=pom
+ -DgroupId=org.apache.james
+ -DartifactId=james-project
+ -Dversion=1.2
+
+ #linux:
+ mvn -fignorepom.xml install:install-file
+ -Dfile=stage/org.apache.james/poms/james-parent-1.1.pom
+ -Dpackaging=pom
+ -DgroupId=org.apache.james
+ -DartifactId=james-parent
+ -Dversion=1.1
+ mvn -fignorepom.xml install:install-file
+ -Dfile=stage/org.apache.james/poms/james-project-1.2.pom
+ -Dpackaging=pom
+ -DgroupId=org.apache.james
+ -DartifactId=james-project
+ -Dversion=1.2
+ -->
+ <url>file://${basedir}/stage</url>
+ <layout>legacy</layout>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <mailingLists>
+ <mailingList>
+ <name>Apache jSPF Developement</name>
+ <subscribe>server-dev-subscribe@james.apache.org</subscribe>
+ <unsubscribe>server-dev-unsubscribe@james.apache.org</unsubscribe>
+ <post>server-dev@james.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <targetjdk>1.4</targetjdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/controversial.xml</ruleset>
+ </rulesets>
+ <format>xml</format>
+ <linkXref>true</linkXref>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.james.jspf.impl.SPFQuery</mainClass>
+ <packageName>org.apache.james.jspf</packageName>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ <manifestEntries>
+ <mode>development</mode>
+ <url>${pom.url}</url>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ <encoding>iso8859-1</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>create-javadocs</id> <!-- this is used for inheritance merges -->
+ <phase>package</phase> <!-- append to the packaging phase. -->
+ <goals>
+ <goal>javadoc</goal> <!-- goals == mojos -->
+ <goal>jar</goal> <!-- goals == mojos -->
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <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>
+ <version>1.0-alpha-5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+ </resourceBundles>
+ <properties>
+ <!-- <preProjectText>PRE PROCESS TEXT</preProjectText> -->
+ <postProjectText>This product includes/uses software, JUnit (http://www.junit.org/),
+developed by Kent Beck, Erich Gamma, and David Saff
+License: Common Public License Version 1.0 (http://www.opensource.org/licenses/cpl.php)
+
+This product contains code derived from the spfjava library
+written by Roger Fullerton and Neil Murray.
+
+This product contains DNS-aware tests inspired by DNSJava
+test code written and copyrighted by Brian Wellington, too.
+
+This product contains resources (SPF parser tests named test*.txt)
+derived from the libspf2 library (http://www.libspf2.org/) and
+distributed under the BSD license and copyright by Wayne Schlitt,
+Shevek. (src\test\resources\org\apache\james\jspf\libspf2.LICENSES)
+
+This product contains resources (*.yml) from the pyspf library
+(http://cheeseshop.python.org/pypi/pyspf) distributed under
+the Python Software Foundation License and copyright by Terence Way,
+Stuart Gathman (stuart@bmsi.com) and Scott Kitterman.
+(src\test\resources\org\apache\james\jspf\pyspf.LICENSE)
+
+This file is automatically generated by dependencies declared in pom.xml
+ </postProjectText>
+ <addLicense>true</addLicense>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: james/server/trunk/stage/org.apache.james/poms/maven-skin-1.1.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/maven-skin-1.1.pom?rev=580728&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/maven-skin-1.1.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/maven-skin-1.1.pom Sun Sep 30 07:17:34 2007
@@ -0,0 +1,66 @@
+<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</groupId>
+ <artifactId>maven-skin</artifactId>
+ <version>1.1</version>
+ <name>JAMES Skin</name>
+ <description>Apache JAMES Official Maven2 Site Skin</description>
+
+ <parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-parent</artifactId>
+ <version>1.1</version>
+ </parent>
+
+
+ <distributionManagement>
+ <site>
+ <id>maven-skin-website</id>
+ <url>scp://minotaur.apache.org/www/james.apache.org/maven-skin</url>
+ </site>
+ </distributionManagement>
+
+ <!-- This is here because of http://jira.codehaus.org/browse/MRRESOURCES-6 -->
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org