Author: reto
Date: Wed Nov 16 23:31:15 2011
New Revision: 1202934
URL: http://svn.apache.org/viewvc?rev=1202934&view=rev
Log:
CLEREZZA-656: applied patch provided by Florent except for identation changes
Modified:
incubator/clerezza/trunk/parent/ext.javax.mail/pom.xml
Modified: incubator/clerezza/trunk/parent/ext.javax.mail/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/ext.javax.mail/pom.xml?rev=1202934&r1=1202933&r2=1202934&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/ext.javax.mail/pom.xml (original)
+++ incubator/clerezza/trunk/parent/ext.javax.mail/pom.xml Wed Nov 16 23:31:15
2011
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -20,43 +21,52 @@
-->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.apache.clerezza</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>org.apache.clerezza</groupId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ </parent>
<groupId>org.apache.clerezza.ext</groupId>
- <artifactId>javax.mail</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
- <packaging>bundle</packaging>
- <name>Clerezza Ext - Javax Mail</name>
+ <artifactId>javax.mail</artifactId>
+ <version>0.4-incubating-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Clerezza Ext - Javax Mail</name>
<description>Javax Mail as OSGi bundle</description>
-
- <dependencies>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.1</version>
- <scope>compile</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Embed-Dependency>mail</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
- <Export-Package>javax.mail.*,
com.sun.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <scope>compile</scope>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Embed-Dependency>mail,activation</Embed-Dependency>
+
<Embed-Transitive>true</Embed-Transitive>
+
<Export-Package>javax.mail.*;version=1.4.4,
com.sun.*;version=1.4.4</Export-Package>
+ <Import-Package>
+ sun.security.util;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
