Merge pull request #229 from pulibrary/fix-deprecations

Updating hydra-head, using RDF::Vocab::SKOS instead of RDF::SKOS

Gemfile.lock

@@ -82,10 +82,10 @@ GIT
 
 GIT
   remote: git://github.com/projecthydra/active_fedora.git
-  revision: a8ef64a56005812660147f1434ae444cff3bac98
+  revision: 0c2aeb186aeab221d93c07bc3c6bdb8e40e76aaf
   branch: master
   specs:
-    active-fedora (9.6.2)
+    active-fedora (9.7.0)
       active-triples (~> 0.7.1)
       activesupport (>= 4.1.0)
       deprecation
@@ -184,7 +184,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.4.0)
     arel (6.0.3)
     ast (2.1.0)
     astrolabe (1.3.1)
@@ -193,7 +193,7 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    autoprefixer-rails (6.1.0.1)
+    autoprefixer-rails (6.1.2)
       execjs
       json
     babel-source (5.8.33)
@@ -205,7 +205,7 @@ GEM
     bcrypt (3.1.10)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    blacklight (5.16.3)
+    blacklight (5.16.4)
       bootstrap-sass (~> 3.2)
       deprecation
       kaminari (>= 0.15)
@@ -216,9 +216,9 @@ GEM
       blacklight (~> 5.15)
       parslet
     blankslate (3.1.3)
-    bootstrap-sass (3.3.5.1)
-      autoprefixer-rails (>= 5.0.0.1)
-      sass (>= 3.3.0)
+    bootstrap-sass (3.3.6)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     bootstrap_forms (4.0.1)
     breadcrumbs_on_rails (2.3.1)
     builder (3.2.2)
@@ -263,7 +263,7 @@ GEM
       timers (>= 4.1.1)
     celluloid-supervision (0.20.5)
       timers (>= 4.1.1)
-    childprocess (0.5.7)
+    childprocess (0.5.8)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
     coffee-rails (4.1.0)
@@ -275,6 +275,7 @@ GEM
     coffee-script-source (1.9.1.1)
     colorize (0.7.7)
     columnize (0.9.0)
+    concurrent-ruby (1.0.0)
     connection_pool (2.2.0)
     coveralls (0.8.3)
       json (~> 1.8)
@@ -364,16 +365,16 @@ GEM
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    hydra-access-controls (9.4.1)
+    hydra-access-controls (9.5.0)
       active-fedora (~> 9.0)
       activesupport (~> 4.0)
-      blacklight (~> 5.10)
+      blacklight (~> 5.16)
       cancancan (~> 1.8)
-      deprecation (~> 0.1)
+      deprecation (~> 0.2)
       sass-rails
-    hydra-core (9.4.1)
+    hydra-core (9.5.0)
       active-fedora (~> 9.1)
-      hydra-access-controls (= 9.4.1)
+      hydra-access-controls (= 9.5.0)
       jettywrapper (>= 2.0.0)
       rails (~> 4.0)
     hydra-editor (1.1.0)
@@ -383,9 +384,9 @@ GEM
       simple_form (~> 3.1.0)
     hydra-file_characterization (0.3.3)
       activesupport (>= 3.0.0)
-    hydra-head (9.4.1)
-      hydra-access-controls (= 9.4.1)
-      hydra-core (= 9.4.1)
+    hydra-head (9.5.0)
+      hydra-access-controls (= 9.5.0)
+      hydra-core (= 9.5.0)
       rails (>= 3.2.6)
     hydra-role-management (0.1.0)
       bootstrap_forms
@@ -463,7 +464,7 @@ GEM
       unf
     memoist (0.12.0)
     method_source (0.8.2)
-    mime-types (2.6.2)
+    mime-types (2.99)
     mimemagic (0.3.0)
     mini_magick (4.3.6)
     mini_portile (0.6.2)
@@ -481,7 +482,7 @@ GEM
     noid (0.8.0)
     nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
-    nom-xml (0.5.3)
+    nom-xml (0.5.4)
       activesupport (>= 3.2.18)
       i18n
       nokogiri
@@ -572,8 +573,8 @@ GEM
       rdf (~> 1.99)
     rdf-isomorphic (1.99.0)
       rdf (~> 1.99)
-    rdf-json (1.1.2)
-      rdf (~> 1.1)
+    rdf-json (1.99.0)
+      rdf (~> 1.99)
     rdf-microdata (2.0.2)
       htmlentities (~> 4.3)
       nokogiri (~> 1.6)
@@ -587,11 +588,11 @@ GEM
       rdf (~> 1.99)
       rdf-aggregate-repo (~> 1.1)
       rdf-xsd (~> 1.1)
-    rdf-rdfxml (1.1.5)
+    rdf-rdfxml (1.99.0)
       htmlentities (~> 4.3)
-      rdf (~> 1.1, >= 1.1.6)
-      rdf-rdfa (~> 1.1, >= 1.1.4.1)
-      rdf-xsd (~> 1.1)
+      rdf (~> 1.99)
+      rdf-rdfa (~> 1.99)
+      rdf-xsd (~> 1.99)
     rdf-reasoner (0.3.0)
       rdf (~> 1.1, >= 1.1.4.2)
       rdf-turtle (~> 1.1)
@@ -615,8 +616,8 @@ GEM
       rdf (~> 1.99)
     rdf-vocab (0.8.7.1)
       rdf (~> 1.1, >= 1.1.10)
-    rdf-xsd (1.1.5)
-      rdf (~> 1.1, >= 1.1.9)
+    rdf-xsd (1.99.0)
+      rdf (~> 1.99)
     rdoc (4.2.0)
     redis (3.2.1)
     redis-namespace (1.5.2)
@@ -732,7 +733,8 @@ GEM
       net-http-persistent (~> 2.9)
       rdf (~> 1.1)
     spring (1.4.0)
-    sprockets (3.4.0)
+    sprockets (3.5.1)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-es6 (0.8.2)
       babel-source (>= 5.8.11)

app/models/concerns/common_metadata.rb

@@ -9,7 +9,7 @@ module CommonMetadata
     before_update :check_completion
 
     property :sort_title, predicate: ::OpaqueMods.titleForSort, multiple: false
-    property :portion_note, predicate: ::RDF::SKOS.scopeNote, multiple: false
+    property :portion_note, predicate: ::RDF::Vocab::SKOS.scopeNote, multiple: false
     property :description, predicate: ::RDF::DC.abstract, multiple: false
     property :identifier, predicate: ::RDF::DC.identifier, multiple: false
     property :access_policy, predicate: ::RDF::DC.accessRights, multiple: false