From dca5c8508e304d7c7f429fadc2831345e314148a Mon Sep 17 00:00:00 2001
From: Jan Kozusznik <jan@kozusznik.cz>
Date: Tue, 23 Jan 2018 10:06:38 +0100
Subject: [PATCH] organize pom.xml
---
haas-imagej-client/pom.xml | 64 +++++++++++++++----------------------
haas-java-client/pom.xml | 1 +
haas-parent/pom.xml | 43 +++++++++++++++++++++++++
haas-snakemake-spim/pom.xml | 61 ++++++++++++++++-------------------
haas-spim-benchmark/pom.xml | 63 ++++++++++++++++--------------------
java-scpclient/pom.xml | 1 +
pom.xml | 4 +--
7 files changed, 128 insertions(+), 109 deletions(-)
create mode 100644 haas-parent/pom.xml
diff --git a/haas-imagej-client/pom.xml b/haas-imagej-client/pom.xml
index a1375b5d..5e9a13ad 100644
--- a/haas-imagej-client/pom.xml
+++ b/haas-imagej-client/pom.xml
@@ -2,36 +2,33 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.scijava</groupId>
- <artifactId>pom-scijava</artifactId>
- <version>17.1.1</version>
- <relativePath />
+ <groupId>cz.it4i.fiji</groupId>
+ <artifactId>haas-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath> ../haas-parent/pom.xml</relativePath>
</parent>
- <groupId>cz.it4i.fiji</groupId>
<artifactId>haas-imagej-client</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Simple ImageJ Commands</name>
- <description>This example provides an introduction to writing ImageJ commands.</description>
- <url>https://github.com/[MY-ORG]/[MY-REPO]</url>
- <inceptionYear>2013</inceptionYear>
+ <name>HaaS for ImageJ</name>
+ <url>${project_url}</url>
+ <description>Library with for working with HaaS in ImageJ.</description>
+ <inceptionYear>2018</inceptionYear>
<organization>
- <name>[MY-ORGANIZATION-NAME]</name>
- <url>[MY-ORGANIZATION-WEB-SITE]</url>
+ <name>${organization.name}</name>
+ <url>${organization.url}</url>
</organization>
<licenses>
<license>
- <name>CC0 1.0 Universal License</name>
- <url>http://creativecommons.org/publicdomain/zero/1.0/</url>
- <distribution>repo</distribution>
+ <name>${license.name}</name>
+ <url>${license.url}</url>
+ <distribution>${license.distribution}</distribution>
</license>
</licenses>
-
<developers>
<developer>
- <id>[MY-GITHUB-ID]</id>
- <name>[MY-FULL-NAME]</name>
- <url>https://imagej.net/User:[MY-IMAGEJ-WIKI-ACCOUNT]</url>
+ <id>koz01</id>
+ <name>Jan Kožusznik</name>
+ <url>http://www.kozusznik.cz</url>
</developer>
</developers>
<contributors>
@@ -48,33 +45,24 @@
</mailingLists>
<scm>
- <connection>scm:git:git://github.com/[MY-ORG]/[MY-REPO]</connection>
- <developerConnection>scm:git:git@github.com:[MY-ORG]/[MY-REPO]</developerConnection>
- <tag>HEAD</tag>
- <url>https://github.com/[MY-ORG]/[MY-REPO]</url>
+ <connection>${scm.connection}</connection>
+ <developerConnection>${scm.developerConnection}</developerConnection>
+ <tag>${scm.tag}</tag>
+ <url>${scm.url}</url>
</scm>
<issueManagement>
- <system>GitHub Issues</system>
- <url>http://github.com/[MY-ORG]/[MY-REPO]/issues</url>
+ <system>${issueManagement.system}</system>
+ <url>${issueManagement.url}</url>
</issueManagement>
<ciManagement>
<system>None</system>
</ciManagement>
<properties>
- <license.licenseName>cc0</license.licenseName>
- <license.copyrightOwners>N/A</license.copyrightOwners>
- <license.projectName>ImageJ software for multidimensional image
- processing and analysis.</license.projectName>
-
+ <license.licenseName>${license.base.licenseName}</license.licenseName>
+ <license.copyrightOwners>${license.base.copyrightOwners}</license.copyrightOwners>
</properties>
-
- <repositories>
- <repository>
- <id>imagej.public</id>
- <url>http://maven.imagej.net/content/groups/public</url>
- </repository>
- </repositories>
-
+
+
<dependencies>
<dependency>
<groupId>net.imagej</groupId>
diff --git a/haas-java-client/pom.xml b/haas-java-client/pom.xml
index 347095c6..1c2c286b 100644
--- a/haas-java-client/pom.xml
+++ b/haas-java-client/pom.xml
@@ -4,6 +4,7 @@
<groupId>cz.it4i.fiji</groupId>
<artifactId>haas-java-client</artifactId>
<version>0.0.1-SNAPSHOT</version>
+ <name>HaaS library for Java</name>
<packaging>jar</packaging>
<build>
<plugins>
diff --git a/haas-parent/pom.xml b/haas-parent/pom.xml
new file mode 100644
index 00000000..a8d3d358
--- /dev/null
+++ b/haas-parent/pom.xml
@@ -0,0 +1,43 @@
+<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>
+ <groupId>cz.it4i.fiji</groupId>
+ <artifactId>haas-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <parent>
+ <groupId>org.scijava</groupId>
+ <artifactId>pom-scijava</artifactId>
+ <version>17.1.1</version>
+ <relativePath />
+ </parent>
+ <properties>
+ <project_url>https://code.it4i.cz/fiji/haas-java-client/</project_url>
+
+ <organization.name>IT4Innovations - National Supercomputing Center</organization.name>
+ <organization.url>http://www.it4i.cz/</organization.url>
+
+ <license.name>cc0</license.name>
+ <license.url>http://creativecommons.org/publicdomain/zero/1.0/</license.url>
+ <license.base.licenseName>CC0 1.0 Universal License</license.base.licenseName>
+ <license.base.copyrightOwners>N/A</license.base.copyrightOwners>
+ <license.distribution>repo</license.distribution>
+
+ <scm.connection>scm:git:git://github.com/[MY-ORG]/[MY-REPO]</scm.connection>
+ <scm.developerConnection>scm:git:git@github.com:[MY-ORG]/[MY-REPO]</scm.developerConnection>
+ <scm.tag>HEAD</scm.tag>
+ <scm.url>${project_url}</scm.url>
+
+
+
+ <issueManagement.system>GitLab Issues</issueManagement.system>
+ <issueManagement.url>https://code.it4i.cz/fiji/haas-java-client/issues</issueManagement.url>
+
+ </properties>
+ <repositories>
+ <repository>
+ <id>imagej.public</id>
+ <url>http://maven.imagej.net/content/groups/public</url>
+ </repository>
+ </repositories>
+</project>
diff --git a/haas-snakemake-spim/pom.xml b/haas-snakemake-spim/pom.xml
index c3eebd11..ebd9e181 100644
--- a/haas-snakemake-spim/pom.xml
+++ b/haas-snakemake-spim/pom.xml
@@ -2,36 +2,35 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.scijava</groupId>
- <artifactId>pom-scijava</artifactId>
- <version>17.1.1</version>
- <relativePath />
+ <groupId>cz.it4i.fiji</groupId>
+ <artifactId>haas-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath> ../haas-parent/pom.xml</relativePath>
</parent>
- <groupId>cz.it4i.fiji</groupId>
<artifactId>haas-snakemake-spim</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Plugins for running SPIM automated workflow by IT4I HaaS.</name>
- <description>This example provides an introduction to writing ImageJ commands.</description>
- <url>https://github.com/[MY-ORG]/[MY-REPO]</url>
- <inceptionYear>2013</inceptionYear>
+
+ <name>${license.projectName}</name>
+ <description>Plugin for starting SPIM automated workflowby IT4I HaaS.</description>
+ <url>https://code.it4i.cz/fiji/haas-java-client/haas-spim-benchmark</url>
+ <inceptionYear>2018</inceptionYear>
<organization>
- <name>[MY-ORGANIZATION-NAME]</name>
- <url>[MY-ORGANIZATION-WEB-SITE]</url>
+ <name>${organization.name}</name>
+ <url>${organization.url}</url>
</organization>
<licenses>
<license>
- <name>CC0 1.0 Universal License</name>
- <url>http://creativecommons.org/publicdomain/zero/1.0/</url>
- <distribution>repo</distribution>
+ <name>${license.name}</name>
+ <url>${license.url}</url>
+ <distribution>${license.distribution}</distribution>
</license>
</licenses>
<developers>
<developer>
- <id>[MY-GITHUB-ID]</id>
- <name>[MY-FULL-NAME]</name>
- <url>https://imagej.net/User:[MY-IMAGEJ-WIKI-ACCOUNT]</url>
+ <id>koz01</id>
+ <name>Jan Kožusznik</name>
+ <url>http://www.kozusznik.cz</url>
</developer>
</developers>
<contributors>
@@ -48,27 +47,23 @@
</mailingLists>
<scm>
- <connection>scm:git:git://github.com/[MY-ORG]/[MY-REPO]</connection>
- <developerConnection>scm:git:git@github.com:[MY-ORG]/[MY-REPO]</developerConnection>
- <tag>HEAD</tag>
- <url>https://github.com/[MY-ORG]/[MY-REPO]</url>
+ <connection>${scm.connection}</connection>
+ <developerConnection>${scm.developerConnection}</developerConnection>
+ <tag>${scm.tag}</tag>
+ <url>${scm.url}</url>
</scm>
<issueManagement>
- <system>GitHub Issues</system>
- <url>http://github.com/[MY-ORG]/[MY-REPO]/issues</url>
+ <system>${issueManagement.system}</system>
+ <url>${issueManagement.url}</url>
</issueManagement>
<ciManagement>
<system>None</system>
</ciManagement>
-
-
- <repositories>
- <repository>
- <id>imagej.public</id>
- <url>http://maven.imagej.net/content/groups/public</url>
- </repository>
- </repositories>
-
+ <properties>
+ <license.projectName>SPIM over HaaS</license.projectName>
+ <license.licenseName>${license.base.licenseName}</license.licenseName>
+ <license.copyrightOwners>${license.base.copyrightOwners}</license.copyrightOwners>
+ </properties>
<dependencies>
<dependency>
<groupId>net.imagej</groupId>
diff --git a/haas-spim-benchmark/pom.xml b/haas-spim-benchmark/pom.xml
index 96674846..92859dc5 100644
--- a/haas-spim-benchmark/pom.xml
+++ b/haas-spim-benchmark/pom.xml
@@ -2,36 +2,34 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.scijava</groupId>
- <artifactId>pom-scijava</artifactId>
- <version>17.1.1</version>
- <relativePath />
+ <groupId>cz.it4i.fiji</groupId>
+ <artifactId>haas-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath> ../haas-parent/pom.xml</relativePath>
</parent>
- <groupId>cz.it4i.fiji</groupId>
<artifactId>haas-spim-benchmark</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Plugins for running SPIM automated workflow by IT4I HaaS.</name>
- <description>This example provides an introduction to writing ImageJ commands.</description>
- <url>https://github.com/[MY-ORG]/[MY-REPO]</url>
- <inceptionYear>2013</inceptionYear>
+ <name>HaaS benchmark of SPIM</name>
+ <url>${project_url}</url>
+ <description>Plugin for benchmarking SPIM automated workflow and starting by IT4I HaaS.</description>
+ <inceptionYear>2018</inceptionYear>
<organization>
- <name>[MY-ORGANIZATION-NAME]</name>
- <url>[MY-ORGANIZATION-WEB-SITE]</url>
+ <name>${organization.name}</name>
+ <url>${organization.url}</url>
</organization>
<licenses>
<license>
- <name>CC0 1.0 Universal License</name>
- <url>http://creativecommons.org/publicdomain/zero/1.0/</url>
- <distribution>repo</distribution>
+ <name>${license.name}</name>
+ <url>${license.url}</url>
+ <distribution>${license.distribution}</distribution>
</license>
</licenses>
<developers>
<developer>
- <id>[MY-GITHUB-ID]</id>
- <name>[MY-FULL-NAME]</name>
- <url>https://imagej.net/User:[MY-IMAGEJ-WIKI-ACCOUNT]</url>
+ <id>koz01</id>
+ <name>Jan Kožusznik</name>
+ <url>http://www.kozusznik.cz</url>
</developer>
</developers>
<contributors>
@@ -48,33 +46,26 @@
</mailingLists>
<scm>
- <connection>scm:git:git://github.com/[MY-ORG]/[MY-REPO]</connection>
- <developerConnection>scm:git:git@github.com:[MY-ORG]/[MY-REPO]</developerConnection>
- <tag>HEAD</tag>
- <url>https://github.com/[MY-ORG]/[MY-REPO]</url>
+ <connection>${scm.connection}</connection>
+ <developerConnection>${scm.developerConnection}</developerConnection>
+ <tag>${scm.tag}</tag>
+ <url>${scm.url}</url>
</scm>
<issueManagement>
- <system>GitHub Issues</system>
- <url>http://github.com/[MY-ORG]/[MY-REPO]/issues</url>
+ <system>${issueManagement.system}</system>
+ <url>${issueManagement.url}</url>
</issueManagement>
<ciManagement>
<system>None</system>
</ciManagement>
- <properties>
- <license.licenseName>cc0</license.licenseName>
- <license.copyrightOwners>N/A</license.copyrightOwners>
- <license.projectName>Plugins for running SPIM automated workflow by
- IT4I HaaS.</license.projectName>
+
+ <properties>
+ <license.licenseName>${license.base.licenseName}</license.licenseName>
+ <license.copyrightOwners>${license.base.copyrightOwners}</license.copyrightOwners>
</properties>
- <repositories>
- <repository>
- <id>imagej.public</id>
- <url>http://maven.imagej.net/content/groups/public</url>
- </repository>
- </repositories>
-
+
<dependencies>
<dependency>
<groupId>net.imagej</groupId>
diff --git a/java-scpclient/pom.xml b/java-scpclient/pom.xml
index 17211941..13a71e9d 100644
--- a/java-scpclient/pom.xml
+++ b/java-scpclient/pom.xml
@@ -4,6 +4,7 @@
<groupId>cz.it4i.fiji</groupId>
<artifactId>java-scpclient</artifactId>
<version>0.0.1-SNAPSHOT</version>
+ <name>Scp client library for Java</name>
<packaging>jar</packaging>
<build>
<plugins>
diff --git a/pom.xml b/pom.xml
index 97f95ca8..08faa594 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,9 +4,9 @@
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>cz.it4i.fiji</groupId>
- <artifactId>haas-parent</artifactId>
+ <artifactId>haas-main-module</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>Multi Chapter Simple Parent Project</name>
+ <name>Main module</name>
<packaging>pom</packaging>
<modules>
<module>java-scpclient</module>
--
GitLab