Clean up use of scope plugin. Make all spec dependencies scope provided
git-svn-id: https://svn.apache.org/repos/asf/geronimo/javamail/trunk@641586 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml b/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml
index ee1b68a..5018e82 100644
--- a/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml
+++ b/geronimo-javamail_1.4/geronimo-javamail_1.4_mail/pom.xml
@@ -41,13 +41,11 @@
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_provider</artifactId>
<version>${pom.version}</version>
- <!--<scope>provided</scope>-->
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
- <!--<scope>provided</scope>-->
</dependency>
</dependencies>
@@ -64,14 +62,6 @@
<goal>shade</goal>
</goals>
<configuration>
-<!--
- <artifactSet>
- <includes>
- <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
- <include>org.apache.geronimo.javamail:geronimo-javamail_1.4_provider</include>
- </includes>
- </artifactSet>
--->
</configuration>
</execution>
</executions>
diff --git a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/pom.xml b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/pom.xml
index 9056384..7e423df 100644
--- a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/pom.xml
+++ b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/pom.xml
@@ -39,11 +39,13 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/geronimo-javamail_1.4/pom.xml b/geronimo-javamail_1.4/pom.xml
index 81da7dd..70a5608 100644
--- a/geronimo-javamail_1.4/pom.xml
+++ b/geronimo-javamail_1.4/pom.xml
@@ -79,6 +79,16 @@
</dependencyManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.0.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -125,28 +135,6 @@
</plugins>
</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>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
<modules>
<module>geronimo-javamail_1.4_provider</module>
<module>geronimo-javamail_1.4_mail</module>