You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/09/30 12:55:16 UTC
svn commit: r1003004 - in /tuscany/sca-java-2.x/trunk:
distribution/all/pom.xml pom.xml
Author: slaws
Date: Thu Sep 30 10:55:16 2010
New Revision: 1003004
URL: http://svn.apache.org/viewvc?rev=1003004&view=rev
Log:
maven-bundle-plugin 1.0.7-SNAPSHOT now in the repo so enabling extension meta-data generation in the bin distro. Have to allow the build to use plugin snapshots temporarily.
Modified:
tuscany/sca-java-2.x/trunk/distribution/all/pom.xml
tuscany/sca-java-2.x/trunk/pom.xml
Modified: tuscany/sca-java-2.x/trunk/distribution/all/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/pom.xml?rev=1003004&r1=1003003&r2=1003004&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/all/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/distribution/all/pom.xml Thu Sep 30 10:55:16 2010
@@ -38,17 +38,14 @@
<version>2.0-SNAPSHOT</version>
</dependency>
-<!-- TUSCANY-3674
- uncomment when using maven-bundle-plugin v1.0.7-SNAPSHOT
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime</artifactId>
<type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
--->
-<!-- shouldn't these be in the all feature -->
+<!-- TUSCANY-3674 - shouldn't these be in the all feature -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-domain-node</artifactId>
@@ -196,10 +193,10 @@
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.0.6</version>
<!-- TUSCANY-3674
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.6</version>
-->
+ <version>1.0.7-SNAPSHOT</version>
<executions>
<execution>
<id>distribution-modules</id>
@@ -272,6 +269,7 @@
</execution>
<!-- TUSCANY-3674
uncomment when using maven-bundle-plugin v1.0.7-SNAPSHOT
+-->
<execution>
<id>extensions-build</id>
<phase>process-resources</phase>
@@ -282,7 +280,7 @@
<generateModules>false</generateModules>
<useDistributionName>false</useDistributionName>
<generateManifestJar>true</generateManifestJar>
- <generateConfig>true</generateConfig>
+ <generateConfig>false</generateConfig>
<generateAntScript>true</generateAntScript>
<generateTargetPlatform>false</generateTargetPlatform>
<generateAggregatedBundle>false</generateAggregatedBundle>
@@ -398,12 +396,43 @@
</extension>
</extensions>
+ <artifactManifests>
+ <artifactManifest>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <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>
+ <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>
<excludeGroupIds>
<groupId>org.apache.tuscany.sca.shades</groupId>
</excludeGroupIds>
</configuration>
</execution>
--->
+
<!--
<execution>
<id>distribution-singlebundle</id>
Modified: tuscany/sca-java-2.x/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/pom.xml?rev=1003004&r1=1003003&r2=1003004&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/pom.xml Thu Sep 30 10:55:16 2010
@@ -837,7 +837,8 @@ org.apache.tuscany.sca.assembly:org.apac
<message>Best Practice is to always define released plugin versions!</message>
<banLatest>true</banLatest>
<banRelease>true</banRelease>
- <banSnapshots>true</banSnapshots>
+<!-- TUSCANY-3674 -->
+ <banSnapshots>false</banSnapshots>
<phases>clean,deploy,site</phases>
<additionalPlugins>
</additionalPlugins>