Author: bago
Date: Sat Sep 27 05:32:45 2008
New Revision: 699625
URL: http://svn.apache.org/viewvc?rev=699625&view=rev
Log:
Updated commons-configuration to 1.5 (from 1.1) and geronimo-javamail_1.4 to
1.6 (from 1.5).
Added:
james/server/trunk/stage/commons-configuration/jars/commons-configuration-1.5.jar
(with props)
james/server/trunk/stage/commons-configuration/poms/commons-configuration-1.5.pom
(with props)
james/server/trunk/stage/org.apache.geronimo.javamail/jars/geronimo-javamail_1.4_mail-1.6.jar
(with props)
james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.6.pom
(with props)
james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.6.pom
(with props)
Removed:
james/server/trunk/stage/org.apache.geronimo.javamail/jars/geronimo-javamail_1.4_mail-1.5.jar
james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.5.pom
james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.5.pom
Modified:
james/server/trunk/include.properties
james/server/trunk/pom.xml
Modified: james/server/trunk/include.properties
URL:
http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=699625&r1=699624&r2=699625&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Sat Sep 27 05:32:45 2008
@@ -134,7 +134,7 @@
# Sun's Javamail Implementation
jarname.javax-mail.jar=mail-1.4.1.jar
# Geronimo JavaMail Implementation
-#jarname.javax-mail.jar=geronimo-javamail_1.4_mail-1.5.jar
+#jarname.javax-mail.jar=geronimo-javamail_1.4_mail-1.6.jar
javax-mail.jar=${path.lib.javamail}/${jarname.javax-mail.jar}
# ----- Activation -----
@@ -240,7 +240,7 @@
village.jar=${path.lib.village}/${jarname.village.jar}
jarname.commons-lang.jar=commons-lang-2.1.jar
commons-lang.jar=${path.lib.commonslang}/${jarname.commons-lang.jar}
-jarname.commons-configuration.jar=commons-configuration-1.1.jar
+jarname.commons-configuration.jar=commons-configuration-1.5.jar
commons-configuration.jar=${path.lib.commonsconfiguration}/${jarname.commons-configuration.jar}
jarname.commons-beanutils.jar=commons-beanutils-1.7.0.jar
commons-beanutils.jar=${path.lib.commonsbeanutils}/${jarname.commons-beanutils.jar}
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=699625&r1=699624&r2=699625&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sat Sep 27 05:32:45 2008
@@ -519,7 +519,7 @@
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
@@ -588,21 +588,9 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.1</version>
+ <version>1.5</version>
<exclusions>
<exclusion>
- <artifactId>dom4j</artifactId>
- <groupId>dom4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>servletapi</artifactId>
- <groupId>servletapi</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- <exclusion>
<artifactId>commons-digester</artifactId>
<groupId>commons-digester</groupId>
</exclusion>
@@ -610,10 +598,6 @@
<artifactId>commons-beanutils-core</artifactId>
<groupId>commons-beanutils</groupId>
</exclusion>
- <exclusion>
- <artifactId>commons-beanutils-bean-collections</artifactId>
- <groupId>commons-beanutils</groupId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
Added:
james/server/trunk/stage/commons-configuration/jars/commons-configuration-1.5.jar
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/commons-configuration/jars/commons-configuration-1.5.jar?rev=699625&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
james/server/trunk/stage/commons-configuration/jars/commons-configuration-1.5.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
james/server/trunk/stage/commons-configuration/poms/commons-configuration-1.5.pom
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/commons-configuration/poms/commons-configuration-1.5.pom?rev=699625&view=auto
==============================================================================
---
james/server/trunk/stage/commons-configuration/poms/commons-configuration-1.5.pom
(added)
+++
james/server/trunk/stage/commons-configuration/poms/commons-configuration-1.5.pom
Sat Sep 27 05:32:45 2008
@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <name>Commons Configuration</name>
+ <version>1.5</version>
+ <description>Tools to assist in the reading of configuration/preferences
files in
+ various formats</description>
+ <url>http://commons.apache.org/${pom.artifactId.substring(8)}/</url>
+ <issueManagement>
+ <url>http://issues.apache.org/jira/browse/CONFIGURATION</url>
+ </issueManagement>
+ <ciManagement>
+ <notifiers>
+ <notifier>
+ <configuration>
+ <address>[EMAIL PROTECTED]</address>
+ </configuration>
+ </notifier>
+ </notifiers>
+ </ciManagement>
+ <inceptionYear>2001</inceptionYear>
+ <mailingLists>
+ <mailingList>
+ <name>Commons Dev List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/commons-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commons User List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/commons-user/</archive>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <id>dlr</id>
+ <name>Daniel Rall</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>CollabNet, Inc.</organization>
+ </developer>
+ <developer>
+ <id>jvanzyl</id>
+ <name>Jason van Zyl</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Zenplex</organization>
+ </developer>
+ <developer>
+ <id>mpoeschl</id>
+ <name>Martin Poeschl</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>tucana.at</organization>
+ </developer>
+ <developer>
+ <id>dion</id>
+ <name>dIon Gillard</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Multitask Consulting</organization>
+ </developer>
+ <developer>
+ <id>henning</id>
+ <name>Henning P. Schmiedehausen</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste
mbH</organization>
+ <timezone>2</timezone>
+ </developer>
+ <developer>
+ <id>epugh</id>
+ <name>Eric Pugh</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>upstate.com</organization>
+ </developer>
+ <developer>
+ <id>bdunbar</id>
+ <name>Brian E. Dunbar</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>dunbarconsulting.org</organization>
+ </developer>
+ <developer>
+ <id>ebourg</id>
+ <name>Emmanuel Bourg</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Ariane Software</organization>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>oheger</id>
+ <name>Oliver Heger</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Agfa HealthCare</organization>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>joehni</id>
+ <name>J?rg Schaible</name>
+ <email>[EMAIL PROTECTED]</email>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Konstantin Shaposhnikov</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>scand.com</organization>
+ </contributor>
+ <contributor>
+ <name>Jamie M. Guillemette</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>TD Bank</organization>
+ </contributor>
+ <contributor>
+ <name>Jorge Ferrer</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ </contributor>
+ <contributor>
+ <name>Gabriele Garuglieri</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Infoblu S.p.A</organization>
+ </contributor>
+ <contributor>
+ <name>Nicolas De Loof</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Cap Gemini</organization>
+ </contributor>
+ </contributors>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>/LICENSE.txt</url>
+ </license>
+ </licenses>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
+
<url>http://svn.apache.org/repos/asf/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
+ </scm>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://commons.apache.org/</url>
+ </organization>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>conf</directory>
+ <includes>
+ <include>digesterRules.xml</include>
+ <include>properties.dtd</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>conf</directory>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>conf</directory>
+ <includes>
+ <include>testClasspath.properties</include>
+ <include>testdb.script</include>
+ <include>*.properties</include>
+ <include>*.dtd</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <targetPath>org/apache/commons/configuration</targetPath>
+ <directory>conf</directory>
+ <includes>
+ <include>test.properties</include>
+ <include>include.properties</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <targetPath>config</targetPath>
+ <directory>conf/config</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/TestBasePropertiesConfiguration.java</exclude>
+ <exclude>**/NonStringTestHolder.java</exclude>
+ <exclude>**/TestAbstractConfiguration.java</exclude>
+ <exclude>**/AbstractXPathTest.java</exclude>
+ <exclude>**/AbstractCombinerTest.java</exclude>
+ <exclude>**/AbstractTestConfigurationEvents.java</exclude>
+ <exclude>**/AbstractTestFileConfigurationEvents.java</exclude>
+ <exclude>**/AbstractTestPListEvents.java</exclude>
+ <exclude>**/InterpolationTestHelper.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>maven-plugins</groupId>
+ <artifactId>maven-tasks-plugin</artifactId>
+ <version>1.1.0</version>
+ <configuration />
+ </plugin>
+ <plugin>
+ <groupId>maven-plugins</groupId>
+ <artifactId>maven-findbugs-plugin</artifactId>
+ <version>1.4</version>
+ <configuration />
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration />
+ </plugin>
+ <plugin>
+ <groupId>maven-plugins</groupId>
+ <artifactId>maven-cobertura-plugin</artifactId>
+ <version>1.2</version>
+ <configuration />
+ </plugin>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>1.6</version>
+ <configuration>
+ <comment><strong>Site Only</strong> - v1.6 (minimum)
+ required for building the site documentation.</comment>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-xdoc-plugin</artifactId>
+ <version>1.8</version>
+ <configuration>
+ <comment><strong>Site Only</strong> - v1.8 (minimum)
+ required for building the site documentation.</comment>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.5</version>
+ <configuration>
+ <comment><strong>Site Only</strong> - v1.5 (minimum)</comment>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jdiff-plugin</artifactId>
+ <version>1.5</version>
+ <configuration>
+ <comment><strong>Site Only</strong> - v1.5 (minimum)</comment>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>1.8</version>
+ <configuration>
+ <comment><strong>Site Only</strong> - v1.8 (minimum)</comment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <version>1.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.0.b2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.7.2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-core</artifactId>
+ <version>0.09</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
+ <version>0.09</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <repository>
+ <id>default</id>
+ <name>Default Repository</name>
+ <url>www.apache.org//www/www.apache.org/dist/java-repository/</url>
+ </repository>
+ <site>
+ <id>default</id>
+ <name>Default Site</name>
+
<url>scp://people.apache.org//www/commons.apache.org/${pom.artifactId.substring(8)}/</url>
+ </site>
+ <status>converted</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
Propchange:
james/server/trunk/stage/commons-configuration/poms/commons-configuration-1.5.pom
------------------------------------------------------------------------------
svn:eol-style = native
Added:
james/server/trunk/stage/org.apache.geronimo.javamail/jars/geronimo-javamail_1.4_mail-1.6.jar
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.geronimo.javamail/jars/geronimo-javamail_1.4_mail-1.6.jar?rev=699625&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
james/server/trunk/stage/org.apache.geronimo.javamail/jars/geronimo-javamail_1.4_mail-1.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.6.pom
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.6.pom?rev=699625&view=auto
==============================================================================
---
james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.6.pom
(added)
+++
james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.6.pom
Sat Sep 27 05:32:45 2008
@@ -0,0 +1,158 @@
+<?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.
+-->
+
+<!-- $Rev: 690072 $ $Date: 2008-08-28 22:11:05 -0400 (Thu, 28 Aug 2008) $ -->
+
+<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.geronimo.genesis.config</groupId>
+ <artifactId>project-config</artifactId>
+ <version>1.4</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4</artifactId>
+ <name>Geronimo JavaMail 1.4</name>
+ <packaging>pom</packaging>
+
+ <version>1.6</version>
+
+ <description>
+ Geronimmo JavaMail Bundle.
+ </description>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/javamail/tags/geronimo-javamail_1.4-1.6</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/javamail/tags/geronimo-javamail_1.4-1.6</developerConnection>
+
<url>http://svn.apache.org/viewvc/geronimo/javamail/tags/geronimo-javamail_1.4-1.6</url>
+ </scm>
+
+ <properties>
+ <siteId>javamail</siteId>
+ <projectName>Apache Geronimo Javamail Bundle</projectName>
+ </properties>
+
+ <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+ <distributionManagement>
+ <site>
+ <id>geronimo-website</id>
+ <url>${staging.siteURL}/${siteId}/${version}</url>
+ </site>
+ </distributionManagement>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_provider</artifactId>
+ <version>1.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.5</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.0.1</version>
+ </plugin>
+
+ <!--
+ HACK: Force the use of 2.4, since 2.3 causes the release
profile to fail for this project.
+ Upgrading here to avoid needing to wait for another
Genesis release.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <!-- Allow any Java >= 1.5, but not 1.6 or
above -->
+ <requireJavaVersion>
+ <version>[1.5,1.6)</version>
+ </requireJavaVersion>
+
+ <!-- Allow any Maven >= 2.0.5 -->
+ <requireMavenVersion>
+ <version>[2.0.5,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <jdkName>1.4</jdkName>
+ <linkModules>true</linkModules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>geronimo-javamail_1.4_provider</module>
+ <module>geronimo-javamail_1.4_mail</module>
+ </modules>
+
+</project>
Propchange:
james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.6.pom
------------------------------------------------------------------------------
svn:eol-style = native
Added:
james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.6.pom
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.6.pom?rev=699625&view=auto
==============================================================================
---
james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.6.pom
(added)
+++
james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.6.pom
Sat Sep 27 05:32:45 2008
@@ -0,0 +1,37 @@
+<?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";>
+ <parent>
+ <artifactId>geronimo-javamail_1.4</artifactId>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <version>1.6</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <name>Geronimo JavaMail 1.4 :: Mail</name>
+ <version>1.6</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration />
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
+
Propchange:
james/server/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.6.pom
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
