Repository: incubator-taverna-server Updated Branches: refs/heads/master b8fc61d45 -> 481b4dd57
Corrections to make the build proceed to completion. 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/481b4dd5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/481b4dd5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/481b4dd5 Branch: refs/heads/master Commit: 481b4dd572b081f7c71282b2da46fa32125202fd Parents: b8fc61d Author: Donal Fellows <[email protected]> Authored: Tue Jul 5 14:27:34 2016 +0100 Committer: Donal Fellows <[email protected]> Committed: Tue Jul 5 14:27:34 2016 +0100 ---------------------------------------------------------------------- pom.xml | 65 ++++----- taverna-server-client/pom.xml | 41 ++++++ taverna-server-distribution/pom.xml | 4 +- taverna-server-webapp/pom.xml | 141 +++++++++---------- .../localworker/AbstractRemoteRunFactory.java | 5 +- 5 files changed, 141 insertions(+), 115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/481b4dd5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 49a07aa..c0ae63e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,18 +16,18 @@ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.taverna</groupId> - <artifactId>apache-taverna-parent</artifactId> - <version>2-incubating</version> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.taverna</groupId> + <artifactId>apache-taverna-parent</artifactId> + <version>2-incubating</version> + </parent> <groupId>org.apache.taverna.server</groupId> <artifactId>apache-taverna-server</artifactId> <version>3.1.0-incubating-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Taverna Server</name> - <description>Apache Taverna Server is a service that provides execution of + <description>Apache Taverna Server is a service that provides execution of Taverna Workflows, provided they do not access the user interface while executing.</description> @@ -37,19 +37,15 @@ executing.</description> <signing.user>taverna</signing.user> <signing.password>taverna</signing.password> - <scmBrowseRoot>https://github.com/apache/incubator-taverna-server/tree/master</scmBrowseRoot> - <jenkinsJob>taverna-server-2.5-auto</jenkinsJob> - - <!-- versions of Taverna dependencies --> - <taverna.language.version>0.15.1-incubating</taverna.language.version> - <taverna.osgi.version>0.2.1-incubating</taverna.osgi.version> - <taverna.engine.version>3.1.0-incubating</taverna.engine.version> - <taverna.commandline.version>3.1.0-incubating</taverna.commandline.version> - + <scmBrowseRoot>https://github.com/apache/incubator-taverna-server/tree/master</scmBrowseRoot> + <!-- versions of Taverna dependencies --> + <taverna.language.version>0.15.1-incubating</taverna.language.version> + <taverna.osgi.version>0.2.1-incubating</taverna.osgi.version> + <taverna.engine.version>3.1.0-incubating</taverna.engine.version> + <taverna.commandline.version>3.1.0-incubating</taverna.commandline.version> </properties> - <!-- Having to edit anything below here is probably indicative of a bug. --> <prerequisites> <maven>2.2</maven> </prerequisites> @@ -418,28 +414,27 @@ executing.</description> <module>taverna-server-unix-forker</module> <module>taverna-server-usagerecord</module> <module>taverna-server-port-description</module> - <module>taverna-server-execution-delegate</module> + <!-- <module>taverna-server-execution-delegate</module> --> <module>taverna-server-rmidaemon</module> <module>taverna-server-client</module> <module>taverna-server-distribution</module> </modules> - <scm> - <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-server.git</connection> - <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-server.git</developerConnection> - <url>https://github.com/apache/incubator-taverna-server</url> - <tag>HEAD</tag> - </scm> - - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> + <scm> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-server.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-server.git</developerConnection> + <url>https://github.com/apache/incubator-taverna-server</url> + <tag>trunk</tag> + </scm> + <repositories> + <repository> + <id>apache.snapshots</id> + <name>Apache Snapshot Repository</name> + <url>http://repository.apache.org/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/481b4dd5/taverna-server-client/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-server-client/pom.xml b/taverna-server-client/pom.xml index 4e4f009..980fd2c 100644 --- a/taverna-server-client/pom.xml +++ b/taverna-server-client/pom.xml @@ -68,6 +68,28 @@ limitations under the License. </configuration> </plugin> <plugin> + <!-- Workaround for wadl-client-plugin and Java 8 --> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0.0</version> + <executions> + <execution> + <id>set-accessExternalSchema-to-file</id> + <goals> + <goal>set-system-properties</goal> + </goals> + <configuration> + <properties> + <property> + <name>javax.xml.accessExternalSchema</name> + <value>file</value> + </property> + </properties> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.jvnet.ws.wadl</groupId> <artifactId>wadl-client-plugin</artifactId> <version>1.1.6</version> @@ -120,6 +142,25 @@ limitations under the License. <execute /> </action> </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.codehaus.mojo + </groupId> + <artifactId> + properties-maven-plugin + </artifactId> + <versionRange> + [1.0-alpha-2,) + </versionRange> + <goals> + <goal>set-system-properties</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute /> + </action> + </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/481b4dd5/taverna-server-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-server-distribution/pom.xml b/taverna-server-distribution/pom.xml index 47b20a3..bdfcef5 100644 --- a/taverna-server-distribution/pom.xml +++ b/taverna-server-distribution/pom.xml @@ -28,7 +28,7 @@ limitations under the License. <dependencies> <dependency> - <groupId>${project.parent.version}</groupId> + <groupId>${project.parent.groupId}</groupId> <artifactId>taverna-server-webapp</artifactId> <version>${project.parent.version}</version> <type>war</type> @@ -47,7 +47,7 @@ limitations under the License. </configuration> <executions> <execution> - <id>make-t2server-distribution</id> + <id>make-server-distribution</id> <phase>package</phase> <goals> <goal>single</goal> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/481b4dd5/taverna-server-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/pom.xml b/taverna-server-webapp/pom.xml index 65c4467..587cda9 100644 --- a/taverna-server-webapp/pom.xml +++ b/taverna-server-webapp/pom.xml @@ -31,10 +31,13 @@ limitations under the License. <version.cxf>2.7.7</version.cxf> <version.spring>3.2.5.RELEASE</version.spring> <version.spring-security>3.1.4.RELEASE</version.spring-security> - <version.asm>3.3.1</version.asm> + <version.asm>5.1</version.asm> <version.smack>3.2.1</version.smack> - <version.jdoapi>3.0.1</version.jdoapi> + <version.jdoapi>3.2.0-m5</version.jdoapi> + <version.datanucleus>5.0.0-release</version.datanucleus> <forker.module>taverna-server-unix-forker</forker.module> + <!-- FIXME: Temporary override; need the snapshot version because we need a binary build --> + <taverna.commandline.version>3.1.0-incubating-SNAPSHOT</taverna.commandline.version> <util.dir>${project.build.directory}/${project.build.finalName}/WEB-INF/classes/util</util.dir> <cmdline.dir>${util.dir}/taverna-command-line-${taverna.commandline.version}</cmdline.dir> </properties> @@ -46,12 +49,21 @@ limitations under the License. <version>${version.cxf}</version> <exclusions> <exclusion> - <artifactId>jaxb-impl</artifactId> <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> <version>${version.cxf}</version> @@ -142,22 +154,6 @@ limitations under the License. <version>2.5</version> <scope>provided</scope> </dependency> - <!-- - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - <scope>compile</scope> - </dependency> - --> - <!-- - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.0.2.GA</version> - <scope>compile</scope> - </dependency> - --> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> @@ -169,25 +165,27 @@ limitations under the License. <artifactId>commons-dbcp</artifactId> </dependency> <dependency> - <groupId>javax.jdo</groupId> - <artifactId>jdo-api</artifactId> - <version>3.0.1</version> + <!-- <groupId>javax.jdo</groupId> --> + <!-- <artifactId>jdo-api</artifactId> --> + <groupId>org.datanucleus</groupId> + <artifactId>javax.jdo</artifactId> + <version>${version.jdoapi}</version> </dependency> <dependency> <groupId>org.datanucleus</groupId> <artifactId>datanucleus-api-jdo</artifactId> - <version>[3.2.0, 3.2.99)</version> + <version>${version.datanucleus}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.datanucleus</groupId> <artifactId>datanucleus-core</artifactId> - <version>3.2.10</version> + <version>${version.datanucleus}</version> </dependency> <dependency> <groupId>org.datanucleus</groupId> <artifactId>datanucleus-rdbms</artifactId> - <version>[3.2.0, 3.2.99)</version> + <version>${version.datanucleus}</version> <scope>compile</scope> </dependency> <dependency> @@ -210,8 +208,8 @@ limitations under the License. </dependency> <dependency> <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>3.0</version> + <artifactId>cglib-nodep</artifactId> + <version>3.2.4</version> <scope>runtime</scope> </dependency> <dependency> @@ -250,8 +248,12 @@ limitations under the License. <scope>runtime</scope> <exclusions> <exclusion> - <artifactId>xercesImpl</artifactId> <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>wstx-asl</artifactId> </exclusion> </exclusions> </dependency> @@ -296,7 +298,7 @@ limitations under the License. <dependency> <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> - <version>1.3.4</version> + <version>1.3.7</version> <scope>runtime</scope> </dependency> <dependency> @@ -332,7 +334,7 @@ limitations under the License. <scope>compile</scope> </dependency> <dependency> - <groupId>asm</groupId> + <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> <version>${version.asm}</version> <scope>runtime</scope> @@ -389,8 +391,9 @@ limitations under the License. </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - <version>4.0.6</version> + <artifactId>woodstox-core-asl</artifactId> + <version>4.4.1</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> @@ -399,15 +402,9 @@ limitations under the License. <scope>provided</scope> </dependency> <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> - <version>4.2.0</version> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> - <version>1.1.4</version> + <version>1.1.6</version> </dependency> </dependencies> </dependencyManagement> @@ -426,43 +423,30 @@ limitations under the License. </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>US-ASCII</encoding> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> <groupId>org.datanucleus</groupId> <artifactId>datanucleus-maven-plugin</artifactId> - <version>3.3.0-release</version> + <version>${version.datanucleus}</version> <configuration> <jdkLogConfiguration>${project.basedir}/src/build/resources/datanucleus-log.properties</jdkLogConfiguration> <log4jConfiguration>${project.basedir}/src/build/resources/datanucleus_log4j.properties</log4jConfiguration> <verbose>true</verbose> </configuration> <dependencies> - <!-- Sucks that I have to say these explicitly --> <dependency> <groupId>org.datanucleus</groupId> - <artifactId>datanucleus-core</artifactId> - <version>3.2.10</version> + <artifactId>datanucleus-api-jdo</artifactId> + <version>${version.datanucleus}</version> </dependency> <dependency> <groupId>org.datanucleus</groupId> - <artifactId>datanucleus-enhancer</artifactId> - <version>3.1.1</version> + <artifactId>datanucleus-core</artifactId> + <version>${version.datanucleus}</version> </dependency> <dependency> + <!-- <groupId>javax.jdo</groupId> --> + <!-- <artifactId>jdo-api</artifactId> --> <groupId>org.datanucleus</groupId> - <artifactId>datanucleus-api-jdo</artifactId> - <version>3.2.5</version> - </dependency> - <dependency> - <groupId>javax.jdo</groupId> - <artifactId>jdo-api</artifactId> + <artifactId>javax.jdo</artifactId> <version>${version.jdoapi}</version> </dependency> </dependencies> @@ -493,7 +477,7 @@ limitations under the License. <pluginExecutionFilter> <groupId>org.datanucleus</groupId> <artifactId>datanucleus-maven-plugin</artifactId> - <versionRange>3.3.0-release</versionRange> + <versionRange>${version.datanucleus}</versionRange> <goals> <goal>enhance</goal> </goals> @@ -519,7 +503,7 @@ limitations under the License. <pluginExecutionFilter> <groupId>org.datanucleus</groupId> <artifactId>datanucleus-maven-plugin</artifactId> - <versionRange>3.3.0-release</versionRange> + <versionRange>${version.datanucleus}</versionRange> <goals> <goal>schema-create</goal> </goals> @@ -602,8 +586,9 @@ limitations under the License. <configuration> <artifactItems> <artifactItem> + <!-- WARNING! This needs a binary build --> <groupId>org.apache.taverna.commandline</groupId> - <artifactId>taverna-commandline-product</artifactId> + <artifactId>taverna-command-line-product</artifactId> <version>${taverna.commandline.version}</version> <classifier>nightly</classifier> <type>zip</type> @@ -655,15 +640,6 @@ limitations under the License. </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>US-ASCII</encoding> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> <groupId>pl.project13.maven</groupId> <artifactId>git-commit-id-plugin</artifactId> <version>2.1.4</version> @@ -685,12 +661,12 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.4</version> <configuration> <webXml>src/main/webapp/WEB-INF/web-sec.xml</webXml> </configuration> </plugin> <plugin> + <!-- Set up additional configuration for working with Spring. --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> <configuration> @@ -805,7 +781,7 @@ limitations under the License. </executions> </plugin> --> - <plugin> + <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>1.2.1</version> @@ -830,7 +806,7 @@ limitations under the License. </configuration> </execution> </executions> - </plugin> + </plugin> --> </plugins> <resources> <resource> @@ -844,6 +820,21 @@ limitations under the License. </resources> </build> + <repositories> + <repository> + <!-- FIXME: needed to get access to command line *build* --> + <id>apache.snapshots</id> + <name>Apache Snapshot Repository</name> + <url>http://repository.apache.org/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <profiles> <profile> <id>unix</id> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/481b4dd5/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java index 70612fe..371a202 100644 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java +++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java @@ -20,7 +20,6 @@ import java.io.ObjectInputStream; import java.net.URI; import java.net.URL; import java.rmi.MarshalledObject; -import java.rmi.RMISecurityManager; import java.rmi.RemoteException; import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; @@ -275,13 +274,13 @@ public abstract class AbstractRemoteRunFactory extends RunFactoryConfiguration * Configures the Java security model. Not currently used, as it is * viciously difficult to get right! */ - @SuppressWarnings({ "unused", "deprecation" }) + @SuppressWarnings("unused") private static void installSecurityManager() { if (getSecurityManager() == null) { setProperty("java.security.policy", AbstractRemoteRunFactory.class .getClassLoader().getResource(SECURITY_POLICY_FILE) .toExternalForm()); - setSecurityManager(new RMISecurityManager()); + setSecurityManager(new SecurityManager()); } }
