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 2012/01/24 07:46:09 UTC
svn commit: r1235141 - in /servicemix/smx4/bundles/trunk: ./ castor-1.3.2/
cglib-2.2.2/ cometd-java-server-2.3.1/ commons-attributes-2.1/
commons-beanutils-1.7.0/ commons-beanutils-1.8.2/ commons-codec-1.2/
commons-codec-1.3/ commons-collections-3.2.1/...
Author: jbonofre
Date: Tue Jan 24 06:46:08 2012
New Revision: 1235141
URL: http://svn.apache.org/viewvc?rev=1235141&view=rev
Log:
[SMX4-919] Resuming inclusion of the sources artifact in the bundles
Modified:
servicemix/smx4/bundles/trunk/castor-1.3.2/pom.xml
servicemix/smx4/bundles/trunk/cglib-2.2.2/pom.xml
servicemix/smx4/bundles/trunk/cometd-java-server-2.3.1/pom.xml
servicemix/smx4/bundles/trunk/commons-attributes-2.1/pom.xml
servicemix/smx4/bundles/trunk/commons-beanutils-1.7.0/pom.xml
servicemix/smx4/bundles/trunk/commons-beanutils-1.8.2/pom.xml
servicemix/smx4/bundles/trunk/commons-codec-1.2/pom.xml
servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml
servicemix/smx4/bundles/trunk/commons-collections-3.2.1/pom.xml
servicemix/smx4/bundles/trunk/commons-configuration-1.4/pom.xml
servicemix/smx4/bundles/trunk/commons-csv-1.0/pom.xml
servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/pom.xml
servicemix/smx4/bundles/trunk/commons-dbcp-1.3/pom.xml
servicemix/smx4/bundles/trunk/commons-dbcp-1.4/pom.xml
servicemix/smx4/bundles/trunk/commons-digester-1.8/pom.xml
servicemix/smx4/bundles/trunk/commons-httpclient-3.1/pom.xml
servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml
servicemix/smx4/bundles/trunk/pom.xml
Modified: servicemix/smx4/bundles/trunk/castor-1.3.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/castor-1.3.2/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/castor-1.3.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/castor-1.3.2/pom.xml Tue Jan 24 06:46:08 2012
@@ -69,6 +69,22 @@
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}-core</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}-xml</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
Modified: servicemix/smx4/bundles/trunk/cglib-2.2.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/cglib-2.2.2/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/cglib-2.2.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/cglib-2.2.2/pom.xml Tue Jan 24 06:46:08 2012
@@ -57,6 +57,15 @@
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}-nodep</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
Modified: servicemix/smx4/bundles/trunk/cometd-java-server-2.3.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/cometd-java-server-2.3.1/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/cometd-java-server-2.3.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/cometd-java-server-2.3.1/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -18,23 +18,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>6</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
-
+
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cometd-java-server</artifactId>
<version>2.3.1_2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-
+
<properties>
<pkgGroupId>org.cometd.java</pkgGroupId>
<pkgArtifactId>cometd-java-server</pkgArtifactId>
@@ -48,15 +48,25 @@
*
</servicemix.osgi.import.pkg>
</properties>
-
+
<dependencies>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -76,10 +86,10 @@
</artifactSet>
<filters>
<filter>
- <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
+ <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
</filter>
</filters>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
@@ -90,4 +100,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-attributes-2.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-attributes-2.1/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-attributes-2.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-attributes-2.1/pom.xml Tue Jan 24 06:46:08 2012
@@ -18,23 +18,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>6</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
-
+
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-attributes</artifactId>
<packaging>bundle</packaging>
<version>2.1_3-SNAPSHOT</version>
<name>Apache ServiceMix :: Bundles :: commons-attributes</name>
- <description>This OSGi bundle wraps commons-attributes-api and commons-attributes-plugin ${pkgVersion} jar files.</description>
-
+ <description>This OSGi bundle wraps commons-attributes-api and commons-attributes-plugin ${pkgVersion} jar files.
+ </description>
+
<properties>
<pkgGroupId>commons-attributes</pkgGroupId>
<pkgVersion>2.1</pkgVersion>
@@ -46,7 +47,7 @@
*
</servicemix.osgi.import.pkg>
</properties>
-
+
<dependencies>
<dependency>
<groupId>${pkgGroupId}</groupId>
@@ -60,8 +61,26 @@
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
+
+ <!-- sources -->
+ <!-- Not available on Central
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>commons-attributes-api</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>commons-attributes-plugin</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
+ -->
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -102,4 +121,5 @@
</plugin>
</plugins>
</build>
+
</project>
\ No newline at end of file
Modified: servicemix/smx4/bundles/trunk/commons-beanutils-1.7.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-beanutils-1.7.0/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-beanutils-1.7.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-beanutils-1.7.0/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -21,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>6</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>8-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -57,6 +58,16 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -93,4 +104,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-beanutils-1.8.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-beanutils-1.8.2/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-beanutils-1.8.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-beanutils-1.8.2/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -21,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>6</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>8-SNAPSHOT</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -57,6 +58,16 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -93,4 +104,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-codec-1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-codec-1.2/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-codec-1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-codec-1.2/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -21,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>6</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>8-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -51,7 +52,19 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
+ <optional>true</optional>
</dependency>
+
+ <!-- sources -->
+ <!-- Not available on Central
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
+ -->
</dependencies>
<build>
@@ -87,4 +100,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -21,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>6</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>8-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -52,6 +53,16 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -88,4 +99,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-collections-3.2.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-collections-3.2.1/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-collections-3.2.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-collections-3.2.1/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -21,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>6</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>8-SNAPSHOT</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -42,7 +43,6 @@
org.apache.commons.collections
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- !org.apache.commons.collections*,
*
</servicemix.osgi.import.pkg>
</properties>
@@ -52,6 +52,16 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -88,4 +98,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-configuration-1.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-configuration-1.4/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-configuration-1.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-configuration-1.4/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -23,8 +24,8 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>6</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
+ <version>8-SNAPSHOT</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -42,7 +43,6 @@
org.apache.commons.configuration
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- !org.apache.commons.configuration*,
*
</servicemix.osgi.import.pkg>
</properties>
@@ -52,6 +52,16 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -88,4 +98,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-csv-1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-csv-1.0/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-csv-1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-csv-1.0/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -23,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>6</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -42,7 +43,6 @@
org.apache.commons.csv
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- !org.apache.commons.csv*,
*
</servicemix.osgi.import.pkg>
</properties>
@@ -54,10 +54,20 @@
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
+
+ <!-- sources -->
+ <!-- Not available on SMX M2 repo
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
+ -->
</dependencies>
-
+
<repositories>
- <!-- ServiceMix repo -->
<repository>
<id>servicemix</id>
<name>Apache ServiceMix Repository</name>
@@ -98,4 +108,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -23,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>6</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -39,12 +40,10 @@
<pkgArtifactId>commons-dbcp</pkgArtifactId>
<pkgVersion>1.2.2</pkgVersion>
<servicemix.osgi.export>
- org.apache.commons.dbcp*;version=${pkgVersion},
- org.apache.commons.jocl*;version=${pkgVersion}
+ org.apache.commons.dbcp*;version=${pkgVersion};-split-package:=merge-first,
+ org.apache.commons.jocl*;version=${pkgVersion};-split-package:=merge-first
</servicemix.osgi.export>
<servicemix.osgi.import.pkg>
- !org.apache.commons.dbcp*,
- !org.apache.commons.jocl*,
org.apache.commons.pool*;version="[1.3,2)",
*
</servicemix.osgi.import.pkg>
@@ -60,6 +59,17 @@
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
+
+ <!-- sources -->
+ <!-- Not available on Central
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
+ -->
</dependencies>
<build>
@@ -95,4 +105,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-dbcp-1.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-dbcp-1.3/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-dbcp-1.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-dbcp-1.3/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -23,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>6</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -39,12 +40,10 @@
<pkgArtifactId>commons-dbcp</pkgArtifactId>
<pkgVersion>1.3</pkgVersion>
<servicemix.osgi.export>
- org.apache.commons.dbcp*;version=${pkgVersion},
- org.apache.commons.jocl*;version=${pkgVersion}
+ org.apache.commons.dbcp*;version=${pkgVersion};-split-package:=merge-first,
+ org.apache.commons.jocl*;version=${pkgVersion};-split-package:=merge-first
</servicemix.osgi.export>
<servicemix.osgi.import.pkg>
- !org.apache.commons.dbcp*,
- !org.apache.commons.jocl*,
org.apache.commons.pool*;version="[1.3,2)",
*
</servicemix.osgi.import.pkg>
@@ -60,6 +59,15 @@
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
@@ -95,4 +103,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-dbcp-1.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-dbcp-1.4/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-dbcp-1.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-dbcp-1.4/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -23,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>6</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
@@ -39,14 +40,10 @@
<pkgArtifactId>commons-dbcp</pkgArtifactId>
<pkgVersion>1.4</pkgVersion>
<servicemix.osgi.export>
- org.apache.commons.dbcp*;version=${pkgVersion},
- org.apache.commons.jocl*;version=${pkgVersion},
- org.apache.commons.dbcp.managed*;version=${pkgVersion}
+ org.apache.commons.dbcp*;version=${pkgVersion};-split-package:=merge-first,
+ org.apache.commons.jocl*;version=${pkgVersion};-split-package:=merge-first
</servicemix.osgi.export>
<servicemix.osgi.import.pkg>
- !org.apache.commons.dbcp*,
- !org.apache.commons.jocl*,
- !org.apache.commons.dbcp.managed*,
org.apache.commons.pool*;version="[1.3,2)",
*
</servicemix.osgi.import.pkg>
@@ -62,6 +59,15 @@
<version>${pkgVersion}</version>
<optional>true</optional>
</dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
@@ -97,4 +103,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-digester-1.8/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-digester-1.8/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-digester-1.8/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-digester-1.8/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -23,8 +24,8 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>6</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
+ <version>8-SNAPSHOT</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -42,7 +43,6 @@
org.apache.commons.digester
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- !org.apache.commons.digester*,
*
</servicemix.osgi.import.pkg>
</properties>
@@ -52,6 +52,16 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -88,4 +98,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-httpclient-3.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-httpclient-3.1/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-httpclient-3.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-httpclient-3.1/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -21,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>6</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>8-SNAPSHOT</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -42,8 +43,7 @@
org.apache.commons.httpclient
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- !org.apache.commons.httpclient*,
- org.apache.commons.logging*;version="[1.1,2)",
+ org.apache.commons.logging*;version="[1.1,2)";resolution:=optional,
*
</servicemix.osgi.import.pkg>
</properties>
@@ -53,6 +53,7 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
+ <optional>true</optional>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
@@ -65,6 +66,21 @@
<artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
<version>1.3_2</version>
</dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
@@ -100,4 +116,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml Tue Jan 24 06:46:08 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -21,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>6</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>8-SNAPSHOT</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -42,7 +43,6 @@
org.apache.commons.io
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- !org.apache.commons.io*,
*
</servicemix.osgi.import.pkg>
</properties>
@@ -52,6 +52,16 @@
<groupId>${pkgGroupId}</groupId>
<artifactId>${pkgArtifactId}</artifactId>
<version>${pkgVersion}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -88,4 +98,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1235141&r1=1235140&r2=1235141&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Tue Jan 24 06:46:08 2012
@@ -71,6 +71,16 @@
<module>beanlib-5.0.2beta</module>
<module>casbah-2.1.2</module>
<module>castor-0.9.6</module>
+ <module>castor-1.3.2</module>
+ <module>cglib-2.2.2</module>
+ <module>cometd-java-server-2.3.1</module>
+ <module>commons-beanutils-1.8.2</module>
+ <module>commons-codec-1.3</module>
+ <module>commons-collections-3.2.1</module>
+ <module>commons-configuration-1.4</module>
+ <module>commons-dbcp-1.4</module>
+ <module>commons-digester-1.8</module>
+ <module>commons-httpclient-3.1</module>
<module>smack-3.2.1</module>
<module>paranamer-2.4</module>
@@ -84,8 +94,6 @@
<module>saxon-9.3.0.11</module>
<module>saxon-9.4.0.1</module>
<module>junit-4.10</module>
- <module>castor-1.3.2</module>
- <module>cglib-2.2.2</module>
<module>derbynet-10.8.2.2</module>
<module>dozer-5.3.2</module>
<module>ehcache-2.5.0</module>