diff options
Diffstat (limited to 'saltstack-adapter')
| -rw-r--r-- | saltstack-adapter/saltstack-adapter-installer/pom.xml | 5 | ||||
| -rw-r--r-- | saltstack-adapter/saltstack-adapter-provider/pom.xml | 17 |
2 files changed, 3 insertions, 19 deletions
diff --git a/saltstack-adapter/saltstack-adapter-installer/pom.xml b/saltstack-adapter/saltstack-adapter-installer/pom.xml index 65f5e121..063caf2b 100644 --- a/saltstack-adapter/saltstack-adapter-installer/pom.xml +++ b/saltstack-adapter/saltstack-adapter-installer/pom.xml @@ -64,11 +64,6 @@ <version>${project.version}</version> </dependency> - <dependency> - <groupId>javax</groupId> - <artifactId>javaee-api</artifactId> - <version>7.0</version> - </dependency> </dependencies> <build> <plugins> diff --git a/saltstack-adapter/saltstack-adapter-provider/pom.xml b/saltstack-adapter/saltstack-adapter-provider/pom.xml index 98590a0c..91e72d5f 100644 --- a/saltstack-adapter/saltstack-adapter-provider/pom.xml +++ b/saltstack-adapter/saltstack-adapter-provider/pom.xml @@ -72,31 +72,20 @@ </dependency> <!-- Needed to run SSH --> + <!-- VERSION CONFLICT !!!!! --> + <!-- OpenDaylight Fluorine comes with version 1.7.0 installed, which is not compatible --> + <!-- Code must be updated to use version 1.7.0 before this can be safely installed --> <dependency> <groupId>org.apache.sshd</groupId> <artifactId>sshd-core</artifactId> <version>0.12.0</version> </dependency> - <!--<dependency>--> - <!--<groupId>org.onap.appc</groupId>--> - <!--<artifactId>appc-common</artifactId>--> - <!--<version>1.3.0</version>--> - <!--</dependency>--> - - <!--<dependency>--> - <!--<groupId>org.onap.appc</groupId>--> - <!--<artifactId>appc-ssh-adapter-api</artifactId>--> - <!--<version>1.3.0</version>--> - <!--<scope>provided</scope>--> - <!--</dependency>--> - <!-- Needed to run test cases --> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-io</artifactId> - <version>1.3.2</version> </dependency> <dependency> |