You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/03/15 19:56:03 UTC

svn commit: r1301141 - in /cxf/trunk: parent/pom.xml pom.xml

Author: dkulp
Date: Thu Mar 15 18:56:03 2012
New Revision: 1301141

URL: http://svn.apache.org/viewvc?rev=1301141&view=rev
Log:
Update to latest bundle plugin to hopefully fix SNAPSHOT jars built on
jenkins

Modified:
    cxf/trunk/parent/pom.xml
    cxf/trunk/pom.xml

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1301141&r1=1301140&r2=1301141&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu Mar 15 18:56:03 2012
@@ -398,11 +398,9 @@
                             <manifestEntries>
                                 <Specification-Title>${project.name}</Specification-Title>
                                 <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
-                                <Specification-Version>${project.version}</Specification-Version>
                                 <Implementation-Title>${project.name}</Implementation-Title>
                                 <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
                                 <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
-                                <Implementation-Version>${project.version}</Implementation-Version>
                             </manifestEntries>
                         </archive>
                     </configuration>
@@ -473,7 +471,7 @@
                         </goals>
                         <configuration>
                             <versions>
-                                <cxf.osgi.version.clean>$project.version</cxf.osgi.version.clean>
+                                <cxf.osgi.version.clean>${project.version}</cxf.osgi.version.clean>
                             </versions>
                         </configuration>
                     </execution>

Modified: cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=1301141&r1=1301140&r2=1301141&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Thu Mar 15 18:56:03 2012
@@ -49,7 +49,7 @@
         <cxf.xjc-utils.version>2.4.0</cxf.xjc-utils.version>
         <cxf.jdk.version>1.6</cxf.jdk.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
+        <site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
     </properties>
 
     <distributionManagement>
@@ -484,7 +484,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.3.6</version>
+                    <version>2.3.7</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -579,19 +579,6 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>2.4</version>
-                    <configuration>
-                        <archive>
-                            <manifestEntries>
-                                <Specification-Title>${project.name}</Specification-Title>
-                                <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
-                                <Specification-Version>${project.version}</Specification-Version>
-                                <Implementation-Title>${project.name}</Implementation-Title>
-                                <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-                                <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
-                                <Implementation-Version>${project.version}</Implementation-Version>
-                            </manifestEntries>
-                        </archive>
-                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>