Merge pull request #569 from pdowler/master

ringhold doc and build fix

README.md

@@ -61,8 +61,8 @@ storage sites.
 Official docker image: `images.opencadc.org/storage-inventory/ratik:$VER`
 
 ## ringhold
-This is an implementation of part of the **metadata-validate** process that cleans up after a change in 
-local artifact selection policy. This is used if the new fenwick policy excludes artifacts previously synced.
+This is an implementation of a simplified part of the **metadata-validate** process that can be used 
+to remove the local copy of artifacts from a site (file cleanup is done by `tantar`).
 
 Official docker image: `images.opencadc.org/storage-inventory/ringhold:$VER`
 

cadc-storage-adapter/build.gradle

@@ -14,15 +14,13 @@ sourceCompatibility = 1.8
 
 group = 'org.opencadc'
 
-version = '0.11.2'
+version = '1.0.0'
 
 description = 'OpenCADC Storage Inventory StorageAdapter API library'
 def git_url = 'https://github.com/opencadc/storage-inventory'
 
 dependencies {
-    compile 'org.bouncycastle:bcprov-jdk15on:[1.70,2.0)'
-
-    compile 'org.opencadc:cadc-util:[1.6,2.0)'
+    compile 'org.opencadc:cadc-util:[1.11,2.0)'
     compile 'org.opencadc:cadc-inventory:[0.8,)'
 
     testCompile 'junit:junit:[4.0,)'

critwall/build.gradle

@@ -19,7 +19,7 @@ group = 'org.opencadc'
 mainClassName = 'org.opencadc.critwall.Main'
 
 dependencies {
-    compile 'org.opencadc:cadc-storage-adapter:[0.8,1.0)'
+    compile 'org.opencadc:cadc-storage-adapter:[1.0,)'
     compile 'org.opencadc:cadc-util:[1.10.2,2.0)'
     compile 'org.opencadc:cadc-inventory:[1.0,2.0)'
     compile 'org.opencadc:cadc-inventory-db:[1.0,2.0)'

minoc/build.gradle

@@ -38,7 +38,7 @@ dependencies {
     compile 'org.opencadc:cadc-inventory-db:[1.0,2.0)'
     compile 'org.opencadc:cadc-inventory-server:[0.3.0,1.0)'
     compile 'org.opencadc:cadc-soda-server:[1.2.0,2.0.0)'
-    compile 'org.opencadc:cadc-storage-adapter:[0.11.2,)'
+    compile 'org.opencadc:cadc-storage-adapter:[1.0,)'
     compile 'org.opencadc:cadc-permissions:[0.3.1,)'
     compile 'org.opencadc:cadc-permissions-client:[0.3,)'
     compile 'org.opencadc:cadc-gms:[1.0,)'

ringhold/Dockerfile

@@ -1,4 +1,4 @@
-FROM cadc-java:1
+FROM images.opencadc.org/library/cadc-java:1
 
 ADD build/distributions/ringhold.tar /
 

tantar/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     compile 'org.opencadc:cadc-inventory:[1.0.0,2.0)'
     compile 'org.opencadc:cadc-inventory-db:[1.0.0,2.0)'
     compile 'org.opencadc:cadc-inventory-util:[0.1.8,1.0)'
-    compile 'org.opencadc:cadc-storage-adapter:[0.11.1,1.0)'
+    compile 'org.opencadc:cadc-storage-adapter:[1.0,)'
 
     runtime 'org.opencadc:cadc-storage-adapter-fs:[0.9.3,)'
     runtime 'org.opencadc:cadc-storage-adapter-ad:[0.6.3,)'