Author: bago
Date: Sat Sep 27 05:13:53 2008
New Revision: 699624
URL: http://svn.apache.org/viewvc?rev=699624&view=rev
Log:
Updated geronimo javamail_1.4 to 1.6 (was 1.5).
Added:
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/jars/geronimo-javamail_1.4_mail-1.6.jar
(with props)
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.6.pom
(with props)
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.6.pom
(with props)
Removed:
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/jars/geronimo-javamail_1.4_mail-1.5.jar
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.5.pom
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.5.pom
Modified:
james/protocols/imap/trunk/include.properties
james/protocols/imap/trunk/pom.xml
Modified: james/protocols/imap/trunk/include.properties
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/include.properties?rev=699624&r1=699623&r2=699624&view=diff
==============================================================================
--- james/protocols/imap/trunk/include.properties (original)
+++ james/protocols/imap/trunk/include.properties Sat Sep 27 05:13:53 2008
@@ -83,7 +83,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 -----
Modified: james/protocols/imap/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/pom.xml?rev=699624&r1=699623&r2=699624&view=diff
==============================================================================
--- james/protocols/imap/trunk/pom.xml (original)
+++ james/protocols/imap/trunk/pom.xml Sat Sep 27 05:13:53 2008
@@ -278,7 +278,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>commons-collections</groupId>
Added:
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/jars/geronimo-javamail_1.4_mail-1.6.jar
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/jars/geronimo-javamail_1.4_mail-1.6.jar?rev=699624&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/jars/geronimo-javamail_1.4_mail-1.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.6.pom
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.6.pom?rev=699624&view=auto
==============================================================================
---
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.6.pom
(added)
+++
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.6.pom
Sat Sep 27 05:13:53 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/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4-1.6.pom
------------------------------------------------------------------------------
svn:eol-style = native
Added:
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.6.pom
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.6.pom?rev=699624&view=auto
==============================================================================
---
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.6.pom
(added)
+++
james/protocols/imap/trunk/stage/org.apache.geronimo.javamail/poms/geronimo-javamail_1.4_mail-1.6.pom
Sat Sep 27 05:13:53 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/protocols/imap/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]
