You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/09/19 09:02:33 UTC
svn commit: r696947 - in /geronimo/javamail/trunk/geronimo-javamail_1.3.1:
./ geronimo-javamail_1.3.1_mail/ geronimo-javamail_1.3.1_provider/
Author: jdillon
Date: Fri Sep 19 00:02:32 2008
New Revision: 696947
URL: http://svn.apache.org/viewvc?rev=696947&view=rev
Log:
Upgrade to Genesis 2.0
Removed:
geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_mail/LICENSE.txt
geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_mail/NOTICE.txt
geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_provider/LICENSE.txt
geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_provider/NOTICE.txt
Modified:
geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_mail/pom.xml
geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_provider/pom.xml
geronimo/javamail/trunk/geronimo-javamail_1.3.1/pom.xml
Modified: geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_mail/pom.xml?rev=696947&r1=696946&r2=696947&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_mail/pom.xml (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_mail/pom.xml Fri Sep 19 00:02:32 2008
@@ -28,26 +28,22 @@
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>javamail-1.3.1</artifactId>
<version>1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-javamail_1.3.1_mail</artifactId>
- <name>Geronimo JavaMail :: 1.3 Mail</name>
+ <name>Geronimo JavaMail 1.3.1 :: Mail</name>
<packaging>pom</packaging>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.3.1_provider</artifactId>
- <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
</dependency>
-
</dependencies>
<build>
@@ -63,7 +59,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>${pom.basedir}/src/main/assembly/javamail.xml</descriptor>
+ <descriptor>${project.basedir}/src/main/assembly/javamail.xml</descriptor>
</descriptors>
</configuration>
</execution>
Modified: geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_provider/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_provider/pom.xml?rev=696947&r1=696946&r2=696947&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_provider/pom.xml (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.3.1/geronimo-javamail_1.3.1_provider/pom.xml Fri Sep 19 00:02:32 2008
@@ -28,14 +28,12 @@
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>javamail-1.3.1</artifactId>
<version>1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-javamail_1.3.1_provider</artifactId>
- <name>Geronimo JavaMail :: 1.3.1 Provider</name>
+ <name>Geronimo JavaMail 1.3.1 :: Provider</name>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.0.2_spec</artifactId>
@@ -45,7 +43,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
</dependency>
-
</dependencies>
</project>
Modified: geronimo/javamail/trunk/geronimo-javamail_1.3.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.3.1/pom.xml?rev=696947&r1=696946&r2=696947&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.3.1/pom.xml (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.3.1/pom.xml Fri Sep 19 00:02:32 2008
@@ -25,31 +25,30 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>project-config</artifactId>
- <version>1.1</version>
+ <groupId>org.apache.geronimo.genesis.flava</groupId>
+ <artifactId>genesis-java1.4-flava</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>javamail-1.3.1</artifactId>
- <name>Geronimo JavaMail</name>
+ <name>Geronimo JavaMail 1.3.1</name>
<packaging>pom</packaging>
<version>1.2-SNAPSHOT</version>
<description>
- Geronimmo JavaMail provider.
+ Geronimmo JavaMail 1.3.1.
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/javamail/trunk/geronimo-javamail_1.3.1/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/javamail/trunk/geronimo-javamail_1.3.1/</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.3.1/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/javamail/trunk/geronimo-javamail_1.3.1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/javamail/trunk/geronimo-javamail_1.3.1</developerConnection>
+ <url>http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.3.1</url>
</scm>
<dependencyManagement>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.0.2_spec</artifactId>
@@ -61,32 +60,26 @@
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
<version>1.3</version>
</dependency>
-
+
+ <!-- INTERNAL -->
+
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.3.1_provider</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </dependency>
</dependencies>
</dependencyManagement>
-
+
+ <modules>
+ <module>geronimo-javamail_1.3.1_provider</module>
+ <module>geronimo-javamail_1.3.1_mail</module>
+ </modules>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</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>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/geronimo/javamail/tags</tagBase>
@@ -96,11 +89,6 @@
</build>
<repositories>
- <!--
- NOTE: The default repositories are picked up by Genesis, but need to
- specify where Genesis lives to pick it up + any additional repositories.
- -->
-
<repository>
<id>apache-snapshots</id>
<name>Apache Snapshots Repository</name>
@@ -124,19 +112,4 @@
</site>
</distributionManagement>
- <profiles>
- <profile>
- <id>default</id>
-
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <modules>
- <module>geronimo-javamail_1.3.1_provider</module>
- <module>geronimo-javamail_1.3.1_mail</module>
- </modules>
- </profile>
- </profiles>
-
</project>