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 rd...@apache.org on 2011/06/05 12:07:52 UTC

svn commit: r1132363 - in /james/server/trunk: core/pom.xml data-api/pom.xml dnsservice-api/pom.xml dnsservice-dnsjava/pom.xml lifecycle-api/pom.xml mailets/pom.xml

Author: rdonkin
Date: Sun Jun  5 10:07:52 2011
New Revision: 1132363

URL: http://svn.apache.org/viewvc?rev=1132363&view=rev
Log:
JAMES-1262 Inherit OSGI bindings from parent pom.

Modified:
    james/server/trunk/core/pom.xml
    james/server/trunk/data-api/pom.xml
    james/server/trunk/dnsservice-api/pom.xml
    james/server/trunk/dnsservice-dnsjava/pom.xml
    james/server/trunk/lifecycle-api/pom.xml
    james/server/trunk/mailets/pom.xml

Modified: james/server/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core/pom.xml?rev=1132363&r1=1132362&r2=1132363&view=diff
==============================================================================
--- james/server/trunk/core/pom.xml (original)
+++ james/server/trunk/core/pom.xml Sun Jun  5 10:07:52 2011
@@ -81,28 +81,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-         <configuration>       
-           <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> 
-            <manifest>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-        </configuration>       
-        <executions>
-          <execution>
-            <goals>
-              <goal>jar</goal>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+
+  <build/>
+
 </project>

Modified: james/server/trunk/data-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data-api/pom.xml?rev=1132363&r1=1132362&r2=1132363&view=diff
==============================================================================
--- james/server/trunk/data-api/pom.xml (original)
+++ james/server/trunk/data-api/pom.xml Sun Jun  5 10:07:52 2011
@@ -37,30 +37,7 @@
     </james.osgi.import>
   </properties> 
   
-   <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-         <configuration>       
-           <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> 
-            <manifest>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-        </configuration>       
-        <executions>
-          <execution>
-            <goals>
-              <goal>jar</goal>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+   <build/>
 
   <dependencies>
     <!-- only used by JamesUser (for MailAddress) -->
@@ -73,4 +50,4 @@
       <artifactId>${javax.mail.artifactId}</artifactId>
     </dependency> 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: james/server/trunk/dnsservice-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-api/pom.xml?rev=1132363&r1=1132362&r2=1132363&view=diff
==============================================================================
--- james/server/trunk/dnsservice-api/pom.xml (original)
+++ james/server/trunk/dnsservice-api/pom.xml Sun Jun  5 10:07:52 2011
@@ -36,30 +36,9 @@
       *
     </james.osgi.import>
   </properties> 
-   <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-         <configuration>       
-           <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> 
-            <manifest>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-        </configuration>       
-        <executions>
-          <execution>
-            <goals>
-              <goal>jar</goal>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+
+   <build/>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>

Modified: james/server/trunk/dnsservice-dnsjava/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-dnsjava/pom.xml?rev=1132363&r1=1132362&r2=1132363&view=diff
==============================================================================
--- james/server/trunk/dnsservice-dnsjava/pom.xml (original)
+++ james/server/trunk/dnsservice-dnsjava/pom.xml Sun Jun  5 10:07:52 2011
@@ -37,30 +37,8 @@
     </james.osgi.import>
   </properties> 
   
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-         <configuration>       
-           <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> 
-            <manifest>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-        </configuration>       
-        <executions>
-          <execution>
-            <goals>
-              <goal>jar</goal>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+  <build/>
+
   <dependencies>
      <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/lifecycle-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/lifecycle-api/pom.xml?rev=1132363&r1=1132362&r2=1132363&view=diff
==============================================================================
--- james/server/trunk/lifecycle-api/pom.xml (original)
+++ james/server/trunk/lifecycle-api/pom.xml Sun Jun  5 10:07:52 2011
@@ -36,30 +36,7 @@
       *
     </james.osgi.import>
   </properties> 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-         <configuration>       
-           <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> 
-            <manifest>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-        </configuration>       
-        <executions>
-          <execution>
-            <goals>
-              <goal>jar</goal>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+  <build/>
 
   <dependencies>
     <dependency>
@@ -71,4 +48,4 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: james/server/trunk/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1132363&r1=1132362&r2=1132363&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Sun Jun  5 10:07:52 2011
@@ -39,26 +39,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-         <configuration>       
-           <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> 
-            <manifest>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>jar</goal>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <executions>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org