TAVERNA-989 : confilct with commons-csv is resolved
diff --git a/taverna-activity-palette-impl/pom.xml b/taverna-activity-palette-impl/pom.xml
index 4a590a4..866104f 100644
--- a/taverna-activity-palette-impl/pom.xml
+++ b/taverna-activity-palette-impl/pom.xml
@@ -1,20 +1,14 @@
<?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.
--->
+<!-- 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -31,6 +25,12 @@
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-activity-palette-api</artifactId>
<version>${project.parent.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-csv</artifactId>
+ <groupId>org.apache.commons</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
@@ -46,6 +46,8 @@
<groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
<version>${taverna.osgi.version}</version>
+
+
</dependency>
<dependency>
<groupId>org.apache.taverna.osgi</groupId>
@@ -92,7 +94,7 @@
<groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-impl</artifactId>
<version>${taverna.osgi.version}</version>
- <scope>test</scope>
+
</dependency>
</dependencies>
</project>
diff --git a/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java b/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java
index 12ddc58..42f7cd2 100644
--- a/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java
+++ b/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java
@@ -28,7 +28,12 @@
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.UUID;
+
+import org.apache.taverna.configuration.AbstractConfigurable;
+import org.apache.taverna.configuration.Configurable;
+import org.apache.taverna.configuration.ConfigurationManager;
import org.apache.taverna.configuration.app.impl.ApplicationConfigurationImpl;
import org.apache.taverna.configuration.impl.ConfigurationManagerImpl;
@@ -94,4 +99,5 @@
public void testNull() throws Exception {
assertNull("Should return null",conf.getProperty("blah blah blah"));
}
+
}
