diff --git a/copy-required-jars b/copy-required-jars new file mode 100755 index 0000000000000000000000000000000000000000..1d7e8bdf98eeb7ccefe32e3113338948b3f70b0a --- /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 ca3b115f2ad1c8b775e933e0acbd33f1df004a1f..f19dd1b359783aa4435d8fbe77d3e327854fda73 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 4f94653735038043b94181ce3a1e673bf949d3cf..83774900bc659850d176189155892c2b39113da5 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 fbd071531b78603705f442d64149771d448d44af..e6230ec75fc168d4314571b6b4ff0974e6b5ab17 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 d0611f677a1be77ca21eec578e80706a593e0f0f..0ae37a4a83f417aba3eebb1911953842703875d0 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>