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 2018/01/05 13:41:21 UTC
[1/3] incubator-taverna-engine git commit: TAVERNA-977
Repository: incubator-taverna-engine
Updated Branches:
refs/heads/master 4c66d1d65 -> 503c1e782
TAVERNA-977
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/21c08720
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/21c08720
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/21c08720
Branch: refs/heads/master
Commit: 21c08720e3a30ba8c722f04981e0e5a5f24fed80
Parents: 513fd37
Author: Chalana Madusanka <Chalana Madusanka>
Authored: Wed Sep 20 19:18:15 2017 +0530
Committer: Chalana Madusanka <Chalana Madusanka>
Committed: Wed Sep 20 19:18:15 2017 +0530
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 3 +++
taverna-reference-impl/pom.xml | 3 +--
taverna-workflowmodel-impl/pom.xml | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/21c08720/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml b/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
index 8e54ab3..ce2ef9f 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
@@ -60,6 +60,9 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <skipIfEmpty>true</skipIfEmpty>
+ </configuration>
<executions>
<execution>
<goals>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/21c08720/taverna-reference-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/pom.xml b/taverna-reference-impl/pom.xml
index 0222021..65042c3 100644
--- a/taverna-reference-impl/pom.xml
+++ b/taverna-reference-impl/pom.xml
@@ -51,10 +51,9 @@
<instructions>
<Import-Package>
org.aspectj.lang,
- org.springframework.orm.*,
*
</Import-Package>
- <!-- <Import-Package> org.aspectj.lang;resolution:=optional, org.springframework.orm.*;resolution:=optional,
+ <!-- <Import-Package> org.aspectj.lang;resolution:=optional, org.springframework.orm.*;resolution:=optional,
org.hibernate.*;resolution:=optional, org.hibernate.proxy;resolution:=optional,
org.apache.derby.jdbc, * </Import-Package> -->
</instructions>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/21c08720/taverna-workflowmodel-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/pom.xml b/taverna-workflowmodel-impl/pom.xml
index b894b92..10d1597 100644
--- a/taverna-workflowmodel-impl/pom.xml
+++ b/taverna-workflowmodel-impl/pom.xml
@@ -44,6 +44,7 @@
org.apache.taverna.invocation.impl,
org.apache.taverna.workflowmodel.impl,
org.apache.taverna.workflowmodel.processor.iteration.impl,
+ org.apache.taverna.workflowmodel.processor.dispatch.impl,
</Export-Package>
</instructions>
</configuration>
[2/3] incubator-taverna-engine git commit: Merge branch 'master' of
https://github.com/Chalana/incubator-taverna-engine
Posted by st...@apache.org.
Merge branch 'master' of https://github.com/Chalana/incubator-taverna-engine
TAVERNA-977 Fixes bundle plugin build erroirs
Contributed by Chalana in #4
Signed-off-by: Stian Soiland-Reyes <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/f9cb14f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/f9cb14f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/f9cb14f4
Branch: refs/heads/master
Commit: f9cb14f4218d5f1df4a40902cd8af7499a2babf9
Parents: 4c66d1d 21c0872
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Jan 5 13:22:57 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Jan 5 13:24:14 2018 +0000
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 3 +++
taverna-reference-impl/pom.xml | 3 +--
taverna-workflowmodel-impl/pom.xml | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-taverna-engine git commit: TAVERNA-977 Lock down
plugin versions, upgrade jackson
Posted by st...@apache.org.
TAVERNA-977 Lock down plugin versions, upgrade jackson
..to silence warnings.
Only remaining error now is:
[INFO] [WARNING] Not an OSGi bundle : junit:junit:jar:4.12
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/503c1e78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/503c1e78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/503c1e78
Branch: refs/heads/master
Commit: 503c1e78245f2a6e2295dbf26eab78682f3c3f9d
Parents: f9cb14f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Jan 5 13:40:45 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Jan 5 13:40:45 2018 +0000
----------------------------------------------------------------------
.../__rootArtifactId__-activity-ui/pom.xml | 2 +-
.../__rootArtifactId__-activity/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 17 ++++++++++++++---
3 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/503c1e78/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/pom.xml b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/pom.xml
index 2c41d63..8b72a62 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/pom.xml
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.3.0</version>
+ <version>2.9.0</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/503c1e78/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/pom.xml b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/pom.xml
index 79c3cbc..f56764d 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/pom.xml
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.3.0</version>
+ <version>2.9.0</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/503c1e78/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml b/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
index ce2ef9f..d1f26ca 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
@@ -42,6 +42,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -49,6 +50,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
+ <version>3.0.0</version>
<executions>
<execution>
<goals>
@@ -60,6 +62,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
+ <version>3.0.0</version>
<configuration>
<skipIfEmpty>true</skipIfEmpty>
</configuration>
@@ -73,6 +76,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.19.1</version>
<configuration>
<skip>false</skip>
<systemProperties>
@@ -99,7 +103,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.4</version>
+ <version>3.4.0</version>
<extensions>true</extensions>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
@@ -112,7 +116,7 @@
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
- <groupId>org.apache.taverna.orgi</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-maven-plugin</artifactId>
<versionRange>[\${taverna.osgi.version},)</versionRange>
<goals>
@@ -132,10 +136,17 @@
</build>
<dependencies>
+ <!-- Dependencies common for both sub-modules -->
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.2</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>