You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/06/26 07:41:06 UTC
svn commit: r958182 - in /servicemix/smx4/bundles/trunk:
jetty-bundle-6.1.14/pom.xml jetty-bundle-6.1.19/pom.xml
jetty-bundle-6.1.22/pom.xml
Author: jbonofre
Date: Sat Jun 26 05:41:06 2010
New Revision: 958182
URL: http://svn.apache.org/viewvc?rev=958182&view=rev
Log:
[SMX4-541] Jetty bundle export package statement is not correct.
Modified:
servicemix/smx4/bundles/trunk/jetty-bundle-6.1.14/pom.xml
servicemix/smx4/bundles/trunk/jetty-bundle-6.1.19/pom.xml
servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml
Modified: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.14/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-bundle-6.1.14/pom.xml?rev=958182&r1=958181&r2=958182&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-bundle-6.1.14/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-bundle-6.1.14/pom.xml Sat Jun 26 05:41:06 2010
@@ -30,16 +30,15 @@
<artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
<packaging>bundle</packaging>
<version>6.1.14_3-SNAPSHOT</version>
- <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${artifactVersion}</name>
+ <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
- This bundle simply wraps ${pkgArtifactId}-${artifactVersion}.jar.
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
<properties>
<pkgGroupId>org.mortbay.jetty</pkgGroupId>
<pkgArtifactId>jetty</pkgArtifactId>
<pkgVersion>6.1.14</pkgVersion>
- <artifactVersion>6.1.14</artifactVersion>
<servicemix.osgi.export.pkg>org.mortbay</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
!org.mortbay*,
@@ -51,31 +50,31 @@
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty-management</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty-util</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty-sslengine</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty-client</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
</dependencies>
Modified: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.19/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-bundle-6.1.19/pom.xml?rev=958182&r1=958181&r2=958182&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-bundle-6.1.19/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-bundle-6.1.19/pom.xml Sat Jun 26 05:41:06 2010
@@ -30,16 +30,15 @@
<artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
<packaging>bundle</packaging>
<version>6.1.19_3-SNAPSHOT</version>
- <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${artifactVersion}</name>
+ <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
- This bundle simply wraps ${pkgArtifactId}-${artifactVersion}.jar.
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
<properties>
<pkgGroupId>org.mortbay.jetty</pkgGroupId>
<pkgArtifactId>jetty</pkgArtifactId>
<pkgVersion>6.1.19</pkgVersion>
- <artifactVersion>6.1.19</artifactVersion>
<servicemix.osgi.export.pkg>org.mortbay</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
!org.mortbay*,
@@ -51,31 +50,31 @@
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty-management</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty-util</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty-sslengine</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty-client</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
</dependencies>
Modified: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml?rev=958182&r1=958181&r2=958182&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml Sat Jun 26 05:41:06 2010
@@ -30,9 +30,9 @@
<artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
<packaging>bundle</packaging>
<version>6.1.22_2-SNAPSHOT</version>
- <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${artifactVersion}</name>
+ <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
- This bundle simply wraps ${pkgArtifactId}-${artifactVersion}.jar.
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
<properties>
@@ -51,31 +51,31 @@
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty-management</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty-util</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty-sslengine</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>jetty-client</artifactId>
- <version>${artifactVersion}</version>
+ <version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
</dependencies>