From 05cf9d9260f2edd5f6be0e4b919dc239ecc1d9ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Wed, 13 Jun 2018 12:23:51 +0200
Subject: [PATCH] add all necesary dependecies
---
copy-required-jars | 8 +++
.../org.eclipse.core.resources.prefs | 5 ++
haas-java-client/pom.xml | 52 +++++--------------
haas-spim-benchmark/pom.xml | 15 ------
pom.xml | 6 +++
5 files changed, 31 insertions(+), 55 deletions(-)
create mode 100755 copy-required-jars
diff --git a/copy-required-jars b/copy-required-jars
new file mode 100755
index 00000000..1d7e8bdf
--- /dev/null
+++ b/copy-required-jars
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#this script copies required libraries into Fiji installation directory
+DIR=`readlink -f $1`
+cd haas-spim-benchmark/target/dependency
+cp axis-*.jar mail-*.jar commons-discovery-*.jar java-scpclient-*.jar jaxrpc-api-*.jar wsdl4j-*.jar haas-imagej-client-*.jar haas-java-client-*.jar $DIR/jars
+
+cd ../../../haas-spim-benchmark/target/
+cp haas-spim-benchmark-*[0-9T].jar $DIR/plugins
diff --git a/haas-java-client/.settings/org.eclipse.core.resources.prefs b/haas-java-client/.settings/org.eclipse.core.resources.prefs
index ca3b115f..f19dd1b3 100644
--- a/haas-java-client/.settings/org.eclipse.core.resources.prefs
+++ b/haas-java-client/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/AsymmetricKeyCredentialsExt.java=UTF-8
encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/AuthenticationCredentialsExt.java=UTF-8
encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/ClusterNodeTypeExt.java=UTF-8
@@ -36,3 +37,7 @@ encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/UserAndLimitationMan
encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/UserAndLimitationManagementWsSoap.java=UTF-8
encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/UserAndLimitationManagementWsSoap12Stub.java=UTF-8
encoding//src/main/java/cz/it4i/fiji/haas_java_client/proxy/UserAndLimitationManagementWsSoapStub.java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/haas-java-client/pom.xml b/haas-java-client/pom.xml
index 4f946537..83774900 100644
--- a/haas-java-client/pom.xml
+++ b/haas-java-client/pom.xml
@@ -47,18 +47,12 @@
<version>0.0.1-SNAPSHOT</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/javax.activation/activation -->
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/javax.mail/mail -->
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.7</version>
- </dependency>
+ <!-- https://mvnrepository.com/artifact/javax.mail/mail -->
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.7</version>
+ </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.axis/axis -->
<dependency>
<groupId>org.apache.axis</groupId>
@@ -72,17 +66,13 @@
<version>0.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.xml/jaxrpc -->
+ <!-- https://mvnrepository.com/artifact/javax.xml/jaxrpc-api -->
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc</artifactId>
- <version>1.1</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/javax.xml.soap/saaj-api -->
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- <version>1.3.5</version>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ <version>1.1</version>
</dependency>
+
<!-- https://mvnrepository.com/artifact/wsdl4j/wsdl4j -->
<dependency>
<groupId>wsdl4j</groupId>
@@ -90,25 +80,7 @@
<version>1.5.1</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-jdk14 -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.7.25</version>
- <optional>true</optional>
- </dependency>
+
</dependencies>
<distributionManagement>
<repository>
diff --git a/haas-spim-benchmark/pom.xml b/haas-spim-benchmark/pom.xml
index fbd07153..e6230ec7 100644
--- a/haas-spim-benchmark/pom.xml
+++ b/haas-spim-benchmark/pom.xml
@@ -101,19 +101,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <outputDirectory>
- ${project.build.directory}/jars
- </outputDirectory>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
</project>
diff --git a/pom.xml b/pom.xml
index d0611f67..0ae37a4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,12 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
</project>
--
GitLab