reformatting pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/11b03695 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/11b03695 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/11b03695 Branch: refs/heads/master Commit: 11b036959b0cadb800b50b84b2e4b44ec528a68e Parents: c65c9ca Author: Stian Soiland-Reyes <[email protected]> Authored: Fri Feb 19 09:50:08 2016 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Fri Feb 19 09:50:08 2016 +0000 ---------------------------------------------------------------------- pom.xml | 66 ++++++++++++++--------------- taverna-beanshell-activity/pom.xml | 75 ++++++++++++++++----------------- 2 files changed, 70 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/11b03695/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5765eba..537ea5d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,12 +11,12 @@ <version>2.1.0-incubating-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Taverna Common Activities</name> - <properties> + <properties> <!-- Taverna dependency versions --> - <taverna.language.version>0.15.0-incubating</taverna.language.version> - <taverna.osgi.version>0.2.1-incubating-SNAPSHOT</taverna.osgi.version> - <taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version> + <taverna.language.version>0.15.0-incubating</taverna.language.version> + <taverna.osgi.version>0.2.1-incubating-SNAPSHOT</taverna.osgi.version> + <taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version> <!-- Third-party dependency versios --> <abdera.version>1.1.3</abdera.version> @@ -25,39 +25,39 @@ <javacsv.version>2.0</javacsv.version> <jsch.version>1.0.6.RELEASE</jsch.version> <odfdom.version>0.7</odfdom.version> - <!-- <odfdom.version>0.8.8-incubating</odfdom.version>--> + <!-- <odfdom.version>0.8.8-incubating</odfdom.version> --> <santuario.xmlsec.version>1.5.7</santuario.xmlsec.version> - <xmlschema.version>2.2.1</xmlschema.version> + <xmlschema.version>2.2.1</xmlschema.version> <velocity.version>1.7</velocity.version> <webdavservlet.version>2.0</webdavservlet.version> - <woden.version>1.0M10</woden.version> + <woden.version>1.0M10</woden.version> <wss4j.version>1.6.18</wss4j.version> - </properties> + </properties> <modules> - <module>taverna-beanshell-activity</module> - <module>taverna-external-tool-activity</module> - <module>taverna-interaction-activity</module> - <module>taverna-rest-activity</module> - <module>taverna-spreadsheet-import-activity</module> - <module>taverna-wsdl-activity</module> - <module>taverna-wsdl-generic</module> - <module>taverna-xpath-activity</module> - </modules> - <scm> - <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</connection> - <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</developerConnection> - <url>https://github.com/apache/incubator-taverna-common-activities</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> + <module>taverna-beanshell-activity</module> + <module>taverna-external-tool-activity</module> + <module>taverna-interaction-activity</module> + <module>taverna-rest-activity</module> + <module>taverna-spreadsheet-import-activity</module> + <module>taverna-wsdl-activity</module> + <module>taverna-wsdl-generic</module> + <module>taverna-xpath-activity</module> + </modules> + <scm> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</developerConnection> + <url>https://github.com/apache/incubator-taverna-common-activities</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> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/11b03695/taverna-beanshell-activity/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-beanshell-activity/pom.xml b/taverna-beanshell-activity/pom.xml index 4e3b860..7a9470c 100644 --- a/taverna-beanshell-activity/pom.xml +++ b/taverna-beanshell-activity/pom.xml @@ -3,31 +3,29 @@ 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.commonactivities</groupId> - <artifactId>apache-taverna-common-activities</artifactId> - <version>2.1.0-incubating-SNAPSHOT</version> + <groupId>org.apache.taverna.commonactivities</groupId> + <artifactId>apache-taverna-common-activities</artifactId> + <version>2.1.0-incubating-SNAPSHOT</version> </parent> <artifactId>taverna-beanshell-activity</artifactId> <packaging>bundle</packaging> <name>Apache Taverna Beanshell Activity</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Embed-Dependency>artifactId=bsh</Embed-Dependency> - <Import-Package>!org.apache.bsf.*,!javax.swing.*,*</Import-Package> - - </instructions> - </configuration> - </plugin> - </plugins> - </build> - + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Embed-Dependency>artifactId=bsh</Embed-Dependency> + <Import-Package>!org.apache.bsf.*,!javax.swing.*,*</Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> @@ -48,7 +46,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -68,27 +66,28 @@ <version>${taverna.engine.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache-extras.beanshell</groupId> - <artifactId>bsh</artifactId> - <version>${bsh.version}</version> - <optional>true</optional> -<!-- NOTE: bsh is not really optional, but it is embedded in our jar as bsh is -not yet available as a OSGi bundle --> - </dependency> -<!-- - <dependency> - <groupId>org.apache.bsf</groupId> - <artifactId>bsf-api</artifactId> - <version>3.1</version> - <optional>true</optional> - </dependency> ---> + <dependency> + <groupId>org.apache-extras.beanshell</groupId> + <artifactId>bsh</artifactId> + <version>${bsh.version}</version> + <optional>true</optional> + <!-- NOTE: bsh is not really optional, but it is embedded in our jar as + bsh is not yet available as a OSGi bundle --> + </dependency> + <!-- + <dependency> + <groupId>org.apache.bsf</groupId> + <artifactId>bsf-api</artifactId> + <version>3.1</version> + <optional>true</optional> + </dependency> + --> + - </dependencies> + </dependencies> </project>
