From 053c47a674586c7f6b03f4997a00a54b948130c1 Mon Sep 17 00:00:00 2001 From: michael-conway Date: Thu, 9 Feb 2017 12:01:09 -0500 Subject: [PATCH] #15 switch to parent pom --- dot-irods-utilities/pom.xml | 33 +++--- file-template/pom.xml | 33 +++--- metadata-templates/pom.xml | 176 ++++++++++++++++--------------- pom.xml | 205 +++--------------------------------- virtual-collections/pom.xml | 68 ++++++------ 5 files changed, 177 insertions(+), 338 deletions(-) diff --git a/dot-irods-utilities/pom.xml b/dot-irods-utilities/pom.xml index 4034f61..eb30da6 100644 --- a/dot-irods-utilities/pom.xml +++ b/dot-irods-utilities/pom.xml @@ -1,17 +1,18 @@ - - 4.0.0 - - jargon-extensions - org.irods.jargon - 4.2.1.0-SNAPSHOT - - org.irods.jargon - dot-irods-utilities - dot-irods-utilities - Utilities and general services for the maintenance and discovery of .irods collections. These are special configuration and internal data collections in the user home, or in particular points in n iRODS file hierachy providing a standard way to represent configuration and customizaion, such as virtual collections, custom rules, metadata templates, and other profiel information used by API and interfaces. - + + 4.0.0 + + jargon-extensions + org.irods.jargon + 4.2.1.0-SNAPSHOT + + org.irods.jargon + dot-irods-utilities + dot-irods-utilities + Utilities and general services for the maintenance and discovery of .irods collections. These are special configuration and internal data collections in the user home, or in particular points in n iRODS file hierachy providing a standard way to represent configuration and customizaion, such as virtual collections, custom rules, metadata templates, and other profiel information used by API and interfaces. + maven-antrun-plugin @@ -22,8 +23,10 @@ - - + + test.confirm=${jargon.test.confirm} test.data.directory=${jargon.test.data.directory} test.irods.admin=${jargon.test.irods.admin} diff --git a/file-template/pom.xml b/file-template/pom.xml index 8e5de52..0eee6a6 100644 --- a/file-template/pom.xml +++ b/file-template/pom.xml @@ -1,17 +1,18 @@ - - 4.0.0 - - jargon-extensions - org.irods.jargon - 4.2.1.0-SNAPSHOT - - org.irods.jargon - file-template - file-template - Default reference implementation of file-templates, that describe and allow creation of iRODS files based on a default layout - + + 4.0.0 + + jargon-extensions + org.irods.jargon + 4.2.1.0-SNAPSHOT + + org.irods.jargon + file-template + file-template + Default reference implementation of file-templates, that describe and allow creation of iRODS files based on a default layout + maven-antrun-plugin @@ -22,8 +23,10 @@ - - + + test.confirm=${jargon.test.confirm} test.data.directory=${jargon.test.data.directory} test.irods.admin=${jargon.test.irods.admin} diff --git a/metadata-templates/pom.xml b/metadata-templates/pom.xml index 6f00a42..7538c2f 100644 --- a/metadata-templates/pom.xml +++ b/metadata-templates/pom.xml @@ -1,60 +1,63 @@ - - 4.0.0 - - jargon-extensions - org.irods.jargon - 4.2.1.0-SNAPSHOT - - org.irods.jargon - metadata-templates - metadata-templates - http://maven.apache.org - - UTF-8 - - - - org.irods.jargon - dot-irods-utilities - ${jargon.version} - - - org.irods.jargon - jargon-core - - - org.irods.jargon - jargon-data-utils - - - org.irods.jargon - jargon-user-tagging - ${jargon.version} - - - org.irods.jargon - jargon-user-profile - ${jargon.version} - - - junit - junit - test - - - org.mockito - mockito-all - test - - - com.fasterxml.jackson.core - jackson-databind - - - Support for JSON based metadata templates to specify required and suggested metadata for user interface creation - + + 4.0.0 + + jargon-extensions + org.irods.jargon + 4.2.1.0-SNAPSHOT + + org.irods.jargon + metadata-templates + metadata-templates + http://maven.apache.org + + UTF-8 + + + + org.irods.jargon + dot-irods-utilities + ${project.version} + + + org.irods.jargon + jargon-core + ${project.version} + + + org.irods.jargon + jargon-data-utils + ${project.version} + + + org.irods.jargon + jargon-user-tagging + ${project.version} + + + org.irods.jargon + jargon-user-profile + ${project.version} + + + junit + junit + test + + + org.mockito + mockito-all + test + + + com.fasterxml.jackson.core + jackson-databind + + + Support for JSON based metadata templates to specify required and suggested metadata for user interface creation + maven-antrun-plugin @@ -65,8 +68,10 @@ - - + + test.data.directory=${jargon.test.data.directory} test.irods.admin=${jargon.test.irods.admin} test.irods.admin.password=${jargon.test.irods.admin.password} @@ -155,34 +160,35 @@ - + - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-antrun-plugin - - [1.3,) - - run - - - - - - - - - + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-antrun-plugin + + [1.3,) + + run + + + + + + + + + diff --git a/pom.xml b/pom.xml index b596e2e..7af3fc5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,19 +1,19 @@ - + 4.0.0 org.irods.jargon jargon-extensions + + org.irods + jargon-pom + 4.2.1.0-SNAPSHOT + pom - 4.2.1.0-SNAPSHOT jargon-extensions Jargon Extensions - higher level general services built on top of jargon core to support indexing and general interface supporting abstractions https://github.com/DICE-UNC/jargon-extensions - - UTF-8 - 4.2.1.0-SNAPSHOT - 1.8 - 4.2.1.0-SNAPSHOT - + GitHub https://github.com/DICE-UNC/jargon-extensions/issues @@ -39,187 +39,6 @@ - - - dice.repository snaps - dice.repository.snapshots - https://raw.github.com/DICE-UNC/DICE-Maven/master/snapshots - - true - - - true - always - warn - - - - dice.repository - dice.repository - https://raw.github.com/DICE-UNC/DICE-Maven/master/releases - - true - - - false - always - warn - - - - netbeans.repository - netbeans.repository - http://bits.netbeans.org/maven2 - - true - - - true - never - fail - - - - jboss - jboss.repository - http://repository.jboss.com/maven2/ - - true - - - true - never - fail - - - - - - internal.repo - internal.repo - file://${git.repo.root}/releases - - - internal.repo.snapshot - internal.repo.snapshot - file://${git.repo.root}/snapshots - - - - - - org.codehaus.mojo - taglist-maven-plugin - - - org.codehaus.mojo - jxr-maven-plugin - - - maven-surefire-plugin - - - org.apache.maven.plugins - maven-surefire-report-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - http://java.sun.com/javase/6/docs/api/ - http://java.sun.com/javaee/5/docs/api/ - http://commons.apache.org/logging/apidocs/ - http://commons.apache.org/io/apidocs/ - http://commons.apache.org/lang/apidocs/ - http://www.junit.org/junit/javadoc/ - http://logging.apache.org/log4j/docs/api/ - http://velocity.apache.org/engine/devel/apidocs/ - - - - - org.apache.maven.plugins - maven-changelog-plugin - - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - - - - - - - org.irods.jargon - jargon-core - ${jargon.version} - - - org.irods.jargon - jargon-data-utils - ${jargon.version} - - - org.irods.jargon - jargon-user-tagging - ${jargon.version} - - - org.irods.jargon - jargon-mdquery - ${jargon.version} - - - org.irods.jargon - jargon-extensions-if - ${jargon.extensions.version} - - - junit - junit - 4.8.2 - test - - - commons-logging - commons-logging - 1.1.1 - - - org.slf4j - slf4j-api - 1.7.22 - - - log4j - log4j - 1.2.17 - - - org.slf4j - slf4j-log4j12 - 1.7.22 - - - org.mockito - mockito-all - 1.8.1 - test - - - com.fasterxml.jackson.core - jackson-databind - 2.3.3 - - - org.irods.jargon - jargon-extensions-if - ${jargon.version} - - - org.slf4j @@ -246,6 +65,7 @@ org.irods.jargon jargon-core + ${project.version} compile @@ -255,6 +75,7 @@ org.irods.jargon jargon-extensions-if + ${project.version} @@ -322,7 +143,7 @@ dot-irods-utilities virtual-collections - metadata-templates - file-template - + metadata-templates + file-template + diff --git a/virtual-collections/pom.xml b/virtual-collections/pom.xml index 7164fda..6427576 100644 --- a/virtual-collections/pom.xml +++ b/virtual-collections/pom.xml @@ -19,18 +19,22 @@ org.irods.jargon jargon-core + ${project.version} org.irods.jargon jargon-data-utils + ${project.version} org.irods.jargon jargon-user-tagging + ${project.version} org.irods.jargon jargon-mdquery + ${project.version} org.irods.jargon @@ -61,10 +65,9 @@ httpclient 4.3.2 - Support for virtual collections, which represent alternative means of generating 'ils' listings based on any arbitrary query, rule, or procedure. - + maven-antrun-plugin @@ -75,8 +78,10 @@ - - + + test.data.directory=${jargon.test.data.directory} test.irods.admin=${jargon.test.irods.admin} test.irods.admin.password=${jargon.test.irods.admin.password} @@ -165,34 +170,35 @@ - + - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-antrun-plugin - - [1.3,) - - run - - - - - - - - - + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-antrun-plugin + + [1.3,) + + run + + + + + + + + +