[maven-release-plugin] copy for tag archetypes-1.3
git-svn-id: https://taverna.googlecode.com/svn/taverna/dev/archetypes/tags/archetypes-1.3@13676 bf327186-88b3-11dd-a302-d386e5130c1c
diff --git a/activity-archetype/pom.xml b/activity-archetype/pom.xml
index 8e72d09..d334181 100644
--- a/activity-archetype/pom.xml
+++ b/activity-archetype/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.taverna.t2.archetypes</groupId>
<artifactId>archetypes</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
<groupId>net.sf.taverna.t2.archetypes</groupId>
<artifactId>taverna-activity-archetype</artifactId>
diff --git a/activity-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/activity-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 61e7244..f5f618b 100644
--- a/activity-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/activity-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -47,11 +47,17 @@
<includes>
<include>**/*.ServiceDescriptionProvider</include>
<include>**/*.ContextualViewFactory</include>
- <include>**/*.png</include>
<include>**/*.MenuComponent</include>
<include>**/*.ActivityIconSPI</include>
</includes>
</fileSet>
+ <fileSet filtered="false">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.png</include>
+ </includes>
+ </fileSet>
+
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
diff --git a/activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/pom.xml b/activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/pom.xml
index cfb791d..d01500d 100644
--- a/activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/pom.xml
+++ b/activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/pom.xml
@@ -117,6 +117,16 @@
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>wsdl-activity</artifactId>
</exclusion>
+ <!-- Perspectives pulling in too many dependencies -->
+ <exclusion>
+ <!-- fails due to direct dependency to WSDL -->
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>perspective-biocatalogue</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>perspective-myexperiment</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/test/java/ui/TavernaWorkbenchWithExamplePlugin.java b/activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/test/java/ui/TavernaWorkbenchWithExamplePlugin.java
index ea1bfc4..81147d0 100644
--- a/activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/test/java/ui/TavernaWorkbenchWithExamplePlugin.java
+++ b/activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/test/java/ui/TavernaWorkbenchWithExamplePlugin.java
@@ -3,7 +3,7 @@
#set( $symbol_escape = '\' )
package ${package}.ui;
-import net.sf.taverna.raven.launcher.Launcher;
+import net.sf.taverna.t2.workbench.dev.DeveloperWorkbench;
/**
* Run with parameters:
@@ -18,7 +18,7 @@
*
*/
public class TavernaWorkbenchWithExamplePlugin {
- public static void main(String[] args) {
- Launcher.main(args);
+ public static void main(String[] args) throws Exception {
+ DeveloperWorkbench.main(args);
}
}
diff --git a/activity-archetype/src/main/resources/archetype-resources/pom.xml b/activity-archetype/src/main/resources/archetype-resources/pom.xml
index f5ada7b..7333c94 100644
--- a/activity-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/activity-archetype/src/main/resources/archetype-resources/pom.xml
@@ -10,11 +10,14 @@
<name>${classPrefix} Taverna project</name>
<properties>
- <t2.core.version>1.2</t2.core.version>
- <t2.activities.version>1.2</t2.activities.version>
- <t2.ui.api.version>1.2</t2.ui.api.version>
- <t2.ui.impl.version>1.2</t2.ui.impl.version>
- <t2.workbench.version>2.2.0</t2.workbench.version>
+ <!-- Update according to latest Taverna version in
+ www.mygrid.org.uk/dev/wiki/display/developer/Maven+module+version+numbers
+ -->
+ <t2.core.version>1.3</t2.core.version>
+ <t2.activities.version>1.3</t2.activities.version>
+ <t2.ui.api.version>1.3</t2.ui.api.version>
+ <t2.ui.impl.version>1.3</t2.ui.impl.version>
+ <t2.workbench.version>2.3.0</t2.workbench.version>
</properties>
<build>
@@ -75,7 +78,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -95,7 +98,7 @@
<!-- The repository that your jars are deployed to -->
<id>my-repository</id>
<name>My Repository</name>
- <url>http://www.example.com/maven/repository</url>
+ <url>http://repository.example.com/maven/repository</url>
</repository>
<repository>
<!-- The repository that your snapshot jars are deployed to -->
@@ -122,7 +125,7 @@
<repository>
<id>my-plugin-site</id>
<name>My Plugin Site</name>
- <url>scpexe://example.com/www/taverna/plugins/</url>
+ <url>scpexe://repository.example.com/www/taverna/plugins/</url>
</repository>
<snapshotRepository>
<id>my-test-plugin-site</id>
diff --git a/activity-translator-archetype/pom.xml b/activity-translator-archetype/pom.xml
index 3f99931..f9091d4 100644
--- a/activity-translator-archetype/pom.xml
+++ b/activity-translator-archetype/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.sf.taverna.t2.archetypes</groupId>
<artifactId>archetypes</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<groupId>net.sf.taverna.t2.archetypes</groupId>
<artifactId>activity-translator-archetype</artifactId>
diff --git a/activity-translator-archetype/src/main/resources/archetype-resources/pom.xml b/activity-translator-archetype/src/main/resources/archetype-resources/pom.xml
index d0869d1..b78c3ce 100644
--- a/activity-translator-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/activity-translator-archetype/src/main/resources/archetype-resources/pom.xml
@@ -32,8 +32,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index d724f05..c31a3d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,11 +11,11 @@
<name>Archetypes</name>
<packaging>pom</packaging>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
<scm>
- <connection>scm:svn:http://taverna.googlecode.com/svn/taverna/dev/archetypes/trunk/</connection>
- <developerConnection>scm:svn:https://taverna.googlecode.com/svn/taverna/dev/archetypes/trunk/</developerConnection>
- <url>http://code.google.com/p/taverna/source/browse/#svn/taverna/dev/archetypes/trunk/</url>
+ <connection>scm:svn:http://taverna.googlecode.com/svn/taverna/dev/archetypes/tags/archetypes-1.3</connection>
+ <developerConnection>scm:svn:https://taverna.googlecode.com/svn/taverna/dev/archetypes/tags/archetypes-1.3</developerConnection>
+ <url>http://code.google.com/p/taverna/source/browse/#svn/taverna/dev/archetypes/tags/archetypes-1.3</url>
</scm>
<build>
<pluginManagement>
