You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/09/23 11:25:02 UTC
svn commit: r818015 - in /servicemix/smx4/bundles/trunk: ./
commons-codec-1.3/ dom4j-1.6.1/ drools-4.0.7/ fastinfoset-1.2.7/
flatpack-3.1.1/ freemarker-2.3.15/ groovy-1.5.6/ javax-mail-1.4.1/
mvel-1.3.16/ mvel-2.0.8/ openjpa-1.2.1/ serp-1.13.1/ twitter...
Author: gnodet
Date: Wed Sep 23 09:25:00 2009
New Revision: 818015
URL: http://svn.apache.org/viewvc?rev=818015&view=rev
Log:
Fix a few more bundles
Added:
servicemix/smx4/bundles/trunk/mvel-1.3.16/
servicemix/smx4/bundles/trunk/mvel-1.3.16/pom.xml
Modified:
servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml
servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml
servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml
servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml
servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml
servicemix/smx4/bundles/trunk/freemarker-2.3.15/pom.xml
servicemix/smx4/bundles/trunk/groovy-1.5.6/pom.xml
servicemix/smx4/bundles/trunk/javax-mail-1.4.1/pom.xml
servicemix/smx4/bundles/trunk/mvel-2.0.8/pom.xml
servicemix/smx4/bundles/trunk/openjpa-1.2.1/pom.xml
servicemix/smx4/bundles/trunk/pom.xml
servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml
servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml
servicemix/smx4/bundles/trunk/xmlsec-1.4.3/pom.xml
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=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml Wed Sep 23 09:25:00 2009
@@ -44,7 +44,6 @@
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
!org.apache.commons.codec*,
- org.apache.commons.httpclient*;resolution:=optional,
*
</servicemix.osgi.import.pkg>
</properties>
Modified: servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml Wed Sep 23 09:25:00 2009
@@ -43,15 +43,15 @@
org.dom4j*
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- com.sun.msv.datatype;resolution:=optional,
- com.sun.msv.datatype.xsd;resolution:=optional,
- org.gjt.xpp;resolution:=optional,
- org.jaxen;resolution:=optional,
- org.jaxen.dom4j;resolution:=optional,
- org.jaxen.pattern;resolution:=optional,
- org.jaxen.saxpath;resolution:=optional,
- org.relaxng.datatype;resolution:=optional,
- org.xmlpull.v1;resolution:=optional,
+ !org.dom4j*,
+ com.sun.msv.datatype*;resolution:=optional,
+ javax.swing*;resolution:=optional,
+ javax.xml.bind*;resolution:=optional;version="[2.0,3)",
+ javax.xml.stream*;version="[1.0,2)",
+ org.gjt.xpp;resolution:=optional;version="[2,3)",
+ org.jaxen*;resolution:=optional;version="[1.1.1,2)",
+ org.relaxng.datatype;resolution:=optional;version="[1,2)",
+ org.xmlpull.v1;resolution:=optional;version="[1.1.3.3,2)",
*
</servicemix.osgi.import.pkg>
</properties>
Modified: servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml Wed Sep 23 09:25:00 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -40,6 +40,7 @@
<pkgArtifactId>drools</pkgArtifactId>
<pkgVersion>4.0.7</pkgVersion>
<servicemix.osgi.import.pkg>
+ !org.drools*,
COM.jrockit*;resolution:=optional,
com.thoughtworks.xstream*;resolution:=optional,
javax.jcr*;resolution:=optional,
@@ -52,12 +53,12 @@
org.eclipse.jdt*;resolution:=optional,
org.tmatesoft*;resolution:=optional,
sun*;resolution:=optional,
+ org.mvel*;version="[1.3,2)",
*
</servicemix.osgi.import.pkg>
- <servicemix.osgi.export>
- org.drools*;version=${pkgVersion};-split-package:=merge-first,
- org.mvel*;version=${pkgVersion};-split-package:=merge-first,
- </servicemix.osgi.export>
+ <servicemix.osgi.export.pkg>
+ org.drools*
+ </servicemix.osgi.export.pkg>
</properties>
<repositories>
Modified: servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml Wed Sep 23 09:25:00 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -40,9 +40,15 @@
<pkgArtifactId>FastInfoset</pkgArtifactId>
<pkgVersion>1.2.7</pkgVersion>
<servicemix.osgi.export.pkg>
- org.jvnet.fastinfoset*,
- com.sun.xml.fastinfoset*
+ org.jvnet.fastinfoset*;version=${pkgVersion},
+ com.sun.xml.fastinfoset*;version=${pkgVersion}
</servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ javax.xml.stream*;version="[1,2)",
+ !org.jvnet.fastinfoset*,
+ !com.sun.xml.fastinfoset*,
+ *
+ </servicemix.osgi.import.pkg>
</properties>
<dependencies>
Modified: servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml Wed Sep 23 09:25:00 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -42,6 +42,13 @@
<servicemix.osgi.export.pkg>
net.sf.flatpack*
</servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ !net.sf.flatpack*,
+ jxl*;resolution:=optional;version="[2.4.2,3)",
+ org.jdom*;resolution:=optional;version="[1.0,2)",
+ org.slf4j*;version="[1.1,2)",
+ *
+ </servicemix.osgi.import.pkg>
</properties>
<dependencies>
Modified: servicemix/smx4/bundles/trunk/freemarker-2.3.15/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/freemarker-2.3.15/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/freemarker-2.3.15/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/freemarker-2.3.15/pom.xml Wed Sep 23 09:25:00 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -40,19 +40,29 @@
<pkgArtifactId>freemarker</pkgArtifactId>
<pkgVersion>2.3.15</pkgVersion>
<servicemix.osgi.import.pkg>
- org.apache.log;resolution:=optional,
- org.apache.tools.ant;resolution:=optional,
- org.apache.xml.utils;resolution:=optional,
- org.apache.xpath*;resolution:=optional,
- org.jaxen*;resolution:=optional,
+ !freemarker*,
+ !com.sun.org.apache*,
+ javax.el*;resolution:=optional;version="[1,2)",
+ javax.servlet*;resolution:=optional;version="[2.5,3)",
+ javax.servlet.jsp*;resolution:=optional;version="[2.1,3)",
+ javax.swing*;resolution:=optional,
+ org.apache.log;resolution:=optional;version="[1.0.1,1.0.1]",
+ org.apache.log4j;resolution:=optional;version="[1.2,2)",
+ org.apache.tools.ant;resolution:=optional;version="[1.7,2)",
+ org.apache.xml.utils;resolution:=optional;version="[2.7,3)",
+ org.apache.xpath*;resolution:=optional;version="[2.7,3)",
+ org.dom4j*;resolution:=optional;version="[1.6.1,2)",
+ org.jaxen*;resolution:=optional;version="[1.1.1,2)",
+ org.jdom*;resolution:=optional;version="[1,2)",
org.mozilla.javascript;resolution:=optional,
- org.python*;resolution:=optional,
+ org.python*;resolution:=optional;version="[2.2.1,2.3)",
org.zeroturnaround.javarebel;resolution:=optional,
*
</servicemix.osgi.import.pkg>
<servicemix.osgi.export>
freemarker*
</servicemix.osgi.export>
+ <servicemix.osgi.failok>true</servicemix.osgi.failok>
</properties>
<dependencies>
Modified: servicemix/smx4/bundles/trunk/groovy-1.5.6/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/groovy-1.5.6/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/groovy-1.5.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/groovy-1.5.6/pom.xml Wed Sep 23 09:25:00 2009
@@ -40,17 +40,20 @@
<pkgArtifactId>groovy</pkgArtifactId>
<pkgVersion>1.5.6</pkgVersion>
<servicemix.osgi.import.pkg>
- com.mockobjects*;resolution:=optional,
- com.thoughtworks.xstream*;resolution:=optional,
- javax.servlet*;resolution:=optional,
+ !groovy*,
+ !org.codehaus.groovy*,
+ antlr*;version="[2.7.6,3)",
+ com.mockobjects*;resolution:=optional;version="[0.9,1)",
+ com.thoughtworks.xstream*;resolution:=optional;version="[1.2.2,2)",
+ javax.servlet*;resolution:=optional;version="[2.4,3)",
javax.swing*;resolution:=optional,
- jline*;resolution:=optional,
- junit*;resolution:=optional,
- org.apache.bsf*;resolution:=optional,
- org.apache.commons.cli*;resolution:=optional,
+ jline*;resolution:=optional;version="[0.9.94,1)",
+ junit*;resolution:=optional;version="[2.8.2,4)",
+ org.apache.bsf*;resolution:=optional;version="[2.4,3)",
+ org.apache.commons.cli*;resolution:=optional;version="[1.1,2)",
org.apache.commons.lang*;resolution:=optional,
- org.apache.tools.ant*;resolution:=optional,
- !groovy.runtime.metaclass*,
+ org.apache.tools.ant*;resolution:=optional;version="[1.7,2)",
+ org.objectweb.asm*;version="[2.2,3)",
*
</servicemix.osgi.import.pkg>
<servicemix.osgi.export>
Modified: servicemix/smx4/bundles/trunk/javax-mail-1.4.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/javax-mail-1.4.1/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/javax-mail-1.4.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/javax-mail-1.4.1/pom.xml Wed Sep 23 09:25:00 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -41,12 +41,12 @@
<pkgVersion>1.4.1</pkgVersion>
<servicemix.osgi.export.pkg>
javax*;-split-package:=merge-first;version="${pkgVersion}",
- com.sun.mail*;-split-package:=merge-first
+ com.sun.mail*;-split-package:=merge-first;version="${pkgVersion}"
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- javax.activation*;version="[1.1,2.0.0)",
- javax.net*;-split-package:=merge-first,
- javax.security*;-split-package:=merge-first
+ javax.activation*;version="[1.1,2)",
+ javax.net*,
+ javax.security*
</servicemix.osgi.import.pkg>
<servicemix.osgi.private.pkg>
META-INF;-split-package:=merge-first,
Added: servicemix/smx4/bundles/trunk/mvel-1.3.16/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/mvel-1.3.16/pom.xml?rev=818015&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/mvel-1.3.16/pom.xml (added)
+++ servicemix/smx4/bundles/trunk/mvel-1.3.16/pom.xml Wed Sep 23 09:25:00 2009
@@ -0,0 +1,96 @@
+<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">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ 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>4-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.mvel</artifactId>
+ <version>2.0.8_2-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache ServiceMix Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+
+ <properties>
+ <pkgGroupId>org.mvel</pkgGroupId>
+ <pkgArtifactId>mvel</pkgArtifactId>
+ <pkgVersion>1.3.16</pkgVersion>
+ <servicemix.osgi.import.pkg>
+ !org.mvel*,
+ !junit*,
+ *
+ </servicemix.osgi.import.pkg>
+ <servicemix.osgi.export.pkg>
+ !org.mvel.tests*,
+ org.mvel*
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.failok>true</servicemix.osgi.failok>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}-java1.5</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${pkgGroupId}:${pkgArtifactId}</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: servicemix/smx4/bundles/trunk/mvel-2.0.8/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/mvel-2.0.8/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/mvel-2.0.8/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/mvel-2.0.8/pom.xml Wed Sep 23 09:25:00 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -40,11 +40,14 @@
<pkgArtifactId>mvel2</pkgArtifactId>
<pkgVersion>2.0.8</pkgVersion>
<servicemix.osgi.import.pkg>
+ !org.mvel2*,
+ !sun.misc,
*
</servicemix.osgi.import.pkg>
- <servicemix.osgi.export>
+ <servicemix.osgi.export.pkg>
org.mvel2*
- </servicemix.osgi.export>
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.failok>true</servicemix.osgi.failok>
</properties>
<dependencies>
Modified: servicemix/smx4/bundles/trunk/openjpa-1.2.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/openjpa-1.2.1/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/openjpa-1.2.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/openjpa-1.2.1/pom.xml Wed Sep 23 09:25:00 2009
@@ -81,8 +81,20 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.openjpa*;version=1.2.1;-split-package:=merge-first</Export-Package>
<Import-Package>
- com.ibm*;resolution:=optional,
- org.postgresql*;resolution:=optional,
+ !org.apache.openjpa*,
+ !com.ibm*,
+ !org.postgresql*,
+ javax.jms*;resolution:=optional;version="[1.1,2)",
+ javax.persistence*;version="[1,2)",
+ javax.transaction*;resolution:=optional;version="[1.1,2)",
+ javax.xml.bind*;version="[2,3)",
+ org.apache.commons.collections*;version="[3.2,4)",
+ org.apache.commons.logging*;version="[1.0,2)",
+ org.apache.commons.lang*;version="[2.1,3)",
+ org.apache.commons.pool*;resolution:=optional;version="[1.3,2)",
+ org.apache.log4j*;resolution:=optional;version="[1.2,2)",
+ org.apache.tools.ant*;resolution:=optional;version="[1.7,2)",
+ serp*;version="[1.13,1.14)",
*
</Import-Package>
<Private-Package>
@@ -92,6 +104,7 @@
<Bundle-Activator>org.apache.servicemix.bundles.openjpa.Activator</Bundle-Activator>
<Implementation-Title>Apache ServiceMix</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
+ <_failok>true</_failok>
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Wed Sep 23 09:25:00 2009
@@ -44,7 +44,7 @@
<module>bundles-pom</module>
<module>abdera-0.4.0-incubating</module>
<module>ant-1.7.0</module>
- <!--<module>antlr-2.7.7</module>-->
+ <module>antlr-2.7.7</module>
<module>antlr-3.0.1</module>
<!--
<module>antlr-runtime-3.0.1</module>
@@ -53,7 +53,7 @@
<module>asm-2.2.3</module>
<module>cglib-2.1_3</module>
<module>commons-codec-1.2</module>
- <!--<module>commons-codec-1.3</module>-->
+ <module>commons-codec-1.3</module>
<module>commons-csv-1.0</module>
<module>commons-dbcp-1.2.2</module>
<module>commons-httpclient-3.1</module>
@@ -63,100 +63,111 @@
<module>commons-lang-2.4</module>
<module>commons-net-1.4.1</module>
<module>commons-vfs-1.0</module>
+
<!--
- <module>dom4j-1.6</module>
- <module>drools-4.0.7</module>
- <module>fastinfoset-1.2.2</module>
- <module>freemarker-2.3.15</module>
- <module>groovy-1.5.6</module>
- <module>howl-1.0.1-1</module>
- <module>jasper-6.0.14</module>
- <module>jaxb-impl-2.1.6</module>
- <module>jdt-core-3.2.3</module>
- <module>jencks-2.1</module>
- <module>jetty-bundle-6.1.12rc1</module>
- <module>jetty-client-6.1.11</module>
- <module>jetty-cometd-6.1.11</module>
- <module>jetty-sslengine-6.1.11</module>
- <module>jline-0.9.94</module>
- <module>jruby-1.1.2</module>
- <module>jsch-0.1.31</module>
- <module>jsmpp-2.0</module>
- <module>junit-3.8.2</module>
- <module>junit-4.4</module>
- <module>mina-1.1.6</module>
- <module>mina-1.1.7</module>
- <module>neethi-2.0.4</module>
- <module>oro-2.0.8</module>
- <module>oscore-2.2.4</module>
- <module>osworkflow-2.7.0</module>
- <module>propertyset-1.3</module>
- <module>quartz-1.5.2</module>
- <module>quartz-1.6.1</module>
- <module>rhino-1.7-R1</module>
- <module>saaj-impl-1.3</module>
- <module>saxon-9.1.0.1</module>
- <module>woodstox-3.2.7</module>
- <module>wsdl4j-1.6.1</module>
- <module>wss4j-1.5.4</module>
- <module>xmlresolver-1.2</module>
- <module>xmlschema-1.4.2</module>
- <module>xmlsec-1.3.0</module>
- <module>abdera-0.4.0-incubating</module>
<module>commons-beanutils-1.7.0</module>
- <module>commons-csv-1.0</module>
- <module>commons-dbcp-1.2.2</module>
- <module>commons-jexl-1.1</module>
- <module>commons-vfs-1.0</module>
+ -->
+
+ <!--
<module>dom4j-1.6</module>
+ -->
+ <module>dom4j-1.6.1</module>
+ <!--
+ <module>drools-4.0.7</module>
+ -->
+ <module>fastinfoset-1.2.7</module>
<module>flatpack-3.1.1</module>
+ <module>freemarker-2.3.15</module>
+ <!--
<module>geronimo-javamail_1.4_provider</module>
+ -->
+ <module>groovy-1.5.6</module>
+ <!--
<module>httpcore-4.0-alpha6</module>
<module>hamcrest-1.1</module>
<module>hamcrest-1.2</module>
<module>hapi-0.5.1</module>
+ <module>howl-1.0.1-1</module>
<module>ibatis-sqlmap-2.3.4.726</module>
<module>irclib-1.10</module>
<module>isorelax-20050913</module>
- <module>jetty-bundle-6.1.14</module>
+ -->
+ <module>javax-mail-1.4.1</module>
+ <!--
+ <module>jaxb-impl-2.1.6</module>
<module>jaxp-ri-1.4.2</module>
+ <module>jasper-6.0.14</module>
<module>jcr-api-1.0</module>
+ <module>jdt-core-3.2.3</module>
<module>jdom-1.1</module>
+ <module>jetty-bundle-6.1.14</module>
<module>jexcelapi-2.4.2</module>
<module>jing-20030619</module>
+ <module>jline-0.9.94</module>
<module>joda-time-1.5.2</module>
<module>josql-1.5</module>
<module>jruby-1.1.2</module>
<module>jsch-0.1.31</module>
<module>juel-2.1.0</module>
+ <module>jruby-1.1.2</module>
+ <module>jsch-0.1.31</module>
+ <module>jsmpp-2.0</module>
+ <module>junit-3.8.2</module>
+ <module>junit-4.4</module>
+ <module>mina-1.1.6</module>
+ <module>mina-1.1.7</module>
+ -->
+ <module>mvel-1.3.16</module>
<module>mvel-2.0.8</module>
- <module>qpid-1.0-incubating-M2.1</module>
+ <!--
+ <module>neethi-2.0.4</module>
+ <module>oro-2.0.8</module>
+ <module>oscore-2.2.4</module>
+ <module>osworkflow-2.7.0</module>
<module>ognl-2.7.3</module>
<module>openjpa-1.2.0</module>
+ -->
+ <module>openjpa-1.2.1</module>
+ <!--
<module>opensaml-1.1</module>
<module>oscache-2.4</module>
+ <module>propertyset-1.3</module>
+ <module>qpid-1.0-incubating-M2.1</module>
+ <module>quartz-1.5.2</module>
+ <module>quartz-1.6.1</module>
<module>rhino-1.7-R1</module>
+ <module>saaj-impl-1.3</module>
+ <module>saxon-9.1.0.1</module>
+ -->
+ <module>serp-1.13.1</module>
+ <!--
<module>smack-3.0.4</module>
<module>stringtemplate-3.2</module>
<module>tagsoup-1.2</module>
+ -->
+ <module>twitter4j-2.0.9</module>
+ <!--
<module>velocity-1.5</module>
- <module>werken-xpath-0.9.4</module>
- <module>xmlbeans-2.4.0</module>
- <module>xmlschema-1.4.3</module>
<module>velocity-1.6.2</module>
+ <module>werken-xpath-0.9.4</module>
+ <module>woodstox-3.2.7</module>
+ <module>wsdl4j-1.6.1</module>
+ <module>wss4j-1.5.4</module>
<module>xalan-2.7.1</module>
<module>xalan-serializer-2.7.1</module>
<module>xerces-2.9.1</module>
+ <module>xmlbeans-2.4.0</module>
+ <module>xmlresolver-1.2</module>
+ <module>xmlschema-1.4.2</module>
+ <module>xmlschema-1.4.3</module>
+ <module>xmlsec-1.3.0</module>
<module>xmlsec-1.4.2</module>
+ -->
+ <module>xmlsec-1.4.3</module>
+ <!--
<module>xpp3-1.1.4c</module>
<module>xstream-1.3</module>
-->
- <module>xmlsec-1.4.3</module>
- <module>javax-mail-1.4.1</module>
- <module>twitter4j-2.0.9</module>
- <module>openjpa-1.2.1</module>
- <module>serp-1.13.1</module>
- <module>dom4j-1.6.1</module>
</modules>
</project>
Modified: servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml Wed Sep 23 09:25:00 2009
@@ -62,11 +62,12 @@
<pkgArtifactId>serp</pkgArtifactId>
<pkgVersion>1.13.1</pkgVersion>
<servicemix.osgi.export.pkg>
- serp.bytecode.visitor,
- serp.bytecode,
- serp.bytecode.lowlevel,
- serp.util
+ serp*
</servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ !serp*,
+ *
+ </servicemix.osgi.import.pkg>
</properties>
</project>
Modified: servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml Wed Sep 23 09:25:00 2009
@@ -43,21 +43,15 @@
twitter4j*
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- com.sun.syndication.feed.synd;resolution:=optional,
- com.sun.syndication.io;resolution:=optional,
- dalvik.system;resolution:=optional,
+ !twitter4j*,
+ com.sun.syndication.*;resolution:=optional;version="[0.9,1)",
+ !dalvik.system*,
javax.crypto;resolution:=optional,
javax.crypto.spec;resolution:=optional,
- javax.xml.parsers;resolution:=optional,
- org.slf4j;resolution:=optional,
- org.w3c.dom;resolution:=optional,
- org.xml.sax;resolution:=optional,
- twitter4j;resolution:=optional,
- twitter4j.examples;resolution:=optional,
- twitter4j.http;resolution:=optional,
- twitter4j.org.json;resolution:=optional,
+ org.slf4j;resolution:=optional;version="[1.2.15,2)",
*
</servicemix.osgi.import.pkg>
+ <servicemix.osgi.failok>true</servicemix.osgi.failok>
</properties>
<dependencies>
Modified: servicemix/smx4/bundles/trunk/xmlsec-1.4.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xmlsec-1.4.3/pom.xml?rev=818015&r1=818014&r2=818015&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xmlsec-1.4.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xmlsec-1.4.3/pom.xml Wed Sep 23 09:25:00 2009
@@ -40,14 +40,16 @@
<pkgArtifactId>xmlsec</pkgArtifactId>
<pkgVersion>1.4.3</pkgVersion>
<servicemix.osgi.export.pkg>
- org.apache.xml.security*;-split-package:=merge-first,
- org.jcp.xml*;-split-package:=merge-first,
- javax.xml.crypto*
+ org.apache.xml.security*;-split-package:=merge-first;version=${pkgVersion},
+ org.jcp.xml*;-split-package:=merge-first;version=${pkgVersion},
+ javax.xml.crypto*;version=${pkgVersion}
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- org.apache.xml.dtm*;resolution:=optional,
- org.apache.xml.utils*;resolution:=optional,
- org.apache.xpath*;resolution:=optional,
+ !org.apache.xml.security*,
+ org.apache.commons.logging;version="[1.1,2)"
+ org.apache.xml.dtm*;resolution:=optional;version="[2.7,3)",
+ org.apache.xml.utils*;resolution:=optional;version="[2.7,3)",
+ org.apache.xpath*;resolution:=optional;version="[2.7,3)",
*
</servicemix.osgi.import.pkg>
</properties>