Repository: incubator-taverna-workbench Updated Branches: refs/heads/master d530bd4d6 -> 0c723d627
batik-osgi bundle Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/66ffa279 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/66ffa279 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/66ffa279 Branch: refs/heads/master Commit: 66ffa279e7d067c90542cfebfb05be9cdcc17b03 Parents: d530bd4 Author: Stian Soiland-Reyes <[email protected]> Authored: Tue Mar 31 23:31:41 2015 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Thu Jun 11 16:47:40 2015 +0100 ---------------------------------------------------------------------- batik-osgi/pom.xml | 153 ++++++++++++++++++++++++++++++ taverna-dataflow-activity-ui/pom.xml | 2 +- taverna-graph-model/pom.xml | 2 +- taverna-graph-view/pom.xml | 2 +- taverna-reference-ui/pom.xml | 10 +- taverna-renderers-exts/pom.xml | 7 +- 6 files changed, 162 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/66ffa279/batik-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/batik-osgi/pom.xml b/batik-osgi/pom.xml new file mode 100644 index 0000000..800ad10 --- /dev/null +++ b/batik-osgi/pom.xml @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + 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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.taverna.workbench</groupId> + <artifactId>taverna-workbench</artifactId> + <version>3.1.0-incubating-SNAPSHOT</version> + </parent> + <artifactId>batik-osgi</artifactId> + <version>1.7.0</version> + <packaging>bundle</packaging> + <name>Apache Batik OSGi</name> + <description>Apache Batik wrapped as an OSGi bundle</description> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Import-Package> + org.w3c.css.sac, + !org.w3c.*, + org.xml.sax;version="0.0.0", + org.xml.sax.ext;version="0.0.0", + org.xml.sax.helpers;version="0.0.0", + javax.xml.parsers;version="0.0.0", + javax.xml.transform;version="0.0.0",* + </Import-Package> + <Export-Package> + !org.apache.batik.script.rhino.*, + org.apache.batik.*, + org.w3c.dom.smil, + org.w3c.dom.svg + </Export-Package> + <Private-Package> + org.w3c.dom, + org.w3c.dom.events, + </Private-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-svg-dom</artifactId> + <version>1.7</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-bridge</artifactId> + <version>1.7</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-swing</artifactId> + <version>1.7</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-util</artifactId> + <version>1.7</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.xalan</groupId> + <artifactId>com.springsource.org.apache.xalan</artifactId> + <version>2.7.1</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>org.apache.xmlcommons</groupId> + <artifactId>com.springsource.org.apache.xmlcommons</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.w3.sac</groupId> + <artifactId>com.springsource.org.w3c.css.sac</artifactId> + <version>1.3.0</version> + </dependency> + </dependencies> +<!-- + <repositories> + <repository> + <id>com.springsource.repository.bundles.release</id> + <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name> + <url>http://repository.springsource.com/maven/bundles/release</url> + </repository> + <repository> + <id>com.springsource.repository.bundles.external</id> + <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name> + <url>http://repository.springsource.com/maven/bundles/external</url> + </repository> + </repositories> +--> +</project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/66ffa279/taverna-dataflow-activity-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-dataflow-activity-ui/pom.xml b/taverna-dataflow-activity-ui/pom.xml index 89a9643..25f4703 100644 --- a/taverna-dataflow-activity-ui/pom.xml +++ b/taverna-dataflow-activity-ui/pom.xml @@ -106,7 +106,7 @@ </dependency> --> <dependency> - <groupId>org.apache.batik</groupId> + <groupId>${project.parent.groupId}</groupId> <artifactId>batik-osgi</artifactId> <version>${batik.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/66ffa279/taverna-graph-model/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-graph-model/pom.xml b/taverna-graph-model/pom.xml index 8a117a3..6498218 100644 --- a/taverna-graph-model/pom.xml +++ b/taverna-graph-model/pom.xml @@ -122,7 +122,7 @@ <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>org.apache.batik</groupId> + <groupId>${project.parent.groupId}</groupId> <artifactId>batik-osgi</artifactId> <version>${batik.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/66ffa279/taverna-graph-view/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-graph-view/pom.xml b/taverna-graph-view/pom.xml index 2d0f7fe..83ed123 100644 --- a/taverna-graph-view/pom.xml +++ b/taverna-graph-view/pom.xml @@ -90,7 +90,7 @@ </dependency> <dependency> - <groupId>org.apache.batik</groupId> + <groupId>${project.parent.groupId}</groupId> <artifactId>batik-osgi</artifactId> <version>${batik.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/66ffa279/taverna-reference-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-reference-ui/pom.xml b/taverna-reference-ui/pom.xml index 2aa5df2..ebd76d6 100644 --- a/taverna-reference-ui/pom.xml +++ b/taverna-reference-ui/pom.xml @@ -85,11 +85,11 @@ <version>${taverna.engine.version}</version> </dependency> - <dependency> - <groupId>org.apache.batik</groupId> - <artifactId>batik-osgi</artifactId> - <version>${batik.version}</version> - </dependency> + <dependency> + <groupId>${project.parent.groupId}</groupId> + <artifactId>batik-osgi</artifactId> + <version>${batik.version}</version> + </dependency> <dependency> <groupId>log4j</groupId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/66ffa279/taverna-renderers-exts/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-renderers-exts/pom.xml b/taverna-renderers-exts/pom.xml index 88fe060..ef3d058 100644 --- a/taverna-renderers-exts/pom.xml +++ b/taverna-renderers-exts/pom.xml @@ -59,18 +59,13 @@ </dependency> --> <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>batik-swing</artifactId> - <version>${batik.version}</version> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>com.springsource.org.apache.commons.io</artifactId> <version>${commons.io.version}</version> </dependency> <dependency> - <groupId>org.apache.batik</groupId> + <groupId>${project.parent.groupId}</groupId> <artifactId>batik-osgi</artifactId> <version>${batik.version}</version> </dependency>
