Merge branch 'maintenance' 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/66452d92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/66452d92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/66452d92
Branch: refs/heads/master Commit: 66452d9227469b31c1c33f4b3c672898d31a46eb Parents: 4d399b7 e0abf71 Author: Donal Fellows <[email protected]> Authored: Thu May 15 11:15:15 2014 +0100 Committer: Donal Fellows <[email protected]> Committed: Thu May 15 11:15:15 2014 +0100 ---------------------------------------------------------------------- pom.xml | 15 ++--- ui/pom.xml | 5 ++ .../net/sf/taverna/t2/lang/ui/FileTools.java | 33 +++-------- .../net/sf/taverna/t2/lang/ui/HtmlUtils.java | 25 ++++++++ .../t2/lang/ui/SanitisingDocumentFilter.java | 60 ++++++++++++++++++++ 5 files changed, 105 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/66452d92/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 8f189d2,0a3d8db..7e5841f --- a/pom.xml +++ b/pom.xml @@@ -5,14 -4,16 +5,14 @@@ <parent> <groupId>net.sf.taverna</groupId> <artifactId>taverna-parent</artifactId> - <version>2.6-SNAPSHOT</version> - <relativePath>../../taverna-parent/pom.xml</relativePath> + <version>3.0.1-SNAPSHOT</version> </parent> - + - <modelVersion>4.0.0</modelVersion> + <name>Taverna support utilities</name> <groupId>net.sf.taverna.t2</groupId> - <version>1.6-SNAPSHOT</version> <artifactId>lang</artifactId> + <version>2.0.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>Taverna 2 language extensions</name> <dependencyManagement> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/66452d92/ui/pom.xml ---------------------------------------------------------------------- diff --cc ui/pom.xml index efa9b29,fbe0379..4e77d66 --- a/ui/pom.xml +++ b/ui/pom.xml @@@ -18,13 -17,13 +18,18 @@@ <version>${project.version}</version> </dependency> <dependency> + <groupId>net.sf.taverna.jedit</groupId> + <artifactId>jedit-syntax</artifactId> + <version>${jedit.syntax.version}</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons.io.version}</version> + </dependency> + <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.log4j</groupId> + <artifactId>com.springsource.org.apache.log4j</artifactId> </dependency> </dependencies> </project>
