You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 12:54:50 UTC
[42/49] incubator-taverna-workbench-product git commit: Changed
update and plugin site locations
Changed update and plugin site locations
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16454 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/7bb803c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/7bb803c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/7bb803c5
Branch: refs/heads/master
Commit: 7bb803c5e89c7754ab3ca924c1f835b128706d73
Parents: a444279
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Wed Dec 11 12:56:37 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Wed Dec 11 12:56:37 2013 +0000
----------------------------------------------------------------------
pom.xml | 56 +++++++++++++++++------
src/main/assembly/dependencies-component.xml | 11 -----
2 files changed, 41 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/7bb803c5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b9428ba..d5035b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,31 +13,63 @@
<packaging>taverna-application</packaging>
<profiles>
<profile>
- <id>developer</id>
+ <id>dev</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<assembly.descriptor>src/main/assembly/developer-assembly.xml</assembly.descriptor>
- <profile.updateSite>http://dev.mygrid.org.uk/taverna/updates/taverna-workbench/</profile.updateSite>
- <profile.pluginSite>http://dev.mygrid.org.uk/taverna/plugins/taverna-workbench/</profile.pluginSite>
+ <profile.updateSite>http://updates.taverna.org.uk/workbench/3.0/dev/</profile.updateSite>
+ <profile.pluginSite>http://updates.taverna.org.uk/workbench/3.0/dev/plugins/</profile.pluginSite>
</properties>
+ <distributionManagement>
+ <repository>
+ <id>dev</id>
+ <url>file:///local/www/taverna/updates/3/workbench/3.0/dev</url>
+ </repository>
+ </distributionManagement>
</profile>
<profile>
- <id>nightly</id>
+ <id>beta</id>
<properties>
<assembly.descriptor>src/main/assembly/nightly-assembly.xml</assembly.descriptor>
- <profile.updateSite>http://dev.mygrid.org.uk/taverna/updates/taverna-workbench/</profile.updateSite>
- <profile.pluginSite>http://dev.mygrid.org.uk/taverna/plugins/taverna-workbench/</profile.pluginSite>
+ <profile.updateSite>http://updates.taverna.org.uk/workbench/3.0/beta/</profile.updateSite>
+ <profile.pluginSite>http://updates.taverna.org.uk/workbench/3.0/beta/plugins/</profile.pluginSite>
</properties>
+ <distributionManagement>
+ <repository>
+ <id>beta</id>
+ <url>file:///local/www/taverna/updates/3/workbench/3.0/beta</url>
+ </repository>
+ </distributionManagement>
</profile>
<profile>
- <id>release</id>
+ <id>stable</id>
<properties>
<assembly.descriptor>src/main/assembly/release-assembly.xml</assembly.descriptor>
- <profile.updateSite>http://www.mygrid.org.uk/taverna/updates/taverna-workbench/</profile.updateSite>
- <profile.pluginSite>http://www.mygrid.org.uk/taverna/plugins/taverna-workbench/</profile.pluginSite>
+ <profile.updateSite>http://updates.taverna.org.uk/workbench/3.0/stable/</profile.updateSite>
+ <profile.pluginSite>http://updates.taverna.org.uk/workbench/3.0/stable/plugins/</profile.pluginSite>
</properties>
+ <distributionManagement>
+ <repository>
+ <id>stable</id>
+ <url>file:///local/www/taverna/updates/3/workbench/3.0/stable</url>
+ </repository>
+ </distributionManagement>
+ </profile>
+ <profile>
+ <id>nightly</id>
+ <properties>
+ <assembly.descriptor>src/main/assembly/nightly-assembly.xml</assembly.descriptor>
+ <profile.updateSite>http://updates.taverna.org.uk/workbench/3.0/dev/</profile.updateSite>
+ <profile.pluginSite>http://updates.taverna.org.uk/workbench/3.0/dev/plugins/</profile.pluginSite>
+ </properties>
+ <distributionManagement>
+ <repository>
+ <id>dev</id>
+ <url>file:///local/www/taverna/updates/3/workbench/3.0/dev</url>
+ </repository>
+ </distributionManagement>
</profile>
</profiles>
<build>
@@ -160,12 +192,6 @@
</plugins>
</pluginManagement>
</build>
- <distributionManagement>
- <snapshotRepository>
- <id>dev</id>
- <url>file:///Users/david/Sites/taverna/updates/taverna-workbench</url>
- </snapshotRepository>
- </distributionManagement>
<dependencies>
<!-- Explicit org.osgi.* with <scope>provided as these are also provided
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/7bb803c5/src/main/assembly/dependencies-component.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/dependencies-component.xml b/src/main/assembly/dependencies-component.xml
index 486574c..0e8640e 100644
--- a/src/main/assembly/dependencies-component.xml
+++ b/src/main/assembly/dependencies-component.xml
@@ -3,17 +3,6 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
- <!-- <dependencySets>
- <dependencySet>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <outputDirectory>/lib/${artifact.groupId}</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <excludes>
- Exclude ourselves
- <exclude>uk.org.taverna.workbench:taverna-workbench-product</exclude>
- </excludes>
- </dependencySet>
- </dependencySets> -->
<fileSets>
<fileSet>