From: remillet Date: Tue, 25 Oct 2016 19:02:23 +0000 (-0700) Subject: CSPACE-7038: Worked through many (if not most) jar conflicts that were preventing... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7b178e3769d562a0ec18c48528f5873506176d53;p=tmp%2Fjakarta-migration.git CSPACE-7038: Worked through many (if not most) jar conflicts that were preventing successful booting. Have some tests passing now. In particular, the Intake service tests are passing. --- diff --git a/build.properties b/build.properties index 8de5df936..b1cc92bc6 100644 --- a/build.properties +++ b/build.properties @@ -49,7 +49,7 @@ dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system} dist.deploy.nuxeo.plugins=${dist.deploy.nuxeo}/${nuxeo.plugins} #JEE Application Server -jee.release=apache-tomcat-6.0.33 +jee.release=apache-tomcat-7.0.57 jee.dir=${env.CSPACE_JEESERVER_HOME} jee.home=${jee.dir} jee.bin=${jee.home}/bin diff --git a/pom.xml b/pom.xml index 746ab57e6..771890267 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ UTF-8 4.5-SNAPSHOT 4.5-SNAPSHOT - 7.10 + 7.10-HF17 ${nuxeo.general.release} ${nuxeo.general.release} ${nuxeo.general.release} @@ -133,7 +133,7 @@ false - + public-snapshot http://maven.nuxeo.org/public-snapshot @@ -159,6 +159,18 @@ + + nightly-staging + nuxeo-nightly-staging + http://mavenin.nuxeo.com/nexus/content/repositories/nightly-staging + + true + + + false + + + false diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml index 663545f36..49cd8e31c 100644 --- a/services/IntegrationTests/pom.xml +++ b/services/IntegrationTests/pom.xml @@ -116,7 +116,7 @@ jaxen jaxen - 1.1.1 + 1.1.6 provided diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index f23ae468e..4f38cd302 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -162,6 +162,10 @@ jsp-2.1 org.mortbay.jetty + + jaxb-impl + com.sun.xml.bind + @@ -363,10 +367,6 @@ commons-io commons-io - - org.jboss.resteasy - jaxrs-api - org.jboss.resteasy resteasy-jaxrs @@ -374,6 +374,12 @@ org.jboss.resteasy resteasy-jaxb-provider + + + jaxb-impl + com.sun.xml.bind + + org.jboss.resteasy @@ -521,17 +527,14 @@ org.nuxeo.common nuxeo-common - ${nuxeo.core.version} org.nuxeo.runtime nuxeo-runtime - ${nuxeo.core.version} org.nuxeo.ecm.core nuxeo-core - ${nuxeo.core.version} xerces @@ -546,7 +549,6 @@ org.nuxeo.ecm.core nuxeo-core-convert - ${nuxeo.core.version} org.nuxeo.lib.core @@ -556,34 +558,25 @@ org.nuxeo.ecm.core nuxeo-core-storage-sql-ra - ${nuxeo.core.version} org.nuxeo.ecm.core nuxeo-core-query - ${nuxeo.core.version} + ${nuxeo.core.version} org.nuxeo.ecm.core nuxeo-core-schema - ${nuxeo.core.version} + + --> org.nuxeo.runtime nuxeo-runtime-jtajca - ${nuxeo.core.version} - - - - - log4j log4j @@ -122,14 +50,6 @@ 1.0 provided - mysql mysql-connector-java @@ -144,10 +64,6 @@ - - org.jboss.resteasy - jaxrs-api - org.jboss.resteasy resteasy-jaxrs @@ -184,77 +100,6 @@ 2.2.2.SP8 provided - - - diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml index 62d404615..f4eb0571d 100644 --- a/services/authority/service/pom.xml +++ b/services/authority/service/pom.xml @@ -161,7 +161,7 @@ com.sun.xml.bind - jaxb-impl + jaxb-core org.jvnet.jaxb2-commons @@ -169,10 +169,6 @@ - - org.jboss.resteasy - jaxrs-api - org.jboss.resteasy resteasy-jaxrs @@ -228,13 +224,11 @@ org.nuxeo.common nuxeo-common - ${nuxeo.core.version} provided org.nuxeo.runtime nuxeo-runtime - ${nuxeo.core.version} org.nuxeo.ecm.core @@ -248,18 +242,17 @@ org.nuxeo.ecm.core nuxeo-core-schema - ${nuxeo.core.version} org.nuxeo.ecm.core nuxeo-core-storage-sql - ${nuxeo.core.version} + org.nuxeo.runtime nuxeo-runtime-osgi diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java index c8611215f..ff5f1b763 100644 --- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java +++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java @@ -40,6 +40,7 @@ import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; +import javax.ws.rs.core.MultivaluedHashMap; import org.collectionspace.services.client.IClientQueryParams; import org.collectionspace.services.client.IQueryManager; @@ -1064,7 +1065,16 @@ public abstract class AuthorityResource String parentcsid = lookupParentCSID(ctx, parentspecifier, "getReferencingObjects(parent)", "GET_ITEM_REF_OBJS", uriInfo); String itemcsid = lookupItemCSID(ctx, itemspecifier, parentcsid, "getReferencingObjects(item)", "GET_ITEM_REF_OBJS"); - List serviceTypes = queryParams.remove(ServiceBindingUtils.SERVICE_TYPE_PROP); + // RESTEasy returns a read-only set of query params, so we need to make a read-write copy of them + MultivaluedHashMap tmpQueryParams = new MultivaluedHashMap(); + tmpQueryParams.putAll(queryParams); + // Set the original query params to the new copy + queryParams = tmpQueryParams; + // Update the service context with the new copy + ctx.setQueryParams(queryParams); + + // Remove the "type" property from the query params + List serviceTypes = queryParams.remove(ServiceBindingUtils.SERVICE_TYPE_PROP); if (serviceTypes == null || serviceTypes.isEmpty()) { serviceTypes = ServiceBindingUtils.getCommonServiceTypes(true); //CSPACE-5359: Should now include objects, procedures, and authorities } diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml index efac33110..79f366630 100644 --- a/services/authorization-mgt/client/pom.xml +++ b/services/authorization-mgt/client/pom.xml @@ -73,10 +73,12 @@ org.jboss.resteasy resteasy-jaxb-provider + commons-httpclient commons-httpclient diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml index 323890420..f14b1d67c 100644 --- a/services/authorization/jaxb/pom.xml +++ b/services/authorization/jaxb/pom.xml @@ -13,6 +13,10 @@ + + com.sun.xml.bind + jaxb-core + com.sun.xml.bind jaxb-impl diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml index 7a2320035..8e32c5bc2 100644 --- a/services/authorization/service/pom.xml +++ b/services/authorization/service/pom.xml @@ -67,8 +67,8 @@ org.jboss.logging - jboss-logging-log4j - 2.1.0.GA + jboss-logging + 3.1.4.GA jboss diff --git a/services/client/pom.xml b/services/client/pom.xml index 4b2342de9..3a0c7e0b5 100644 --- a/services/client/pom.xml +++ b/services/client/pom.xml @@ -60,7 +60,7 @@ xerces xercesImpl - 2.9.1 + 2.11.0 org.jboss.resteasy @@ -74,7 +74,7 @@ org.jboss.resteasy - jaxrs-api + resteasy-jaxrs org.jboss.resteasy @@ -84,6 +84,12 @@ org.jboss.resteasy resteasy-multipart-provider + + org.jboss.logging + jboss-logging + 3.1.4.GA + runtime + @@ -101,8 +107,7 @@ com.sun.xml.bind - jaxb-impl - 2.2.7 + jaxb-core jar compile diff --git a/services/common-api/pom.xml b/services/common-api/pom.xml index 4370974c9..b1c043b20 100644 --- a/services/common-api/pom.xml +++ b/services/common-api/pom.xml @@ -33,7 +33,7 @@ jaxen jaxen - 1.1.1 + 1.1.6 diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml index 483fd3d7f..db8ea871a 100644 --- a/services/common-test/pom.xml +++ b/services/common-test/pom.xml @@ -55,10 +55,6 @@ - - org.jboss.resteasy - jaxrs-api - org.jboss.resteasy resteasy-jaxb-provider diff --git a/services/common/pom.xml b/services/common/pom.xml index 866f8e4ab..fb2dafaa7 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -151,14 +151,14 @@ org.apache.tomcat - dbcp - 6.0.33 + tomcat-dbcp + 7.0.64 provided org.apache.tomcat - catalina - 6.0.33 + tomcat-catalina + 7.0.64 provided @@ -199,10 +199,6 @@ - - org.jboss.resteasy - jaxrs-api - org.jboss.resteasy resteasy-jaxrs @@ -272,13 +268,11 @@ org.nuxeo.common nuxeo-common - ${nuxeo.core.version} provided org.nuxeo.runtime nuxeo-runtime - ${nuxeo.core.version} org.nuxeo.ecm.core @@ -292,39 +286,37 @@ org.nuxeo.ecm.core nuxeo-core-schema - ${nuxeo.core.version} org.nuxeo.ecm.core nuxeo-core-storage-sql - ${nuxeo.core.version} org.nuxeo.ecm.core nuxeo-core-storage-sql-ra - ${nuxeo.core.version} + org.nuxeo.ecm.core nuxeo-core-convert - ${nuxeo.core.version} - org.nuxeo.runtime nuxeo-runtime-osgi ${nuxeo.core.version} + + org.nuxeo.ecm.core + nuxeo-opencmis-impl + org.nuxeo.ecm.core nuxeo-opencmis-bindings - ${nuxeo.core.version} jsr311-api diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryClientImpl.java index a24eb9cfc..5a03d506a 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryClientImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryClientImpl.java @@ -63,7 +63,6 @@ import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl; import org.collectionspace.services.common.config.TenantBindingUtils; import org.collectionspace.services.common.storage.PreparedStatementBuilder; import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.AuthorityItemSpecifier; -import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.Specifier; import org.collectionspace.services.config.tenant.TenantBindingType; import org.collectionspace.services.config.tenant.RepositoryDomainType; @@ -341,7 +340,7 @@ public class RepositoryClientImpl implements RepositoryClient com.sun.xml.bind - jaxb-impl + jaxb-core org.jvnet.jaxb2_commons diff --git a/services/material/jaxb/pom.xml b/services/material/jaxb/pom.xml index 6b8240de1..173a34906 100644 --- a/services/material/jaxb/pom.xml +++ b/services/material/jaxb/pom.xml @@ -19,7 +19,7 @@ com.sun.xml.bind - jaxb-impl + jaxb-core @@ -188,7 +188,7 @@ javax.xml.bind jaxb-api - 2.1 + ${jaxb.version} org.jvnet.jaxb2_commons @@ -310,11 +310,75 @@ javax.servlet 2.5 + + + + org.nuxeo.ecm.core + nuxeo-core + ${nuxeo.core.version} + org.nuxeo.ecm.core nuxeo-core-api - ${nuxeo.core.version} + ${nuxeo.core.version} + + org.nuxeo.common + nuxeo-common + ${nuxeo.core.version} + + + org.nuxeo.runtime + nuxeo-runtime + ${nuxeo.core.version} + + + org.nuxeo.ecm.core + nuxeo-core-schema + ${nuxeo.core.version} + + + org.nuxeo.ecm.core + nuxeo-core-storage-sql + ${nuxeo.core.version} + + + org.nuxeo.ecm.core + nuxeo-core-storage-sql-ra + ${nuxeo.core.version} + + + org.nuxeo.ecm.core + nuxeo-core-io + ${nuxeo.core.version} + + + org.nuxeo.ecm.core + nuxeo-core-convert + ${nuxeo.core.version} + + + org.nuxeo.ecm.core + nuxeo-opencmis-impl + ${nuxeo.core.version} + + + org.nuxeo.ecm.core + nuxeo-opencmis-bindings + ${nuxeo.core.version} + + + org.nuxeo.runtime + nuxeo-runtime-jtajca + ${nuxeo.core.version} + + + org.nuxeo.runtime + nuxeo-runtime-datasource + ${nuxeo.core.version} + + + net.java.dev.jaxb2-commons jaxb-fluent-api @@ -335,11 +399,6 @@ jaxb2-basics-runtime ${jaxb2-basics.version} - - org.jboss.resteasy - jaxrs-api - ${resteasy.version} - org.jboss.resteasy resteasy-jaxrs @@ -370,6 +429,11 @@ commons-cli 1.2 + + com.sun.xml.bind + jaxb-core + ${jaxb.version} + com.sun.xml.bind jaxb-impl diff --git a/services/query/service/pom.xml b/services/query/service/pom.xml index c7d240375..7fd45ce4c 100644 --- a/services/query/service/pom.xml +++ b/services/query/service/pom.xml @@ -58,10 +58,6 @@ - - org.jboss.resteasy - jaxrs-api - org.jboss.resteasy resteasy-jaxrs diff --git a/services/work/jaxb/pom.xml b/services/work/jaxb/pom.xml index 6f287804f..d9ede8624 100644 --- a/services/work/jaxb/pom.xml +++ b/services/work/jaxb/pom.xml @@ -19,7 +19,7 @@ com.sun.xml.bind - jaxb-impl + jaxb-core