]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
DRYD-1742: Change deployment for common/lib jars (#459)
authorMichael Ritter <mikejritter@users.noreply.github.com>
Fri, 4 Apr 2025 18:32:22 +0000 (12:32 -0600)
committerGitHub <noreply@github.com>
Fri, 4 Apr 2025 18:32:22 +0000 (14:32 -0400)
* Consolidate dependency management

* Add new module to track dependencies deployed to tomcat lib

* Cleanup parent pom

* Remove mysql-connector-java

* Remove unused test

* Exclusions for auth-mgt.import

* Remove duplicate dependency

* Fix duplicate plugin config

* Use stax2-api version from JaxRSServiceProvider

* Remove aspectj from common deploy

* Add undeploy task

* Remove obsolete build targets

* Change package type to pom

17 files changed:
build.xml
common-lib/build.xml [new file with mode: 0644]
common-lib/pom.xml [new file with mode: 0644]
pom.xml
services/JaxRsServiceProvider/pom.xml
services/account/client/pom.xml
services/authentication/pstore/pom.xml
services/authentication/service/src/test/java/org/collectionspace/authentication/AppTest.java [deleted file]
services/authority/pom.xml
services/authority/service/pom.xml
services/authorization-mgt/client/pom.xml
services/authorization-mgt/import/pom.xml
services/authorization/pstore/pom.xml
services/authorization/service/pom.xml
services/common/build.xml
services/common/pom.xml
services/pom.xml

index 20bbbc119e2d17a95d8109a275ab331bf0226a82..305719f22525c79f279bdc2895e9869be2c586a5 100644 (file)
--- a/build.xml
+++ b/build.xml
                        <fileset dir="${src}/main/resources/scripts/" />
                </copy>
                <ant antfile="3rdparty/build.xml" target="deploy" inheritAll="false" />
+               <ant antfile="common-lib/build.xml" target="deploy" inheritAll="false" />
                <ant antfile="services/build.xml" target="deploy" inheritAll="false" />
-           <ant antfile="cspace-ui/build.xml" target="deploy" inheritAll="false" />
+               <ant antfile="cspace-ui/build.xml" target="deploy" inheritAll="false" />
        </target>
 
        <target name="setup_initdb.sql" description="copy init_db scripts, replacing keywords">
diff --git a/common-lib/build.xml b/common-lib/build.xml
new file mode 100644 (file)
index 0000000..e69ae62
--- /dev/null
@@ -0,0 +1,43 @@
+<project name="common-lib" default="package" basedir=".">
+    <description>Collectionspace Services common libraries</description>
+    <property environment="env" />
+
+    <target name="deploy">
+        <fail unless="env.CSPACE_JEESERVER_HOME" message="CSPACE_JEESERVER_HOME is not set" />
+        <property name="tomcat.lib" value="${env.CSPACE_JEESERVER_HOME}/lib" />
+
+        <exec executable="mvn" failonerror="true">
+            <arg value="dependency:copy-dependencies" />
+            <arg value="-DoutputDirectory=${tomcat.lib}" />
+            <arg value="-DexcludeTransitive=true" />
+            <arg value="-DincludeScope=compile" />
+        </exec>
+    </target>
+
+    <target name="undeploy">
+        <fail unless="env.CSPACE_JEESERVER_HOME" message="CSPACE_JEESERVER_HOME is not set" />
+        <property name="tomcat.lib" value="${env.CSPACE_JEESERVER_HOME}/lib" />
+
+        <!-- Not the prettiest way to do this, but we want to clear out all of our deployed
+             dependencies from the tomcat/lib. So create an exclusion set of the base tomcat lib. -->
+        <patternset id="tomcat-base-files">
+            <exclude name="annotations-api.jar" />
+            <exclude name="el-api.jar" />
+            <exclude name="jaspic-api.jar" />
+            <exclude name="jsp-api.jar" />
+            <exclude name="servlet-api.jar" />
+            <exclude name="websocket-api.jar" />
+            <exclude name="catalina*.jar" />
+            <exclude name="ecj-*.jar" />
+            <exclude name="jasper*jar" />
+            <exclude name="tomcat-*.jar" />
+        </patternset>
+
+        <delete>
+            <fileset dir="${tomcat.lib}">
+                <include name="*.jar" />
+                <patternset refid="tomcat-base-files" />
+            </fileset>
+        </delete>
+    </target>
+</project>
diff --git a/common-lib/pom.xml b/common-lib/pom.xml
new file mode 100644 (file)
index 0000000..1678635
--- /dev/null
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.collectionspace.services</groupId>
+    <artifactId>org.collectionspace.services</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <artifactId>common-lib</artifactId>
+  <packaging>pom</packaging>
+
+  <dependencies>
+    <!-- Nuxeo Runtime -->
+    <dependency>
+      <groupId>org.nuxeo.lib.runtime</groupId>
+      <artifactId>nuxeo-runtime-launcher</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.nuxeo.lib.runtime</groupId>
+      <artifactId>nuxeo-runtime-tomcat-adapter</artifactId>
+    </dependency>
+
+    <!-- Logging (log4j + slf4j) -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-1.2-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+    </dependency>
+
+    <!-- Spring -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-acl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-crypto</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-oauth2-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-oauth2-jose</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-oauth2-resource-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-saml2-service-provider</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-oauth2-authorization-server</artifactId>
+    </dependency>
+
+    <!-- Spring Dependency -->
+    <dependency>
+      <groupId>aopalliance</groupId>
+      <artifactId>aopalliance</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.nimbusds</groupId>
+      <artifactId>nimbus-jose-jwt</artifactId>
+    </dependency>
+
+    <!-- OpenSAML -->
+    <dependency>
+      <groupId>org.opensaml</groupId>
+      <artifactId>opensaml-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opensaml</groupId>
+      <artifactId>opensaml-messaging-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opensaml</groupId>
+      <artifactId>opensaml-profile-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opensaml</groupId>
+      <artifactId>opensaml-saml-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opensaml</groupId>
+      <artifactId>opensaml-saml-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opensaml</groupId>
+      <artifactId>opensaml-security-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opensaml</groupId>
+      <artifactId>opensaml-security-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opensaml</groupId>
+      <artifactId>opensaml-soap-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opensaml</groupId>
+      <artifactId>opensaml-storage-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opensaml</groupId>
+      <artifactId>opensaml-xmlsec-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opensaml</groupId>
+      <artifactId>opensaml-xmlsec-impl</artifactId>
+    </dependency>
+
+    <!-- OpenSAML Dependencies -->
+    <dependency>
+      <groupId>net.shibboleth.utilities</groupId>
+      <artifactId>java-support</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.cryptacular</groupId>
+      <artifactId>cryptacular</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>stax2-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.santuario</groupId>
+      <artifactId>xmlsec</artifactId>
+    </dependency>
+
+    <!-- Jackson -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
+    </dependency>
+
+    <!-- Apache Libs -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+    </dependency>
+
+    <!-- Nuxeo dependencies -->
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-all</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+
+    <!-- XML Merge -->
+    <dependency>
+      <groupId>ch.elca.el4j.modules</groupId>
+      <artifactId>module-xml_merge-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jdom</groupId>
+      <artifactId>jdom</artifactId>
+    </dependency>
+
+    <!-- Gateway Jars -->
+    <!--
+      These are not required for the services war so they should live somewhere else. It's difficult to test
+      version changes because they require the gateway to be deployed.
+    -->
+    <dependency>
+      <groupId>com.fasterxml</groupId>
+      <artifactId>classmate</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate.validator</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>6.0.22.Final</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>2.0.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+      <version>3.4.1.Final</version>
+    </dependency>
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.25</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/pom.xml b/pom.xml
index 7950dc31847e3e604a71cf746b03b9f7861c6188..0f2ff450d95125e3ad13093b49ffa2acba6a6fce 100644 (file)
--- a/pom.xml
+++ b/pom.xml
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <cspace.services.version>${revision}</cspace.services.version>
                <cspace.services.client.version>${revision}</cspace.services.client.version>
+               <tomcat.version>8.5.40</tomcat.version>
+
+               <!-- Managed Dependency Versions -->
+               <aspectj.version>1.7.4</aspectj.version>
+               <chemistry.opencmis.version.nx>0.12.0-NX2</chemistry.opencmis.version.nx>
                <jackson.version>2.14.3</jackson.version>
+               <jaxb.version>2.2.11</jaxb.version>
+               <jaxb2-basics.version>0.6.2</jaxb2-basics.version>
+               <log4j.version>2.17.1</log4j.version>
                <nuxeo.general.release>9.10-HF30</nuxeo.general.release>
                <nuxeo.shell.version>${nuxeo.general.release}</nuxeo.shell.version>
                <nuxeo.platform.version>${nuxeo.general.release}</nuxeo.platform.version>
                <nuxeo.core.version>${nuxeo.general.release}</nuxeo.core.version>
-               <chemistry.opencmis.version.nx>0.12.0-NX2</chemistry.opencmis.version.nx>
+               <opensaml.version>3.4.6</opensaml.version>
+               <postgres.driver.version>42.3.9</postgres.driver.version>
+               <resteasy.version>3.0.20.Final</resteasy.version>
+               <slf4j.version>1.7.32</slf4j.version>
                <spring.version>5.3.28</spring.version>
                <spring.security.version>5.8.4</spring.security.version>
                <spring.security.authorization.server.version>0.4.3</spring.security.authorization.server.version>
-               <aspectj.version>1.7.4</aspectj.version>
-               <log4j.version>2.17.1</log4j.version>
        </properties>
 
        <distributionManagement>
@@ -43,6 +52,7 @@
        <modules>
                <module>3rdparty</module>
                <module>services</module>
+               <module>common-lib</module>
        </modules>
 
        <repositories>
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-assembly-plugin</artifactId>
-                                       <configuration>
-                                       </configuration>
                                </plugin>
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                                <lifecycleMappingMetadata>
                                                        <pluginExecutions>
                                                                <pluginExecution>
-                                                               <pluginExecutionFilter>
-                                                                       <groupId>org.codehaus.mojo</groupId>
-                                                                       <artifactId>properties-maven-plugin</artifactId>
-                                                                       <versionRange>[1.0.0,)</versionRange>
-                                                                       <goals>
-                                                                               <goal>
-                                                                                       read-project-properties
-                                                                               </goal>
-                                                                       </goals>
-                                                               </pluginExecutionFilter>
-                                                               <action>
-                                                                       <ignore></ignore>
-                                                               </action>
-                                                       </pluginExecution>
+                                                                       <pluginExecutionFilter>
+                                                                               <groupId>org.codehaus.mojo</groupId>
+                                                                               <artifactId>properties-maven-plugin</artifactId>
+                                                                               <versionRange>[1.0.0,)</versionRange>
+                                                                               <goals>
+                                                                                       <goal>read-project-properties</goal>
+                                                                               </goals>
+                                                                       </pluginExecutionFilter>
+                                                                       <action>
+                                                                               <ignore/>
+                                                                       </action>
+                                                               </pluginExecution>
                                                                <pluginExecution>
                                                                        <pluginExecutionFilter>
-                                                                               <groupId>
-                                                                                       org.apache.maven.plugins
-                                                                               </groupId>
-                                                                               <artifactId>
-                                                                                       maven-antrun-plugin
-                                                                               </artifactId>
-                                                                               <versionRange>
-                                                                                       [1.3,)
-                                                                               </versionRange>
+                                                                               <groupId>org.apache.maven.plugins</groupId>
+                                                                               <artifactId>maven-antrun-plugin</artifactId>
+                                                                               <versionRange>[1.3,)</versionRange>
                                                                                <goals>
                                                                                        <goal>run</goal>
                                                                                </goals>
                                                                        </pluginExecutionFilter>
                                                                        <action>
-                                                                               <ignore></ignore>
+                                                                               <ignore/>
                                                                        </action>
                                                                </pluginExecution>
-                                                       </pluginExecutions>
-                                               </lifecycleMappingMetadata>
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.codehaus.mojo</groupId>
-                                       <artifactId>properties-maven-plugin</artifactId>
-                                       <version>1.0.0</version>
-                       <executions>
-                                               <execution>
-                                                       <phase>initialize</phase>
-                                                       <goals>
-                                                               <goal>read-project-properties</goal>
-                                                       </goals>
-                                               </execution>
-                       </executions>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.eclipse.m2e</groupId>
-                                       <artifactId>lifecycle-mapping</artifactId>
-                                       <version>1.0.0</version>
-                                       <configuration>
-                                               <lifecycleMappingMetadata>
-                                                       <pluginExecutions>
                                                                <pluginExecution>
                                                                        <pluginExecutionFilter>
                                                                                <groupId>org.codehaus.mojo</groupId>
                                                </lifecycleMappingMetadata>
                                        </configuration>
                                </plugin>
+                               <plugin>
+                                       <groupId>org.codehaus.mojo</groupId>
+                                       <artifactId>properties-maven-plugin</artifactId>
+                                       <version>1.0.0</version>
+                                       <executions>
+                                               <execution>
+                                                       <phase>initialize</phase>
+                                                       <goals>
+                                                               <goal>read-project-properties</goal>
+                                                       </goals>
+                                               </execution>
+                                       </executions>
+                               </plugin>
                        </plugins>
                </pluginManagement>
 
                                </executions>
                        </plugin>
                        <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>properties-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <files>
-                        <file>build.properties</file>
-                    </files>
-                </configuration>
-            </plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>properties-maven-plugin</artifactId>
+                               <inherited>false</inherited>
+                               <configuration>
+                                       <files>
+                                               <file>build.properties</file>
+                                       </files>
+                               </configuration>
+                       </plugin>
                </plugins>
        </build>
 
        <dependencyManagement>
                <dependencies>
-                       <!-- Ensure transitive dependencies on slf4j and log4j libraries all use the same version. -->
-                       <!-- These jars are all provided, in services/common/lib/slf4j. -->
+                       <!-- Provided dependencies (for common-lib/cspace-service.war deployments) -->
+                       <!-- Logging dependencies (slf4j, log4j) -->
                        <dependency>
                                <groupId>org.slf4j</groupId>
                                <artifactId>slf4j-api</artifactId>
-                               <version>1.7.32</version>
+                               <version>${slf4j.version}</version>
                                <scope>provided</scope>
                        </dependency>
                        <dependency>
                                <version>${log4j.version}</version>
                                <scope>provided</scope>
                        </dependency>
-                       <!-- commons-logging is provided by jcl-over-slf4j, in services/common/lib/slf4j. -->
                        <dependency>
-                               <groupId>commons-logging</groupId>
-                               <artifactId>commons-logging</artifactId>
+                               <groupId>org.slf4j</groupId>
+                               <artifactId>jcl-over-slf4j</artifactId>
+                               <version>${slf4j.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.logging.log4j</groupId>
+                               <artifactId>log4j-web</artifactId>
+                               <version>${log4j.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.logging.log4j</groupId>
+                               <artifactId>log4j-1.2-api</artifactId>
+                               <version>${log4j.version}</version>
                                <scope>provided</scope>
                        </dependency>
                        <!-- End of logging dependencies. -->
+
+                       <!-- AspectJ -->
+                       <dependency>
+                               <groupId>org.aspectj</groupId>
+                               <artifactId>aspectjrt</artifactId>
+                               <version>${aspectj.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.aspectj</groupId>
+                               <artifactId>aspectjtools</artifactId>
+                               <version>${aspectj.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.aspectj</groupId>
+                               <artifactId>aspectjweaver</artifactId>
+                               <version>${aspectj.version}</version>
+                       </dependency>
+
+                       <!-- Nuxeo Runtime -->
+                       <dependency>
+                               <groupId>org.nuxeo.lib.runtime</groupId>
+                               <artifactId>nuxeo-runtime-launcher</artifactId>
+                               <version>9.10-HF30</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.lib.runtime</groupId>
+                               <artifactId>nuxeo-runtime-tomcat-adapter</artifactId>
+                               <version>9.10-HF30</version>
+                               <scope>provided</scope>
+                       </dependency>
+
+                       <!-- Spring Framework/Security -->
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>spring-aop</artifactId>
+                               <version>${spring.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>spring-beans</artifactId>
+                               <version>${spring.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>spring-context</artifactId>
+                               <version>${spring.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>spring-context-support</artifactId>
+                               <version>${spring.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>spring-core</artifactId>
+                               <version>${spring.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>spring-expression</artifactId>
+                               <version>${spring.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>spring-jdbc</artifactId>
+                               <version>${spring.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-acl</artifactId>
+                               <version>${spring.security.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-config</artifactId>
+                               <version>${spring.security.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-core</artifactId>
+                               <version>${spring.security.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-crypto</artifactId>
+                               <version>${spring.security.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-oauth2-core</artifactId>
+                               <version>${spring.security.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-oauth2-jose</artifactId>
+                               <version>${spring.security.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-oauth2-resource-server</artifactId>
+                               <version>${spring.security.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-saml2-service-provider</artifactId>
+                               <version>${spring.security.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-web</artifactId>
+                               <version>${spring.security.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>spring-tx</artifactId>
+                               <version>${spring.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>spring-web</artifactId>
+                               <version>${spring.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <!-- Note: This uses a version which supports Java 8. When upgrading to Java 17 we can update this as well. -->
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-oauth2-authorization-server</artifactId>
+                               <version>0.4.3</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <!-- Spring Dependency -->
+                       <dependency>
+                               <groupId>aopalliance</groupId>
+                               <artifactId>aopalliance</artifactId>
+                               <version>1.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>com.nimbusds</groupId>
+                               <artifactId>nimbus-jose-jwt</artifactId>
+                               <version>9.24.4</version>
+                               <scope>provided</scope>
+                       </dependency>
+
+                       <!-- OpenSAML -->
+                       <dependency>
+                               <groupId>org.opensaml</groupId>
+                               <artifactId>opensaml-core</artifactId>
+                               <version>${opensaml.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opensaml</groupId>
+                               <artifactId>opensaml-messaging-api</artifactId>
+                               <version>${opensaml.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opensaml</groupId>
+                               <artifactId>opensaml-profile-api</artifactId>
+                               <version>${opensaml.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opensaml</groupId>
+                               <artifactId>opensaml-saml-api</artifactId>
+                               <version>${opensaml.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opensaml</groupId>
+                               <artifactId>opensaml-saml-impl</artifactId>
+                               <version>${opensaml.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opensaml</groupId>
+                               <artifactId>opensaml-security-api</artifactId>
+                               <version>${opensaml.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opensaml</groupId>
+                               <artifactId>opensaml-security-impl</artifactId>
+                               <version>${opensaml.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opensaml</groupId>
+                               <artifactId>opensaml-soap-api</artifactId>
+                               <version>${opensaml.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opensaml</groupId>
+                               <artifactId>opensaml-storage-api</artifactId>
+                               <version>${opensaml.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opensaml</groupId>
+                               <artifactId>opensaml-xmlsec-api</artifactId>
+                               <version>${opensaml.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opensaml</groupId>
+                               <artifactId>opensaml-xmlsec-impl</artifactId>
+                               <version>${opensaml.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <!-- OpenSAML Dependencies -->
+                       <dependency>
+                               <groupId>net.shibboleth.utilities</groupId>
+                               <artifactId>java-support</artifactId>
+                               <version>7.5.2</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.cryptacular</groupId>
+                               <artifactId>cryptacular</artifactId>
+                               <version>1.1.4</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>joda-time</groupId>
+                               <artifactId>joda-time</artifactId>
+                               <version>2.9</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>io.dropwizard.metrics</groupId>
+                               <artifactId>metrics-core</artifactId>
+                               <version>3.1.5</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>commons-codec</groupId>
+                               <artifactId>commons-codec</artifactId>
+                               <version>1.10</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.codehaus.woodstox</groupId>
+                               <artifactId>stax2-api</artifactId>
+                               <version>3.1.4</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.santuario</groupId>
+                               <artifactId>xmlsec</artifactId>
+                               <version>2.0.10</version>
+                       </dependency>
+
+                       <!-- Jackson -->
+                       <dependency>
+                               <groupId>com.fasterxml.jackson.core</groupId>
+                               <artifactId>jackson-core</artifactId>
+                               <version>${jackson.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>com.fasterxml.jackson.core</groupId>
+                               <artifactId>jackson-databind</artifactId>
+                               <version>${jackson.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>com.fasterxml.jackson.core</groupId>
+                               <artifactId>jackson-annotations</artifactId>
+                               <version>${jackson.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>com.fasterxml.jackson.datatype</groupId>
+                               <artifactId>jackson-datatype-jsr310</artifactId>
+                               <version>${jackson.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>com.fasterxml.jackson.dataformat</groupId>
+                               <artifactId>jackson-dataformat-xml</artifactId>
+                               <version>${jackson.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+
+                       <!-- Apache Libs -->
+                       <dependency>
+                               <groupId>org.apache.commons</groupId>
+                               <artifactId>commons-lang3</artifactId>
+                               <version>3.2.1</version>
+                               <scope>compile</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.httpcomponents</groupId>
+                               <artifactId>httpclient</artifactId>
+                               <version>4.5.13</version>
+                               <scope>compile</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.httpcomponents</groupId>
+                               <artifactId>httpcore</artifactId>
+                               <version>4.4.13</version>
+                               <scope>compile</scope>
+                       </dependency>
+
+                       <!-- Nuxeo dependencies -->
+                       <dependency>
+                               <groupId>net.sf.ehcache</groupId>
+                               <artifactId>ehcache</artifactId>
+                               <version>2.10.2</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.codehaus.groovy</groupId>
+                               <artifactId>groovy-all</artifactId>
+                               <version>2.4.12</version>
+                               <scope>compile</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>com.google.guava</groupId>
+                               <artifactId>guava</artifactId>
+                               <version>20.0</version>
+                               <scope>compile</scope>
+                       </dependency>
+
+                       <!-- XML Merge -->
                        <dependency>
                                <groupId>ch.elca.el4j.modules</groupId>
                                <artifactId>module-xml_merge-common</artifactId>
                                <version>3.1</version>
                                <scope>provided</scope>
-                               <exclusions>
-                                       <exclusion>
-                                               <groupId>commons-codec</groupId>
-                                               <artifactId>commons-codec</artifactId>
-                                       </exclusion>
-                                       <exclusion>
-                                               <groupId>org.slf4j</groupId>
-                                               <artifactId>slf4j-log4j12</artifactId>
-                                       </exclusion>
-                                       <exclusion>
-                                               <groupId>xml-apis</groupId>
-                                               <artifactId>xml-apis</artifactId>
-                                       </exclusion>
-                                       <exclusion>
-                                               <groupId>xalan</groupId>
-                                               <artifactId>xalan</artifactId>
-                                       </exclusion>
-                               </exclusions>
                        </dependency>
                        <dependency>
-                               <groupId>junit</groupId>
-                               <artifactId>junit</artifactId>
-                               <version>4.13.1</version>
-                               <scope>test</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.testng</groupId>
-                               <artifactId>testng</artifactId>
-                               <version>6.1.1</version>
-                               <scope>test</scope>
+                               <groupId>org.jdom</groupId>
+                               <artifactId>jdom</artifactId>
+                               <version>1.1</version>
+                               <scope>provided</scope>
                        </dependency>
+                       <!-- End common-lib provided dependencies -->
+
                        <dependency>
                                <groupId>javax.ejb</groupId>
                                <artifactId>ejb</artifactId>
                                <groupId>javax.transaction</groupId>
                                <artifactId>jta</artifactId>
                                <version>1.1</version>
-                               <!-- <scope>provided</scope> -->
                        </dependency>
 
                        <dependency>
                                <scope>provided</scope>
                        </dependency>
 
-                       <!-- Jackson -->
-
                        <dependency>
-                               <groupId>com.fasterxml.jackson.core</groupId>
-                               <artifactId>jackson-core</artifactId>
-                               <version>${jackson.version}</version>
-                               <scope>provided</scope>
+                               <groupId>net.java.dev.jaxb2-commons</groupId>
+                               <artifactId>jaxb-fluent-api</artifactId>
+                               <version>2.0.2</version>
                        </dependency>
                        <dependency>
-                               <groupId>com.fasterxml.jackson.core</groupId>
-                               <artifactId>jackson-databind</artifactId>
-                               <version>${jackson.version}</version>
-                               <scope>provided</scope>
+                               <groupId>org.jvnet.jaxb2_commons</groupId>
+                               <artifactId>jaxb2-basics</artifactId>
+                               <version>${jaxb2-basics.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>com.fasterxml.jackson.core</groupId>
-                               <artifactId>jackson-annotations</artifactId>
-                               <version>${jackson.version}</version>
-                               <scope>provided</scope>
+                               <groupId>org.jvnet.jaxb2-commons</groupId>
+                               <artifactId>property-listener-injector</artifactId>
+                               <version>1.0</version>
                        </dependency>
                        <dependency>
-                               <groupId>com.fasterxml.jackson.datatype</groupId>
-                               <artifactId>jackson-datatype-jsr310</artifactId>
-                               <version>${jackson.version}</version>
-                               <scope>provided</scope>
+                               <groupId>org.jvnet.jaxb2_commons</groupId>
+                               <artifactId>jaxb2-basics-runtime</artifactId>
+                               <version>${jaxb2-basics.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.jboss.resteasy</groupId>
+                               <artifactId>resteasy-jaxrs</artifactId>
+                               <version>${resteasy.version}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>tjws</groupId>
+                                               <artifactId>webserver</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>org.apache.httpcomponents</groupId>
+                                               <artifactId>httpclient</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.jboss.resteasy</groupId>
+                               <artifactId>resteasy-jaxb-provider</artifactId>
+                               <version>${resteasy.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.jboss.resteasy</groupId>
+                               <artifactId>resteasy-multipart-provider</artifactId>
+                               <version>${resteasy.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>commons-httpclient</groupId>
+                               <artifactId>commons-httpclient</artifactId>
+                               <version>3.1</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>commons-io</groupId>
+                               <artifactId>commons-io</artifactId>
+                               <version>2.7</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>commons-cli</groupId>
+                               <artifactId>commons-cli</artifactId>
+                               <version>1.2</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>com.sun.xml.bind</groupId>
+                               <artifactId>jaxb-core</artifactId>
+                               <version>${jaxb.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>com.sun.xml.bind</groupId>
+                               <artifactId>jaxb-impl</artifactId>
+                               <version>${jaxb.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.xml.bind</groupId>
+                               <artifactId>jaxb-api</artifactId>
+                               <version>${jaxb.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.persistence</groupId>
+                               <artifactId>persistence-api</artifactId>
+                               <version>1.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.hibernate</groupId>
+                               <artifactId>hibernate-entitymanager</artifactId>
+                               <version>3.4.0.GA</version>
+                               <exclusions>
+                                       <!-- Exclude dom4j:dom4j so we can upgrade to org.dom4j:dom4j. -->
+                                       <exclusion>
+                                               <groupId>dom4j</groupId>
+                                               <artifactId>dom4j</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.hibernate</groupId>
+                               <artifactId>hibernate-c3p0</artifactId>
+                               <version>3.6.10.Final</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.jvnet.hyperjaxb3</groupId>
+                               <!-- for time type adapters -->
+                               <artifactId>hyperjaxb3-ejb-runtime</artifactId>
+                               <version>0.6.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.postgresql</groupId>
+                               <artifactId>postgresql</artifactId>
+                               <version>${postgres.driver.version}</version>
+                       </dependency>
+
+                       <!-- Test Dependencies -->
+                       <dependency>
+                               <groupId>junit</groupId>
+                               <artifactId>junit</artifactId>
+                               <version>4.13.1</version>
+                               <scope>test</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.testng</groupId>
+                               <artifactId>testng</artifactId>
+                               <version>6.1.1</version>
+                               <scope>test</scope>
                        </dependency>
                </dependencies>
        </dependencyManagement>
index d574297c07e463548bd7f7ca7cd5b8efb7b348d9..d36f60f62689deeadca19171f621af203a2a58d3 100644 (file)
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>aspectjrt</artifactId>
-                       <version>${aspectj.version}</version>
                        <scope>runtime</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>aspectjtools</artifactId>
-                       <version>${aspectj.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>aspectjweaver</artifactId>
-                       <version>${aspectj.version}</version>
                </dependency>
 
         <!-- javax -->
index 5e9960a498f57b5b5e2541998aaff2bd800cc56b..8f5fb3ba0da51e03a35f08c375a3aa81ea2cceab 100644 (file)
         <!-- Needed if/when client test framework files are moved into -->
         <!-- /services/client/src/test from /services/client/src/main -->
 
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>test</scope>
-        </dependency>
                                <dependency>
                                                <groupId>org.postgresql</groupId>
                                                <artifactId>postgresql</artifactId>
index f30e55036131b5dd30241591dc4335fbfac1d118..3b61d781b7d3be9f4927a88df09b5ed379d4d0c3 100644 (file)
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
                <dependency>
                        <groupId>org.postgresql</groupId>
                        <artifactId>postgresql</artifactId>
diff --git a/services/authentication/service/src/test/java/org/collectionspace/authentication/AppTest.java b/services/authentication/service/src/test/java/org/collectionspace/authentication/AppTest.java
deleted file mode 100644 (file)
index 737ba7a..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.collectionspace.authentication;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}
index 0b8aca118d2f7e181bb791e89d6864bd7d648c54..62f9ec0bb853003746cb2db894b1ec8a9c496dd0 100644 (file)
             <artifactId>jacc</artifactId>
             <version>1.0</version>
             <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
         </dependency>
                                <dependency>
                                                <groupId>org.postgresql</groupId>
index 6fc97ecfb11b6fed8ac2bc4ac9220c4e735906d0..d0ec4e86bacdb50f347fefffb844f624de5276d3 100644 (file)
                        <version>1.0</version>
                        <scope>provided</scope>
                </dependency>
-               <dependency>
-                       <groupId>mysql</groupId>
-                       <artifactId>mysql-connector-java</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.postgresql</groupId>
                        <artifactId>postgresql</artifactId>
index 4cac00d99374752d6e0b8afb996cb7c12543d5d1..3bfc04abb68b3203c90717a2271c3de09535f690 100644 (file)
             <artifactId>ehcache</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
index 0963bf1e7be6ff576387be86df2566325df8f52b..74e88e959099a76e095c87528d9ed76d576c9649 100644 (file)
                        <artifactId>ehcache</artifactId>
                        <version>2.10.2</version>
                </dependency>
-               <dependency>
-                       <groupId>mysql</groupId>
-                       <artifactId>mysql-connector-java</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.postgresql</groupId>
                        <artifactId>postgresql</artifactId>
                <dependency>
                        <groupId>ch.elca.el4j.modules</groupId>
                        <artifactId>module-xml_merge-common</artifactId>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>commons-codec</groupId>
+                                       <artifactId>commons-codec</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>xml-apis</groupId>
+                                       <artifactId>xml-apis</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>org.collectionspace.services</groupId>
index 5a5c1f23d9651ccfa5e956fcabaa3be761e809d5..e4753e2985da7f3461837c7c24a8dbffcc78828a 100644 (file)
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authorization.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
         </dependency>
                        <dependency>
                        <groupId>org.postgresql</groupId>
index fff5e474651d7f3bef55723197852642ccfc328f..1f2146fc15f976f3b2d078988c2a455ce0f8ef91 100644 (file)
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
             <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>test</scope>
         </dependency>
                                <dependency>
                                                <groupId>org.postgresql</groupId>
index b04d3c24b419a87ac45811af6f8422d7b899c8a4..e50e1368500d31eee9094ee1419ec7a75072bef3 100644 (file)
         </exec>
     </target>
 
-    <target name="deploy_nuxeo"
-            description="deploy nuxeo binaries in ${jee.server.cspace}">
-        <copy todir="${jee.server.cspace}/lib">
-            <fileset dir="${basedir}/lib/nuxeo" includes="*.jar" />
-        </copy>
-    </target>
-
-    <target name="deploy_spring"
-            description="deploy spring binaries in ${jee.server.cspace}">
-        <copy todir="${jee.server.cspace}/lib">
-            <fileset dir="${basedir}/lib/spring" includes="*.jar" />
-        </copy>
-    </target>
-
-       <target name="deploy_aspectj"
-            description="deploy AspectJ binaries in ${jee.server.cspace}">
-        <copy todir="${jee.server.cspace}/lib">
-            <fileset dir="${basedir}/lib/aspectj" includes="*.jar" />
-        </copy>
-    </target>
-
-    <target name="deploy_gateway"
-        description="deploy gateway binaries in ${jee.server.cspace}">
-        <copy todir="${jee.server.cspace}/lib">
-            <fileset dir="${basedir}/lib/gateway" includes="*.jar" />
-        </copy>
-    </target>
-
-    <target name="deploy_slf4j"
-            description="deploy spring binaries in ${jee.server.cspace}">
-        <copy todir="${jee.server.cspace}/lib">
-            <fileset dir="${basedir}/lib/slf4j" includes="*.jar" />
-        </copy>
-    </target>
-
-    <target name="deploy_xmlmerge"
-            description="deploy XMLMerge binaries in ${jee.server.cspace}">
-        <copy todir="${jee.server.cspace}/lib">
-            <fileset dir="${basedir}/lib/xmlmerge" includes="*.jar" />
-        </copy>
-    </target>
-
     <target name="deploy_tenantconfig"
             description="deploy tenant configuration">
         <copy todir="${jee.server.cspace}/cspace/config/services">
     <target name="deploy" depends="install"
             description="deploy common elements in ${jee.server.cspace}">
         <copy file="${basedir}/target/${common.jar}" todir="${jee.server.cspace}/lib"/>
-
-        <antcall target="deploy_nuxeo" />
-        <antcall target="deploy_aspectj" />
-        <antcall target="deploy_gateway" />
-        <antcall target="deploy_spring" />
-        <antcall target="deploy_slf4j" />
-        <antcall target="deploy_xmlmerge" />
         <antcall target="deploy_tenantconfig" />
     </target>
 
     <target name="undeploy"
             description="undeploy common elements from ${jee.server.cspace}">
-        <antcall target="undeploy_nuxeo" />
-        <antcall target="undeploy_aspectj" />
-        <antcall target="undeploy_gateway" />
-        <antcall target="undeploy_spring" />
-               <antcall target="undeploy_slf4j" />
-               <antcall target="undeploy_xmlmerge" />
-               <!--
-        <copy tofile="${jee.server.cspace}/conf/jboss-log4j.xml"
-              file="${jee.server.cspace}/conf/jboss-log4j.xml.org"
-              overwrite="true" failonerror="false" />
-               -->
-               <!--
-        <delete failonerror="false" file="${jee.server.cspace}/conf/jboss-log4j-release.xml"/>
-               -->
         <delete failonerror="false" file="${jee.server.cspace}/lib/${common.jar}"/>
 
         <delete failonerror="false">
         </delete>
     </target>
 
-    <target name="undeploy_nuxeo"
-            description="undeploy nuxeo binaries from ${jee.server.cspace}">
-        <pathconvert property="nuxeo.jars" pathsep=",">
-            <fileset dir="${basedir}/lib/nuxeo" includes="*.jar" />
-
-            <chainedmapper>
-                <flattenmapper />
-                <regexpmapper from="^(.*?)-[^-]+\.jar$" to="\1-*.jar" />
-            </chainedmapper>
-        </pathconvert>
-
-        <delete>
-            <fileset dir="${jee.server.cspace}/lib" includes="${nuxeo.jars}" />
-        </delete>
-
-        <delete>
-            <fileset dir="${jee.deploy.nuxeo.plugins}">
-                <include name="collectionspace.shared.schema.collectionspace_core.jar"/>
-            </fileset>
-        </delete>
-    </target>
-
-    <target name="undeploy_spring"
-            description="undeploy spring binaries from ${jee.server.cspace}">
-        <pathconvert property="spring.jars" pathsep=",">
-            <fileset dir="${basedir}/lib/spring" includes="*.jar" />
-
-            <chainedmapper>
-                <flattenmapper />
-                <regexpmapper from="^(.*?)-[^-]+\.jar$" to="\1-*.jar" />
-            </chainedmapper>
-        </pathconvert>
-
-        <delete>
-            <fileset dir="${jee.server.cspace}/lib" includes="${spring.jars}" />
-            <!-- Clear out Spring jars that used to be deployed in older versions of CollectionSpace -->
-            <fileset dir="${jee.server.cspace}/lib" includes="spring-instrument-*.jar,spring-security-jwt-*.jar,spring-security-oauth2-*.jar,spring-webmvc-*.jar" />
-        </delete>
-    </target>
-
-       <target name="undeploy_aspectj"
-            description="undeploy AspectJ binaries from ${jee.server.cspace}">
-        <pathconvert property="aspectj.jars" pathsep=",">
-            <fileset dir="${basedir}/lib/aspectj" includes="*.jar" />
-
-            <chainedmapper>
-                <flattenmapper />
-                <regexpmapper from="^(.*?)-[^-]+\.jar$" to="\1-*.jar" />
-            </chainedmapper>
-        </pathconvert>
-
-        <delete>
-            <fileset dir="${jee.server.cspace}/lib" includes="${aspectj.jars}" />
-        </delete>
-    </target>
-
-       <target name="undeploy_gateway"
-            description="undeploy gateway binaries from ${jee.server.cspace}">
-        <pathconvert property="gateway.jars" pathsep=",">
-            <fileset dir="${basedir}/lib/gateway" includes="*.jar" />
-
-            <chainedmapper>
-                <flattenmapper />
-                <regexpmapper from="^(.*?)-[^-]+\.jar$" to="\1-*.jar" />
-            </chainedmapper>
-        </pathconvert>
-
-        <delete>
-            <fileset dir="${jee.server.cspace}/lib" includes="${gateway.jars}" />
-        </delete>
-    </target>
-
-    <target name="undeploy_slf4j"
-            description="undeploy SLF4J binaries from ${jee.server.cspace}">
-        <pathconvert property="slf4j.jars" pathsep=",">
-            <fileset dir="${basedir}/lib/slf4j" includes="*.jar" />
-
-            <chainedmapper>
-                <flattenmapper />
-                <regexpmapper from="^(.*?)-[^-]+\.jar$" to="\1-*.jar" />
-            </chainedmapper>
-        </pathconvert>
-
-        <delete>
-            <fileset dir="${jee.server.cspace}/lib" includes="${slf4j.jars}" />
-        </delete>
-    </target>
-
-    <target name="undeploy_xmlmerge"
-            description="undeploy XMLMerge binaries from ${jee.server.cspace}">
-        <pathconvert property="xmlmerge.jars" pathsep=",">
-            <fileset dir="${basedir}/lib/xmlmerge" includes="*.jar" />
-
-            <chainedmapper>
-                <flattenmapper />
-                <regexpmapper from="^(.*?)-[^-]+\.jar$" to="\1-*.jar" />
-            </chainedmapper>
-        </pathconvert>
-
-        <delete>
-            <fileset dir="${jee.server.cspace}/lib" includes="${xmlmerge.jars}" />
-        </delete>
-    </target>
-
     <target name="dist_spring"
             description="dist spring binaries in ${dist.server.cspace}">
         <copy todir="${services.trunk}/${dist.server.cspace}/lib">
index c2184393655f0eff25cc58bd25c23a76b067e088..7dc3204024d30092652a69539ea54fd8d70aaf70 100644 (file)
                        <version>1.0</version>
                        <scope>provided</scope>
                </dependency>
-               <dependency>
-                       <groupId>mysql</groupId>
-                       <artifactId>mysql-connector-java</artifactId>
-                       <scope>provided</scope>
-               </dependency>
                <dependency>
                        <groupId>org.postgresql</groupId>
                        <artifactId>postgresql</artifactId>
                        <groupId>ch.elca.el4j.modules</groupId>
                        <artifactId>module-xml_merge-common</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.springframework.security</groupId>
                        <artifactId>spring-security-acl</artifactId>
index 2fb3eaecccd4f87d1857d4fe505c6e01dd411549..f369d9efff305505d697efc7db8e2bd3cecc0004 100644 (file)
 
        <properties>
                <annox.version>0.5.0</annox.version>
-               <jaxb2-basics.version>0.6.2</jaxb2-basics.version>
                <maven-jaxb2-plugin.version>0.13.3</maven-jaxb2-plugin.version>
-               <jaxb.version>2.2.11</jaxb.version>
-               <resteasy.version>3.0.20.Final</resteasy.version>
-               <mysql.driver.version>8.0.28</mysql.driver.version>
-               <postgres.driver.version>42.3.9</postgres.driver.version>
-               <tomcat.version>8.5.40</tomcat.version>
                <!-- The default life cycle policy for Nuxeo document types -->
                <Lifecycle>cs_default</Lifecycle>
        </properties>
                                        </exclusion>
                                </exclusions>
                        </dependency>
-                       <dependency>
-                               <groupId>net.sf.ehcache</groupId>
-                               <artifactId>ehcache</artifactId>
-                               <version>2.10.2</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.tomcat</groupId>
-                               <artifactId>tomcat-servlet-api</artifactId>
-                               <version>${tomcat.version}</version>
-                               <scope>provided</scope>
-                       </dependency>
 
-                       <dependency>
-                               <groupId>net.java.dev.jaxb2-commons</groupId>
-                               <artifactId>jaxb-fluent-api</artifactId>
-                               <version>2.0.2</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.jvnet.jaxb2_commons</groupId>
-                               <artifactId>jaxb2-basics</artifactId>
-                               <version>${jaxb2-basics.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.jvnet.jaxb2-commons</groupId>
-                               <artifactId>property-listener-injector</artifactId>
-                               <version>1.0</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.jvnet.jaxb2_commons</groupId>
-                               <artifactId>jaxb2-basics-runtime</artifactId>
-                               <version>${jaxb2-basics.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.jboss.resteasy</groupId>
-                               <artifactId>resteasy-jaxrs</artifactId>
-                               <version>${resteasy.version}</version>
-                               <exclusions>
-                                       <exclusion>
-                                               <groupId>tjws</groupId>
-                                               <artifactId>webserver</artifactId>
-                                       </exclusion>
-                                       <exclusion>
-                                               <groupId>org.apache.httpcomponents</groupId>
-                                               <artifactId>httpclient</artifactId>
-                                       </exclusion>
-                               </exclusions>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.jboss.resteasy</groupId>
-                               <artifactId>resteasy-jaxb-provider</artifactId>
-                               <version>${resteasy.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.jboss.resteasy</groupId>
-                               <artifactId>resteasy-multipart-provider</artifactId>
-                               <version>${resteasy.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>commons-httpclient</groupId>
-                               <artifactId>commons-httpclient</artifactId>
-                               <version>3.1</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>commons-io</groupId>
-                               <artifactId>commons-io</artifactId>
-                               <version>2.7</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>commons-cli</groupId>
-                               <artifactId>commons-cli</artifactId>
-                               <version>1.2</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>com.sun.xml.bind</groupId>
-                               <artifactId>jaxb-core</artifactId>
-                               <version>${jaxb.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>com.sun.xml.bind</groupId>
-                               <artifactId>jaxb-impl</artifactId>
-                               <version>${jaxb.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>javax.xml.bind</groupId>
-                               <artifactId>jaxb-api</artifactId>
-                               <version>${jaxb.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>javax.persistence</groupId>
-                               <artifactId>persistence-api</artifactId>
-                               <version>1.0</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.hibernate</groupId>
-                               <artifactId>hibernate-entitymanager</artifactId>
-                               <version>3.4.0.GA</version>
-                               <exclusions>
-                                       <!-- Exclude dom4j:dom4j so we can upgrade to org.dom4j:dom4j. -->
-                                       <exclusion>
-                                               <groupId>dom4j</groupId>
-                                               <artifactId>dom4j</artifactId>
-                                       </exclusion>
-                               </exclusions>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.hibernate</groupId>
-                               <artifactId>hibernate-c3p0</artifactId>
-                               <version>3.6.10.Final</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.jvnet.hyperjaxb3</groupId>
-                               <!-- for time type adapters -->
-                               <artifactId>hyperjaxb3-ejb-runtime</artifactId>
-                               <version>0.6.0</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>mysql</groupId>
-                               <artifactId>mysql-connector-java</artifactId>
-                               <version>${mysql.driver.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.postgresql</groupId>
-                               <artifactId>postgresql</artifactId>
-                               <version>${postgres.driver.version}</version>
-                       </dependency>
                </dependencies>
        </dependencyManagement>
 </project>