You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/01/20 10:38:31 UTC
svn commit: r901114 - in /james/imap/trunk: parent/pom.xml pom.xml
Author: norman
Date: Wed Jan 20 09:38:09 2010
New Revision: 901114
URL: http://svn.apache.org/viewvc?rev=901114&view=rev
Log:
Fix usage of parent pom.xml. Remove already inhered plugins (from parent)
Modified:
james/imap/trunk/parent/pom.xml
james/imap/trunk/pom.xml
Modified: james/imap/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/parent/pom.xml?rev=901114&r1=901113&r2=901114&view=diff
==============================================================================
--- james/imap/trunk/parent/pom.xml (original)
+++ james/imap/trunk/parent/pom.xml Wed Jan 20 09:38:09 2010
@@ -76,33 +76,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- <manifestEntries>
- <Specification-Title>${pom.name}</Specification-Title>
- <Specification-Version>${pom.version}</Specification-Version>
- <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Implementation-Title>${pom.name}</Implementation-Title>
- <Implementation-Version>${pom.version}</Implementation-Version>
- <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <url>${pom.url}</url>
- <X-Compile-Source-JDK>${target.jdk}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${target.jdk}</X-Compile-Target-JDK>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
+ <goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
+ <configuration>
+ <useDefaultManifestFile>true</useDefaultManifestFile>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -116,7 +106,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -134,28 +123,6 @@
</instructions>
</configuration>
</plugin>
- <!-- Add NOTICE and LICENSE to generated JAR -->
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <properties>
- <!-- <preProjectText>PRE PROCESS TEXT</preProjectText> -->
- <postProjectText>This file is automatically generated by dependencies declared in pom.xml</postProjectText>
- <addLicense>true</addLicense>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<reporting>
@@ -174,12 +141,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
Modified: james/imap/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/pom.xml?rev=901114&r1=901113&r2=901114&view=diff
==============================================================================
--- james/imap/trunk/pom.xml (original)
+++ james/imap/trunk/pom.xml Wed Jan 20 09:38:09 2010
@@ -46,6 +46,7 @@
<module>memory</module>
<module>seda</module>
<module>deployment</module>
+ <module>parent</module>
</modules>
<distributionManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org