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/08 15:25:27 UTC
[1/4] incubator-taverna-server git commit: README updates
Repository: incubator-taverna-server
Updated Branches:
refs/heads/master 1eda34f2d -> 19b0d1e92
README updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/f339edfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/f339edfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/f339edfb
Branch: refs/heads/master
Commit: f339edfb66c99937d28f407f8fd0d3325f23d56d
Parents: 1eda34f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jan 8 14:25:01 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jan 8 14:25:01 2018 +0000
----------------------------------------------------------------------
README.md | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/f339edfb/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 10fca5f..1f47356 100644
--- a/README.md
+++ b/README.md
@@ -93,8 +93,8 @@ To build, use
This will build each module and run their tests.
-You should then find the equivalent of `TavernaServer.3.1.0-incubating-SNAPSHOT.war`
-in the folder `taverna-server-webapp/target/`
+You should then find `taverna-server.war` in the folder
+`taverna-server-webapp/target/`
## Skipping tests
@@ -114,7 +114,7 @@ that enforces Apache headers in every source file - to disable it, try:
## A Beginner's Installation Guide to Taverna Server
-When installing Taverna Server 2.5, you *need* to decide whether to
+When installing Taverna Server, you *need* to decide whether to
install in secure or insecure mode. In secure mode, the server
enforces logins, ensures that they are done over HTTPS, and applies
strong restrictions to what users can see of other users'
@@ -190,19 +190,19 @@ On RedHat Linux (and derivatives), you install Tomcat with:
You then start Tomcat with:
- sudo service tomcat6 start
+ sudo service tomcat8 start
And stop it with:
- sudo service tomcat6 stop
+ sudo service tomcat8 stop
It's configuration file (called `conf/server.xml` in the instructions below) will be in:
- /etc/tomcat6/server.xml
+ /etc/tomcat8/server.xml
It's webapp directory (`webapps` below) will be in:
- /var/lib/tomcat6
+ /var/lib/tomcat8
### Installing on MacOS X, and using a baseline Apache distribution
@@ -237,9 +237,9 @@ The insecure version is installed by:
### First, place the WAR into Tomcat's webapps directory
-Use a filename that relates to what URL you want Taverna Server to
-appear at within Tomcat (e.g., if you want it to be at
-`/tavernaserver`, use the filename `webapps/tavernaserver.war`).
+You may use a filename that relates to what URL you want Taverna Server to
+appear at within Tomcat (e.g., if you want it to be at `/taverna`, use the
+filename `webapps/taverna.war`).
### Next, start Tomcat (if stopped), and shut it down again once it has unpacked the WAR.
@@ -327,8 +327,12 @@ to do the delegation even when running as a user that can't log in.
### Now, place the WAR into Tomcat's `webapps` directory.
-Use a filename that relates to what URL you want Taverna Server to
-appear at within Tomcat (e.g., if you want it to be at
-`/tavernaserver`, use the filename `webapps/tavernaserver.war`).
+You may use a filename that relates to what URL you want Taverna Server to
+appear at within Tomcat (e.g., if you want it to be deployed at
+`/taverna`, rename the WAR to a filename like `webapps/taverna.war`).
### Finally, start Tomcat.
+
+Taverna Server should then become available at
+the equivalent of http://localhost:8080/taverna-server/
+
[4/4] incubator-taverna-server git commit: Avoid explicit dependencies
Posted by st...@apache.org.
Avoid explicit dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/19b0d1e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/19b0d1e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/19b0d1e9
Branch: refs/heads/master
Commit: 19b0d1e92048db6129ffbe76953e64962e54184d
Parents: 7e8dca4
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jan 8 15:23:08 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jan 8 15:25:07 2018 +0000
----------------------------------------------------------------------
pom.xml | 25 ++++++++++---------------
taverna-server-webapp/pom.xml | 7 +------
2 files changed, 11 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/19b0d1e9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cdba00f..50bcac0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,58 +245,53 @@ executing.</description>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.8</version>
+ <version>${commons.codec.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
+ <version>${commons.collections.version}</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <version>${commons.dbcp.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.3</version>
+ <version>${commons.io.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <version>${commons.lang.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
+ <version>${commons.logging.version}</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <version>1.1.4</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
+ <version>${jaxen.version}</version>
</dependency>
<dependency>
<groupId>net.sf.mime-util</groupId>
<artifactId>mime-util</artifactId>
+ <!-- TODO: Update to https://mvnrepository.com/artifact/eu.medsea.mimeutil/mime-util/2.1.3 -->
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.1</version>
+ <version>${apache.httpclient.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.3</version>
+ <version>${joda-time.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/19b0d1e9/taverna-server-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/pom.xml b/taverna-server-webapp/pom.xml
index d4817ba..cd3b703 100644
--- a/taverna-server-webapp/pom.xml
+++ b/taverna-server-webapp/pom.xml
@@ -114,12 +114,7 @@ limitations under the License.
<artifactId>spring-test</artifactId>
<version>${version.spring}</version>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId><!--$NO-MVN-MAN-VER$-->
- <scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-server-port-description</artifactId>
[3/4] incubator-taverna-server git commit: Avoid duplicate plugins
also in parent pom
Posted by st...@apache.org.
Avoid duplicate plugins also in parent pom
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/7e8dca42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/7e8dca42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/7e8dca42
Branch: refs/heads/master
Commit: 7e8dca422e8047d04f1ead8668f309b9f5f8054f
Parents: 448c261
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jan 8 15:01:22 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jan 8 15:01:22 2018 +0000
----------------------------------------------------------------------
pom.xml | 48 ------------------------------------------------
1 file changed, 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/7e8dca42/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 14ff17b..cdba00f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,14 +62,6 @@ executing.</description>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.4.2</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.9</version>
<configuration>
@@ -81,49 +73,9 @@ executing.</description>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <encoding>US-ASCII</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
<version>1.2</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0.15</version>
- </dependency>
- </dependencies>
- </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
[2/4] incubator-taverna-server git commit: Use newer
apache-taverna-parent
Posted by st...@apache.org.
Use newer apache-taverna-parent
Also newer javadoc plugins
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/448c261c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/448c261c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/448c261c
Branch: refs/heads/master
Commit: 448c261c18dd2cf01928def8234e3534eb9c27a2
Parents: f339edf
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jan 8 14:43:09 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jan 8 14:43:09 2018 +0000
----------------------------------------------------------------------
pom.xml | 30 +++++++-----------------------
1 file changed, 7 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/448c261c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index afeb8b0..14ff17b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.taverna</groupId>
<artifactId>apache-taverna-parent</artifactId>
- <version>2-incubating</version>
+ <version>3-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.taverna.server</groupId>
<artifactId>apache-taverna-server</artifactId>
@@ -256,7 +256,7 @@ executing.</description>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<!-- These refer to files under the Apache license, but which have no comment syntax. -->
<exclude>CITATION</exclude>
<exclude>**/META-INF/MANIFEST.MF</exclude>
@@ -361,7 +361,7 @@ executing.</description>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>3.0.0</version>
<configuration>
<show>protected</show>
<nohelp>true</nohelp>
@@ -415,7 +415,7 @@ executing.</description>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<configuration>
<issueLinkUrl>https://issues.apache.org/jira/browse/%ISSUE%</issueLinkUrl>
</configuration>
@@ -423,7 +423,7 @@ executing.</description>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
+ <version>2.9</version>
</plugin>
</plugins>
</reporting>
@@ -442,7 +442,6 @@ executing.</description>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
</plugin>
</plugins>
</pluginManagement>
@@ -455,7 +454,6 @@ executing.</description>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
<configuration>
<show>private</show>
<nohelp>true</nohelp>
@@ -506,31 +504,17 @@ executing.</description>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.6</version>
- <reportSets>
- <reportSet>
- <id>jira-report</id>
- <reports>
- <report>jira-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
+ <version>3.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.9</version>
+ <version>2.20.1</version>
</plugin>
</plugins>
</reporting>