Author: jsdelfino
Date: Tue Nov 20 18:34:28 2007
New Revision: 596910
URL: http://svn.apache.org/viewvc?rev=596910&view=rev
Log:
Fixed up version numbers in poms, manifests, anf feature.xml.
Added:
incubator/tuscany/java/sca/tools/eclipse/features/feature/META-INF/
incubator/tuscany/java/sca/tools/eclipse/features/feature/META-INF/MANIFEST.MF
Modified:
incubator/tuscany/java/sca/tools/eclipse/features/feature/build.properties
incubator/tuscany/java/sca/tools/eclipse/features/feature/feature.xml
incubator/tuscany/java/sca/tools/eclipse/features/feature/pom.xml
incubator/tuscany/java/sca/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
incubator/tuscany/java/sca/tools/eclipse/plugins/core/pom.xml
incubator/tuscany/java/sca/tools/eclipse/plugins/runtime/META-INF/MANIFEST.MF
incubator/tuscany/java/sca/tools/eclipse/plugins/runtime/pom.xml
incubator/tuscany/java/sca/tools/eclipse/site/updatesite/pom.xml
incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml
incubator/tuscany/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
Added:
incubator/tuscany/java/sca/tools/eclipse/features/feature/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/features/feature/META-INF/MANIFEST.MF?rev=596910&view=auto
==============================================================================
---
incubator/tuscany/java/sca/tools/eclipse/features/feature/META-INF/MANIFEST.MF
(added)
+++
incubator/tuscany/java/sca/tools/eclipse/features/feature/META-INF/MANIFEST.MF
Tue Nov 20 18:34:28 2007
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Tuscany SCA Tools
+Bundle-SymbolicName: org.apache.tuscany.sca.feature
+Bundle-Version: 1.1.0
+Bundle-Vendor: Apache Software Foundation
Modified:
incubator/tuscany/java/sca/tools/eclipse/features/feature/build.properties
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/features/feature/build.properties?rev=596910&r1=596909&r2=596910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/features/feature/build.properties
(original)
+++ incubator/tuscany/java/sca/tools/eclipse/features/feature/build.properties
Tue Nov 20 18:34:28 2007
@@ -1,10 +1,12 @@
bin.includes = feature.xml,\
NOTICE,\
LICENSE,\
- DISCLAIMER
+ DISCLAIMER,\
+ META-INF/
src.includes = .project,\
DISCLAIMER,\
LICENSE,\
NOTICE,\
build.properties,\
- feature.xml
+ feature.xml,\
+ META-INF/
Modified: incubator/tuscany/java/sca/tools/eclipse/features/feature/feature.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/features/feature/feature.xml?rev=596910&r1=596909&r2=596910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/features/feature/feature.xml
(original)
+++ incubator/tuscany/java/sca/tools/eclipse/features/feature/feature.xml Tue
Nov 20 18:34:28 2007
@@ -20,7 +20,7 @@
<feature
id="org.apache.tuscany.sca.feature"
label="Apache Tuscany SCA Tools"
- version="1.1.0.0-incubating-SNAPSHOT"
+ version="1.1.0"
provider-name="Apache Software Foundation">
<description url="http://incubator.apache.org/tuscany";>
@@ -28,22 +28,22 @@
</description>
<license url="http://www.apache.org/licenses/LICENSE-2.0";>
- 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
+ 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.
+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.
</license>
<requires>
@@ -66,11 +66,13 @@
id="org.apache.tuscany.sca.core"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="1.1.0"
unpack="false"/>
+
<plugin
id="org.apache.tuscany.sca.runtime"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="1.1.0"/>
+
</feature>
Modified: incubator/tuscany/java/sca/tools/eclipse/features/feature/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/features/feature/pom.xml?rev=596910&r1=596909&r2=596910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/features/feature/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/eclipse/features/feature/pom.xml Tue Nov
20 18:34:28 2007
@@ -26,11 +26,9 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.apache.tuscany.sca.feature</artifactId>
- <version>1.1.0.0-incubating-SNAPSHOT</version>
<name>Apache Tuscany SCA Eclipse Tools Feature</name>
<build>
- <finalName>${artifactId}_${project.version}</finalName>
<resources>
<resource>
<directory>${basedir}</directory>
@@ -41,6 +39,18 @@
</excludes>
</resource>
</resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified:
incubator/tuscany/java/sca/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/core/META-INF/MANIFEST.MF?rev=596910&r1=596909&r2=596910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
(original)
+++ incubator/tuscany/java/sca/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
Tue Nov 20 18:34:28 2007
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Tuscany SCA Tools
Bundle-SymbolicName: org.apache.tuscany.sca.core;singleton:=true
-Bundle-Version: 1.1.0.0-incubating-SNAPSHOT
+Bundle-Version: 1.1.0
Import-Package: org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.core.runtime.jobs,
Modified: incubator/tuscany/java/sca/tools/eclipse/plugins/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/core/pom.xml?rev=596910&r1=596909&r2=596910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/plugins/core/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/eclipse/plugins/core/pom.xml Tue Nov 20
18:34:28 2007
@@ -26,7 +26,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.apache.tuscany.sca.core</artifactId>
- <version>1.1.0.0-incubating-SNAPSHOT</version>
<name>Apache Tuscany SCA Eclipse Tools Core Plugin</name>
<dependencies>
@@ -43,7 +42,6 @@
</dependencies>
<build>
- <finalName>${artifactId}_${project.version}</finalName>
<resources>
<resource>
<directory>${basedir}</directory>
@@ -55,6 +53,18 @@
</excludes>
</resource>
</resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<repositories>
Modified:
incubator/tuscany/java/sca/tools/eclipse/plugins/runtime/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/runtime/META-INF/MANIFEST.MF?rev=596910&r1=596909&r2=596910&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tools/eclipse/plugins/runtime/META-INF/MANIFEST.MF
(original)
+++
incubator/tuscany/java/sca/tools/eclipse/plugins/runtime/META-INF/MANIFEST.MF
Tue Nov 20 18:34:28 2007
@@ -2,5 +2,5 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Tuscany SCA Runtime
Bundle-SymbolicName: org.apache.tuscany.sca.runtime
-Bundle-Version: 1.1.0.0-incubating-SNAPSHOT
+Bundle-Version: 1.1.0
Bundle-Vendor: Apache Software Foundation
Modified: incubator/tuscany/java/sca/tools/eclipse/plugins/runtime/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/runtime/pom.xml?rev=596910&r1=596909&r2=596910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/plugins/runtime/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/eclipse/plugins/runtime/pom.xml Tue Nov 20
18:34:28 2007
@@ -26,11 +26,9 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.apache.tuscany.sca.runtime</artifactId>
- <version>1.1.0.0-incubating-SNAPSHOT</version>
<name>Apache Tuscany SCA Eclipse Tools Runtime Plugin</name>
<build>
- <finalName>${artifactId}_${project.version}</finalName>
<resources>
<resource>
<directory>${basedir}</directory>
@@ -42,6 +40,18 @@
</excludes>
</resource>
</resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: incubator/tuscany/java/sca/tools/eclipse/site/updatesite/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/site/updatesite/pom.xml?rev=596910&r1=596909&r2=596910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/site/updatesite/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/eclipse/site/updatesite/pom.xml Tue Nov 20
18:34:28 2007
@@ -28,24 +28,23 @@
<packaging>pom</packaging>
<artifactId>org.apache.tuscany.sca.updatesite</artifactId>
- <version>1.1.0.0-incubating-SNAPSHOT</version>
<name>Apache Tuscany SCA Eclipse Tools Update Site</name>
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>org.apache.tuscany.sca.core</artifactId>
- <version>1.1.0.0-incubating-SNAPSHOT</version>
+ <version>1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>org.apache.tuscany.sca.runtime</artifactId>
- <version>1.1.0.0-incubating-SNAPSHOT</version>
+ <version>1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>org.apache.tuscany.sca.feature</artifactId>
- <version>1.1.0.0-incubating-SNAPSHOT</version>
+ <version>1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -77,7 +76,6 @@
<descriptor>src/main/assembly/updatesite.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
-
<finalName>${artifactId}_${project.version}</finalName>
</configuration>
</execution>
</executions>
Modified: incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml?rev=596910&r1=596909&r2=596910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml (original)
+++ incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml Tue Nov
20 18:34:28 2007
@@ -3,5 +3,5 @@
<description
url="http://people.apache.org/~jsdelfino/tuscany/tools/updatesite";>
Apache Tuscany SCA Tools.
</description>
- <feature
url="features/org.apache.tuscany.sca.feature_1.1.0.0-incubating-SNAPSHOT.jar"
id="org.apache.tuscany.sca.feature" version="1.1.0.0-incubating-SNAPSHOT"/>
+ <feature url="features/org.apache.tuscany.sca.feature_1.1.0.jar"
id="org.apache.tuscany.sca.feature" version="1.1.0"/>
</site>
Modified:
incubator/tuscany/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml?rev=596910&r1=596909&r2=596910&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
(original)
+++
incubator/tuscany/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
Tue Nov 20 18:34:28 2007
@@ -19,7 +19,7 @@
-->
<assembly>
<id></id>
- <includeBaseDirectory>true</includeBaseDirectory>
+ <includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
@@ -44,6 +44,7 @@
<include>org.apache.tuscany.sca:org.apache.tuscany.sca.runtime</include>
</includes>
<scope>runtime</scope>
+
<outputFileNameMapping>${artifactId}_1.1.0.${extension}</outputFileNameMapping>
</dependencySet>
<dependencySet>
@@ -53,6 +54,7 @@
<include>org.apache.tuscany.sca:org.apache.tuscany.sca.feature</include>
</includes>
<scope>runtime</scope>
+
<outputFileNameMapping>${artifactId}_1.1.0.${extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
