From: Richard Millet Date: Tue, 18 Aug 2009 07:43:25 +0000 (+0000) Subject: CSPACE-343: Updated POM files to use new CSpace repository and also to remove unneede... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=165983ee39c5d26bf4e0ba54ea9bce6fb44a91d7;p=tmp%2Fjakarta-migration.git CSPACE-343: Updated POM files to use new CSpace repository and also to remove unneeded refs to maven.nuxeo.org repo. --- diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml index 540859ee7..f4e998a3c 100644 --- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml @@ -1,30 +1,57 @@ - - 4.0.0 - - - org.nuxeo.ecm.platform - nuxeo-platform-parent - 5.2-SNAPSHOT - - - nuxeo-platform-collectionspace - jar - Nuxeo CS extensions - - Nuxeo Enterprise Platform: CS extensions - - - - - org.nuxeo.ecm.core - nuxeo-core-schema - - - org.nuxeo.ecm.platform - nuxeo-platform-types-core - - - - + + + + org.collectionspace.services + org.collectionspace.services.3rdparty.nuxeo + 1.0 + + + 4.0.0 + org.collectionspace.services + nuxeo-platform-collectionspace + 1.0 + pom + Nuxeo CS extensions + Nuxeo Enterprise Platform: CS extensions + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + src/main/resources/META-INF/MANIFEST.MF + + ${eclipseVersion} + 2 + + + + + + + + diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml index 2248385a1..825d536f6 100644 --- a/3rdparty/nuxeo/pom.xml +++ b/3rdparty/nuxeo/pom.xml @@ -1,63 +1,24 @@ + - org.collectionspace.services.3rdparty org.collectionspace.services + org.collectionspace.services.3rdparty 1.0 + 4.0.0 org.collectionspace.services org.collectionspace.services.3rdparty.nuxeo - pom 1.0 + pom services.3rdparty.nuxeo - - - - public - http://maven.nuxeo.org/public - - - - false - - - - public-snapshot - http://maven.nuxeo.org/public-snapshot - - false - - - - - - - - public - http://maven.nuxeo.org/public - Nuxeo virtual release repository - - - - false - - - - public-snapshot - http://maven.nuxeo.org/public-snapshot - Nuxeo virtual snapshot repository - - false - - - - - + + nuxeo-platform-collectionspace + - - + jboss @@ -115,8 +76,8 @@ org.osgi - osgi-core - 4.1 + org.osgi.core + 4.1.0 diff --git a/pom.xml b/pom.xml index 9ae5bb44a..9f3403231 100644 --- a/pom.xml +++ b/pom.xml @@ -17,14 +17,24 @@ + 3rdparty services + + CollectionSpace + http://source.collectionspace.org:8081/artifactory/repo + maven repo maven repo http://repo1.maven.org/maven2/ + + maven-restlet + Public online Restlet repository + http://maven.restlet.org + java.net java.net Maven Repository diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index e60b0739b..b155b43f5 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -150,8 +150,8 @@ org.osgi - osgi-core - 4.1 + org.osgi.core + 4.1.0 diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml index a92db9318..bd8d6b3b1 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml @@ -1,12 +1,12 @@ - + 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"> - org.nuxeo.ecm.platform - nuxeo-platform-parent - 5.2-SNAPSHOT + org.collectionspace.services + nuxeo-platform-collectionspace + 1.0 + 4.0.0 org.collectionspace.services 1.0 @@ -14,23 +14,6 @@ jar services.collectionobject.3rdparty.nuxeo - CollectionObject Nuxeo document type + CollectionObject Nuxeo document type - - 5.2.1-SNAPSHOT - 1.5.1-SNAPSHOT - - - - org.nuxeo.ecm.core - nuxeo-core-schema - ${nuxeo.version.1.5} - - - org.nuxeo.ecm.platform - nuxeo-platform-types-core - ${nuxeo.version.5.2} - - - diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml index e286b72df..1dcd0d1c9 100644 --- a/services/collectionobject/3rdparty/pom.xml +++ b/services/collectionobject/3rdparty/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.collectionspace.services.collectionobject org.collectionspace.services + org.collectionspace.services.collectionobject 1.0 diff --git a/services/common/pom.xml b/services/common/pom.xml index 113107ef5..16906e47e 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -124,8 +124,8 @@ org.osgi - osgi-core - 4.1 + org.osgi.core + 4.1.0 diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml index 3818ff2cb..fdef1d2fc 100644 --- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml +++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml @@ -1,12 +1,12 @@ - - org.nuxeo.ecm.platform - nuxeo-platform-parent - 5.2-SNAPSHOT + org.collectionspace.services + nuxeo-platform-collectionspace + 1.0 + 4.0.0 org.collectionspace.services 1.0 @@ -16,21 +16,4 @@ Intake Nuxeo Document Type - - 5.2.1-SNAPSHOT - 1.5.1-SNAPSHOT - - - - org.nuxeo.ecm.core - nuxeo-core-schema - ${nuxeo.version.1.5} - - - org.nuxeo.ecm.platform - nuxeo-platform-types-core - ${nuxeo.version.5.2} - - - diff --git a/services/pom.xml b/services/pom.xml index 4a1d9c393..e60921875 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -1,240 +1,197 @@ - - - - org.collectionspace.services - org.collectionspace.services - 1.0 - - 4.0.0 - org.collectionspace.services - 1.0 - org.collectionspace.services.main - pom - services.main - - - - - common - authentication - relation - id - collectionobject - intake - JaxRsServiceProvider - client - IntegrationTests - - - - - maven-restlet - Public online Restlet repository - http://maven.restlet.org - - - public - http://maven.nuxeo.org/public - - - - false - - - - public-snapshot - http://maven.nuxeo.org/public-snapshot - - false - - - - - - - - - public - http://maven.nuxeo.org/public - Nuxeo virtual release repository - - - - false - - - - public-snapshot - http://maven.nuxeo.org/public-snapshot - Nuxeo virtual snapshot repository - - false - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - classpath - - build-classpath - - - classpath - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.0.1 - - org.collectionspace.* - - - - - - - - net.java.dev.jaxb2-commons - jaxb-fluent-api - 2.0.1 - - - org.testng - testng - 5.6 - test - jdk15 - - - org.jboss.resteasy - jaxrs-api - 1.0.2.GA - - - net.java.dev.jaxb2-commons - jaxb-fluent-api - 2.0.1 - - - org.jvnet.jaxb2-commons - property-listener-injector - 1.0 - - - org.jvnet.jaxb2_commons - runtime - 0.4.1 - - - org.jboss.resteasy - resteasy-jaxrs - 1.0.2.GA - - - commons-httpclient - commons-httpclient - 3.1 - - - com.sun.xml.bind - jaxb-impl - 2.1.7 - - - org.slf4j - slf4j-api - 1.5.2 - - - org.slf4j - slf4j-log4j12 - 1.5.2 - - - mysql - mysql-connector-java - 5.1.5 - test - - - - + + + + org.collectionspace.services + org.collectionspace.services + 1.0 + + 4.0.0 + org.collectionspace.services + 1.0 + org.collectionspace.services.main + pom + services.main + + + + common + authentication + relation + id + collectionobject + intake + JaxRsServiceProvider + client + IntegrationTests + + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-site-plugin + + /usr/bin/unzip -o > err.txt + + + + org.apache.maven.plugins + maven-war-plugin + 2.0.1 + + WEB-INF/lib/*.jar + + + true + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + classpath + + build-classpath + + + classpath + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.6 + 1.6 + + + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.0.1 + + org.collectionspace.* + + + + + + + + net.java.dev.jaxb2-commons + jaxb-fluent-api + 2.0.1 + + + org.testng + testng + 5.6 + test + jdk15 + + + org.jboss.resteasy + jaxrs-api + 1.0.2.GA + + + net.java.dev.jaxb2-commons + jaxb-fluent-api + 2.0.1 + + + org.jvnet.jaxb2-commons + property-listener-injector + 1.0 + + + org.jvnet.jaxb2_commons + runtime + 0.4.1 + + + org.jboss.resteasy + resteasy-jaxrs + 1.0.2.GA + + + commons-httpclient + commons-httpclient + 3.1 + + + com.sun.xml.bind + jaxb-impl + 2.1.7 + + + org.slf4j + slf4j-api + 1.5.2 + + + org.slf4j + slf4j-log4j12 + 1.5.2 + + + mysql + mysql-connector-java + 5.1.5 + test + + + + diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml index b79f1a1db..86768f6eb 100644 --- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml +++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml @@ -1,37 +1,19 @@ - - - - - org.nuxeo.ecm.platform - nuxeo-platform-parent - 5.2-SNAPSHOT - - 4.0.0 - org.collectionspace.services - 1.0 - org.collectionspace.services.relation.3rdparty.nuxeo - jar - services.relation.3rdparty.nuxeo - - CollectionSpace relation Nuxeo document type - - - 5.2.1-SNAPSHOT - 1.5.1-SNAPSHOT - - - - org.nuxeo.ecm.core - nuxeo-core-schema - ${nuxeo.version.1.5} - - - org.nuxeo.ecm.platform - nuxeo-platform-types-core - ${nuxeo.version.5.2} - - - - + + + + org.collectionspace.services + nuxeo-platform-collectionspace + 1.0 + + + 4.0.0 + org.collectionspace.services + 1.0 + org.collectionspace.services.relation.3rdparty.nuxeo + jar + services.relation.3rdparty.nuxeo + CollectionSpace relation Nuxeo document type. + +