summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-11-09 10:41:20 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-11-09 10:41:20 +0000
commitf7becc40db30f803651d0dcf2b95246b7b31612e (patch)
tree97400eb3241c64a404f0f90aae753292b48a4d12 /sca-java-2.x
parentc4730fc78e19b1afbbc6a811bbf5b8c0b84df889 (diff)
TUSCANY-3751 - now 1.0.7 of the maven-bundle-plugin is released I can remove the snapshot and turn the enforcer back on (merge from beta1)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1032914 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x')
-rw-r--r--sca-java-2.x/trunk/distribution/all/pom.xml13
-rw-r--r--sca-java-2.x/trunk/pom.xml3
2 files changed, 7 insertions, 9 deletions
diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml
index f74f490836..e621bc5bdb 100644
--- a/sca-java-2.x/trunk/distribution/all/pom.xml
+++ b/sca-java-2.x/trunk/distribution/all/pom.xml
@@ -161,10 +161,7 @@
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
<artifactId>maven-bundle-plugin</artifactId>
-<!-- TUSCANY-3674
- <version>1.0.6</version>
--->
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7</version>
<executions>
<execution>
<id>distribution-modules</id>
@@ -235,9 +232,11 @@
</artifactAggregations-->
</configuration>
</execution>
-<!-- TUSCANY-3674
- uncomment when using maven-bundle-plugin v1.0.7-SNAPSHOT
--->
+ <!--
+ The following execution must repeat the same set of artifact
+ manifests as the previous one so that the dependency set that
+ that th executions are working against is the same.
+ -->
<execution>
<id>extensions-build</id>
<phase>process-resources</phase>
diff --git a/sca-java-2.x/trunk/pom.xml b/sca-java-2.x/trunk/pom.xml
index 69fe5f1853..0289dab6df 100644
--- a/sca-java-2.x/trunk/pom.xml
+++ b/sca-java-2.x/trunk/pom.xml
@@ -829,8 +829,7 @@ org.apache.tuscany.sca.assembly:org.apache.tuscany.sca.assembly.builder:org.apac
<message>Best Practice is to always define released plugin versions!</message>
<banLatest>true</banLatest>
<banRelease>true</banRelease>
-<!-- TUSCANY-3674 -->
- <banSnapshots>false</banSnapshots>
+ <banSnapshots>true</banSnapshots>
<phases>clean,deploy,site</phases>
<additionalPlugins>
</additionalPlugins>