From: Ray Lee <ray.lee@lyrasis.org>
Date: Fri, 25 Oct 2019 02:59:53 +0000 (-0700)
Subject: DRYD-665: Change cspace repo locations to s3.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=88b1cd57ce4933424298c11e3e9b9f62d1a203be;p=tmp%2Fjakarta-migration.git

DRYD-665: Change cspace repo locations to s3.
---

diff --git a/pom.xml b/pom.xml
index e5bed91fd..1f23bd380 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,14 +28,14 @@
 
 	<distributionManagement>
 		<repository>
-			<id>collectionspace-libs-release-local</id>
-			<name>collectionspace-libs-release-local</name>
-			<url>http://nightly.collectionspace.org:8081/artifactory/libs-release-local</url>
+			<id>cspace</id>
+			<name>cspace-libs-release-local</name>
+			<url>s3://cspace-maven-repo/libs-release-local</url>
 		</repository>
 		<snapshotRepository>
-			<id>collectionspace-libs-snapshot-local</id>
-			<name>collectionspace-libs-snapshot-local</name>
-			<url>http://nightly.collectionspace.org:8081/artifactory/libs-snapshot-local</url>
+			<id>cspace</id>
+			<name>cspace-libs-snapshot-local</name>
+			<url>s3://cspace-maven-repo/libs-snapshot-local</url>
 		</snapshotRepository>
 	</distributionManagement>
 
@@ -46,244 +46,106 @@
 
 	<repositories>
 		<repository>
-			<id>collectionspace-remote-repos</id>
-			<name>collectionspace-remote-repos</name>
-			<url>http://nightly.collectionspace.org:8081/artifactory/remote-repos</url>
+			<id>maven-central</id>
+			<name>maven-central</name>
+			<url>https://repo.maven.apache.org/maven2</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-		<repository>
-			<id>collectionspace-libs-release-local</id>
-			<name>collectionspace-libs-release-local</name>
-			<url>http://nightly.collectionspace.org:8081/artifactory/libs-release-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>collectionspace-libs-snapshot-local</id>
-			<name>collectionspace-libs-snapshot-local</name>
-			<url>http://nightly.collectionspace.org:8081/artifactory/libs-snapshot-local</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>repo1</id>
-			<name>Maven repo1</name>
-			<url>http://repo1.maven.org/maven2</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>repo2</id>
-			<name>Maven repo2</name>
-			<url>http://repo2.maven.org/maven2</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<!-- <repository>
-			<id>maven2-repository.dev.java.net</id>
-			<name>Java.net Maven 2 Repository</name>
-			<url>http://download.java.net/maven/2</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository> <id>maven1-repository.dev.java.net</id> <name>Java.net
-			Maven 1 Repository</name> <url>http://download.java.net/maven/1</url> <layout>legacy</layout>
-			<snapshots> <enabled>false</enabled> </snapshots> </repository> -->
 
 		<repository>
-			<id>jboss.org</id>
-			<url>https://repository.jboss.org/nexus</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<!-- some security binaries available under .com only perhaps due to licensing
-			issues -->
-		<repository>
-			<id>jboss.com</id>
+			<id>jboss</id>
 			<url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
 
-		<!-- codehaus was shutdown in May 2015
 		<repository>
-			<id>codehaus repo</id>
-			<name>codehaus repo</name>
-			<url>http://repository.codehaus.org</url>
+			<id>nuxeo-vendor-releases</id>
+			<url>https://maven-eu.nuxeo.org/nexus/content/repositories/vendor-releases</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-		-->
 
 		<repository>
-			<id>collectionspace-nuxeo-public</id>
-			<name>collectionspace-nuxeo-public</name>
-			<url>http://nightly.collectionspace.org:8081/artifactory/nuxeo-public</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
+			<id>cspace-libs-release-local</id>
+			<name>cspace-libs-release-local</name>
+			<url>https://cspace-maven-repo.s3-us-west-2.amazonaws.com/libs-release-local</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-
 		<repository>
-			<id>public-snapshot</id>
-			<url>https://maven-eu.nuxeo.org/nexus/content/repositories/public-snapshots</url>
-			<!-- Nuxeo Snapshots Repository is disabled. -->
+			<id>cspace-libs-snapshot-local</id>
+			<name>cspace-libs-snapshot-local</name>
+			<url>https://cspace-maven-repo.s3-us-west-2.amazonaws.com/libs-snapshot-local</url>
 			<releases>
 				<enabled>false</enabled>
 			</releases>
 			<snapshots>
-				<!--<updatePolicy>never</updatePolicy> -->
-			</snapshots>
-		</repository>
-
-		<repository>
-			<id>public</id>
-			<url>https://maven-eu.nuxeo.org/nexus/content/repositories/public-releases</url>
-			<!-- Nuxeo Releases Repository is disabled. -->
-			<releases>
 				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
 			</snapshots>
 		</repository>
 
 		<repository>
-			<id>vendor-releases</id>
-			<url>https://maven-eu.nuxeo.org/nexus/content/repositories/vendor-releases</url>
-			<!-- Nuxeo Releases Repository is disabled. -->
-			<releases>
-				<enabled>true</enabled>
-			</releases>
+			<!-- Global Biodiversity Information Facility - http://www.gbif.org/ -->
+			<id>gbif-all</id>
+			<name>gbif-all</name>
+			<url>http://repository.gbif.org/content/groups/gbif</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
 
-<!--
 		<repository>
-			<id>nightly-staging</id>
-			<name>nuxeo-nightly-staging</name>
-			<url>http://mavenin.nuxeo.com/nexus/content/repositories/nightly-staging</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
--->
-
-		<repository>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<id>Apache</id>
-			<name>External release repository of the Apache projects</name>
-			<url>https://repository.apache.org/content/groups/public/</url>
-		</repository>
-
-	    <!-- Global Biodiversity Information Facility - http://www.gbif.org/ -->
-	    <repository>
-	        <snapshots>
-	            <enabled>false</enabled>
-	        </snapshots>
-	        <releases>
-	            <enabled>true</enabled>
-	        </releases>
-	        <id>gbif-all</id>
-	        <name>gbif-all</name>
-	        <url>http://repository.gbif.org/content/groups/gbif</url>
-	    </repository>
-
-		<!--
-			Need this for jasperreports-functions 6.3.1
-			(6.8+ seems to be available in other repos, so this can be removed in the future.)
-		-->
-		<repository>
-			<snapshots>
-					<enabled>false</enabled>
-			</snapshots>
-			<releases>
-					<enabled>true</enabled>
-			</releases>
+			<!--
+				Need this for jasperreports-functions 6.3.1.
+				(6.8+ is available on Maven Central, so this can be removed in the future.)
+			-->
 			<id>jaspersoft</id>
 			<name>jaspersoft</name>
 			<url>https://jaspersoft.jfrog.io/jaspersoft/jr-ce-releases</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
 	</repositories>
 
 	<pluginRepositories>
 		<pluginRepository>
-			<id>collectionspace-remote-repos</id>
-			<name>collectionspace-remote-repos</name>
-			<url>http://nightly.collectionspace.org:8081/artifactory/remote-repos</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	    <pluginRepository>
-	        <id>collectionspace-plugins-snapshot-local</id>
-	        <name>collectionspace-plugins-snapshot-local</name>
-	        <url>http://nightly.collectionspace.org:8081/artifactory/plugins-snapshot-local</url>
-	        <snapshots>
-	            <enabled>true</enabled>
-	        </snapshots>
-	    </pluginRepository>
-		<pluginRepository>
-			<id>repo1</id>
-			<name>Maven repo1</name>
-			<url>http://repo1.maven.org/maven2</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>maven repo</id>
-			<name>maven repo</name>
-			<url>http://repo2.maven.org/maven2</url>
+			<id>maven-central</id>
+			<name>maven-central</name>
+			<url>https://repo.maven.apache.org/maven2</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
+
 		<pluginRepository>
-			<id>maven2-repository.dev.java.net</id>
-			<url>http://download.java.net/maven/2</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<!-- Codehaus repo was shutdown in May 2015
-		<pluginRepository>
-			<id>Codehaus Repository</id>
-			<url>http://repository.codehaus.org/</url>
+			<id>cspace-plugins-snapshot-local</id>
+			<name>cspace-plugins-snapshot-local</name>
+			<url>https://cspace-maven-repo.s3-us-west-2.amazonaws.com/plugins-snapshot-local</url>
 			<releases>
-				<enabled>true</enabled>
+				<enabled>false</enabled>
 			</releases>
 			<snapshots>
-				<enabled>false</enabled>
+				<enabled>true</enabled>
 			</snapshots>
 		</pluginRepository>
-		-->
 	</pluginRepositories>
 
 	<build>
+		<extensions>
+			<extension>
+				<groupId>com.gkatzioura.maven.cloud</groupId>
+				<artifactId>s3-storage-wagon</artifactId>
+				<version>2.3</version>
+			</extension>
+		</extensions>
+
 		<pluginManagement>
 			<plugins>
 				<plugin>
@@ -309,10 +171,6 @@
 					<configuration>
 					</configuration>
 				</plugin>
-				<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId>
-					<configuration> <dependencyLocationEnabled>false</dependencyLocationEnabled>
-					<unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand> </configuration>
-					</plugin> -->
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-war-plugin</artifactId>
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index bc73c7486..a2d066920 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -604,24 +604,9 @@
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-schema</artifactId>
         </dependency>
-        <!--
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-io</artifactId>
-        </dependency>
-         -->
         <dependency>
 			<groupId>org.nuxeo.runtime</groupId>
 			<artifactId>nuxeo-runtime-jtajca</artifactId>
-			<!-- Until issue http://issues.collectionspace.org/browse/CSPACE-4639 is resolved, we
-				<version>5.5-NXP-8140</version>
-				need to use this patched Nuxeo artifact that is only available on our public Maven
-				repository -see http://nightly.collectionspace.org:8081/artifactory
-
-				Once the issue is resolved and a public version of the artifact becomes available, we
-				should revert this dependency's version to be the following:
-			<version>${nuxeo.core.version}</version>
-			-->
 			<exclusions>
 				<exclusion>
 					<artifactId>geronimo-transaction</artifactId>