Repository: incubator-taverna-server Updated Branches: refs/heads/master 481b4dd57 -> 3f019f297
Use the correct release repository. 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/3f019f29 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/3f019f29 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/3f019f29 Branch: refs/heads/master Commit: 3f019f2975cf908dcb0e8db524398933a5ff2e12 Parents: 481b4dd Author: Donal Fellows <[email protected]> Authored: Wed Jul 6 11:19:22 2016 +0100 Committer: Donal Fellows <[email protected]> Committed: Wed Jul 6 11:19:22 2016 +0100 ---------------------------------------------------------------------- pom.xml | 11 +++++- taverna-server-webapp/pom.xml | 75 ++------------------------------------ 2 files changed, 13 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/3f019f29/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c0ae63e..a523b05 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,10 @@ executing.</description> <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.group>org.apache.taverna.commandline</taverna.commandline.group> + <taverna.commandline.artifact>taverna-commandline-product</taverna.commandline.artifact> <taverna.commandline.version>3.1.0-incubating</taverna.commandline.version> + <taverna.commandline.classifier>release</taverna.commandline.classifier> </properties> <prerequisites> @@ -249,6 +252,7 @@ executing.</description> </groups> <detectJavaApiLink>true</detectJavaApiLink> <aggregate>true</aggregate> + <quiet>true</quiet> </configuration> </plugin> <plugin> @@ -301,7 +305,6 @@ executing.</description> <detectLinks>true</detectLinks> <linksource>true</linksource> <stylesheet>maven</stylesheet> - <!-- The version package is purely implementation convenience. --> <groups> <group> <title>Server Core WebService</title> @@ -436,5 +439,11 @@ executing.</description> <enabled>false</enabled> </releases> </repository> + <repository> + <!-- This repository is critical for the build --> + <id>apache.releases</id> + <name>Apache Release Repository</name> + <url>https://repository.apache.org/content/repositories/releases</url> + </repository> </repositories> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/3f019f29/taverna-server-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/pom.xml b/taverna-server-webapp/pom.xml index 587cda9..81acbb6 100644 --- a/taverna-server-webapp/pom.xml +++ b/taverna-server-webapp/pom.xml @@ -36,8 +36,6 @@ limitations under the License. <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> @@ -586,11 +584,10 @@ limitations under the License. <configuration> <artifactItems> <artifactItem> - <!-- WARNING! This needs a binary build --> - <groupId>org.apache.taverna.commandline</groupId> - <artifactId>taverna-command-line-product</artifactId> + <groupId>${taverna.commandline.group}</groupId> + <artifactId>${taverna.commandline.artifact}</artifactId> <version>${taverna.commandline.version}</version> - <classifier>nightly</classifier> + <classifier>${taverna.commandline.classifier}</classifier> <type>zip</type> <outputDirectory>${util.dir}</outputDirectory> </artifactItem> @@ -756,57 +753,6 @@ limitations under the License. <nosuffix>true</nosuffix> </configuration> </plugin> -<!-- No longer needed (TAVERNA-968) - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>override-executeworkflow-scripts</id> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${cmdline.dir}</outputDirectory> - <resources> - <resource> - <directory>src/main/replacementscripts</directory> - <filtering>false</filtering> - </resource> - </resources> - <overwrite>true</overwrite> - </configuration> - </execution> - </executions> - </plugin> ---> - <!-- <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - <executions> - <execution> - <id>improve-registry-coverage</id> - <phase>prepare-package</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/bin/sh</executable> - <workingDirectory>${cmdline.dir}</workingDirectory> - <environmentVariables> - <RAVEN_APPHOME>${cmdline.dir}</RAVEN_APPHOME> - </environmentVariables> - <arguments> - <argument>./executeworkflow.sh</argument> - <argument>-help</argument> - </arguments> - <outputFile>/dev/null</outputFile> - </configuration> - </execution> - </executions> - </plugin> --> </plugins> <resources> <resource> @@ -820,21 +766,6 @@ 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>
