summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/distribution/all/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-2.x/trunk/distribution/all/pom.xml')
-rw-r--r--sca-java-2.x/trunk/distribution/all/pom.xml43
1 files changed, 38 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml
index 41e31f8d1b..2b49fe47e1 100644
--- a/sca-java-2.x/trunk/distribution/all/pom.xml
+++ b/sca-java-2.x/trunk/distribution/all/pom.xml
@@ -132,7 +132,7 @@
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6-SNAPSHOT</version>
<executions>
<execution>
<id>distribution-modules</id>
@@ -145,24 +145,57 @@
<useDistributionName>false</useDistributionName>
<generateManifestJar>true</generateManifestJar>
<artifactManifests>
- <artifactManifest>
+ <!--artifactManifest>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.7</version>
- <manifestFile>${basedir}/manifests/axiom-api-1.2.7.MF</manifestFile>
- </artifactManifest>
+ <version>1.2.8</version>
+ <manifestFile>${basedir}/manifests/axiom-api-1.2.8.MF</manifestFile>
+ </artifactManifest-->
<artifactManifest>
<groupId>org.apache.woden</groupId>
<artifactId>woden-impl-dom</artifactId>
<version>1.0M8</version>
<manifestFile>${basedir}/manifests/woden-impl-dom-1.0M8.MF</manifestFile>
</artifactManifest>
+ <!-- artifactAggregations (below) is the right approach to solving the split
+ package between axis-kernel and axis2-transport-http however the Tuscany
+ runtime doesn't take any notice of it so using a fragment at the moment -->
+ <artifactManifest>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>1.5.1</version>
+ <manifestFile>${basedir}/manifests/axis2-kernel-1.5.1.MF</manifestFile>
+ </artifactManifest>
+ <artifactManifest>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>1.5.1</version>
+ <manifestFile>${basedir}/manifests/axis2-transport-http-1.5.1.MF</manifestFile>
+ </artifactManifest>
<artifactManifest>
<groupId>org.apache.axis2</groupId>
<artifactId>*</artifactId>
<version>*</version>
</artifactManifest>
</artifactManifests>
+ <!--artifactAggregations>
+ <artifactAggregation>
+ <symbolicName>org.apache.tuscany.sca.axis2-kernel</symbolicName>
+ <version>1.5.1</version>
+ <artifactMembers>
+ <artifactMember>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>1.5.1</version>
+ </artifactMember>
+ <artifactMember>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>1.5.1</version>
+ </artifactMember>
+ </artifactMembers>
+ </artifactAggregation>
+ </artifactAggregations-->
</configuration>
</execution>
</executions>