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 2008/07/27 18:54:30 UTC
svn commit: r680149 - in /james/jspf/branches/multimodule-proposal: pom.xml
resolver/pom.xml stage/pom.xml
Author: bago
Date: Sun Jul 27 09:54:29 2008
New Revision: 680149
URL: http://svn.apache.org/viewvc?rev=680149&view=rev
Log:
Made the stage folder a module, so that dependencies installation is managed by a "sister" module and we don't have to deal with the "stage repository hack" in other modules.
Added:
james/jspf/branches/multimodule-proposal/stage/pom.xml (with props)
Modified:
james/jspf/branches/multimodule-proposal/pom.xml
james/jspf/branches/multimodule-proposal/resolver/pom.xml
Modified: james/jspf/branches/multimodule-proposal/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/pom.xml?rev=680149&r1=680148&r2=680149&view=diff
==============================================================================
--- james/jspf/branches/multimodule-proposal/pom.xml (original)
+++ james/jspf/branches/multimodule-proposal/pom.xml Sun Jul 27 09:54:29 2008
@@ -25,8 +25,39 @@
<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 -->
+ <!-- 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
+ -->
<relativePath>../james-project/project/pom.xml</relativePath>
</parent>
<name>Apache JAMES jSPF</name>
@@ -46,6 +77,7 @@
<packaging>pom</packaging>
<modules>
+ <module>stage</module>
<module>resolver</module>
</modules>
@@ -60,55 +92,52 @@
<url>http://svn.apache.org/viewvc/james/jspf/trunk/</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>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
+ <version>2.0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.nominet</groupId>
+ <artifactId>dnsjnio</artifactId>
+ <version>0.9.9</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>
+ </dependencyManagement>
<mailingLists>
<mailingList>
Modified: james/jspf/branches/multimodule-proposal/resolver/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/resolver/pom.xml?rev=680149&r1=680148&r2=680149&view=diff
==============================================================================
--- james/jspf/branches/multimodule-proposal/resolver/pom.xml (original)
+++ james/jspf/branches/multimodule-proposal/resolver/pom.xml Sun Jul 27 09:54:29 2008
@@ -38,44 +38,28 @@
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
- <version>2.0.6</version>
</dependency>
<dependency>
<groupId>uk.nominet</groupId>
<artifactId>dnsjnio</artifactId>
- <version>0.9.9</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>
Added: james/jspf/branches/multimodule-proposal/stage/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/branches/multimodule-proposal/stage/pom.xml?rev=680149&view=auto
==============================================================================
--- james/jspf/branches/multimodule-proposal/stage/pom.xml (added)
+++ james/jspf/branches/multimodule-proposal/stage/pom.xml Sun Jul 27 09:54:29 2008
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+ 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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>jspf-repository</artifactId>
+ <parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jspf</artifactId>
+ <version>0.9.7-SNAPSHOT</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>../pom.xml</relativePath>
+ </parent>
+ <name>Apache JAMES jSPF Stage Repository</name>
+ <description>Local maven repository for Apache JAMES jSPF</description>
+ <packaging>pom</packaging>
+ <repositories>
+ <repository>
+ <id>module-local</id>
+ <name>Local Repository</name>
+ <url>file://${pom.basedir}/</url>
+ <layout>legacy</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>uk.nominet</groupId>
+ <artifactId>dnsjnio</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jvyaml</groupId>
+ <artifactId>jvyaml</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: james/jspf/branches/multimodule-proposal/stage/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/jspf/branches/multimodule-proposal/stage/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org