version 1.53.0

USGCRP · Apr 23, 2018 · adb2dca · adb2dca
1 parent 1c64ff2
commit adb2dca
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 60 deletions.
diff --git a/MANIFEST b/MANIFEST
@@ -622,6 +622,7 @@ db/patches/2360_organization_alt_name_update_cascade.sql
 db/patches/2370_org_type_public_private.sql
 db/patches/2380_deprecate_journal_publisher.sql
 db/patches/2390_article_doi_case_insensitive.sql
+db/patches/2400_gcmd_keywords_audit.sql
 docker-compose.yml
 Dockerfile
 eg/check_dois.pl

diff --git a/META.json b/META.json
@@ -82,11 +82,7 @@
    "provides" : {
       "Tuba" : {
          "file" : "lib/Tuba.pm",
-<<<<<<< HEAD
-         "version" : "v1.51.1"
-=======
-         "version" : "v1.52.2"
->>>>>>> 95896d8a4d1a4c60f23ec725acd75e60e97d54be
+         "version" : "v1.53.0"
       },
       "Tuba::Activity" : {
          "file" : "lib/Tuba/Activity.pm"
@@ -372,5 +368,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "v1.52.2"
+   "version" : "v1.53.0"
 }
diff --git a/META.yml b/META.yml
@@ -20,7 +20,7 @@ name: Tuba
 provides:
   Tuba:
     file: lib/Tuba.pm
-    version: v1.52.2
+    version: v1.53.0
   Tuba::Activity:
     file: lib/Tuba/Activity.pm
   Tuba::Array:
@@ -256,4 +256,4 @@ requires:
   YAML: '0'
   YAML::Syck: '0'
   YAML::XS: '0'
-version: v1.52.2
+version: v1.53.0
diff --git a/Makefile.PL b/Makefile.PL
@@ -2,67 +2,67 @@
 use ExtUtils::MakeMaker;
 WriteMakefile
 (
-  'VERSION_FROM' => 'lib/Tuba.pm',
-  'EXE_FILES' => [
-                   'bin/hypnotoad.pid',
-                   'bin/tuba',
-                   'bin/tuba_generate_sitemap',
-                   'bin/tuba_get_ontology',
-                   'bin/tuba_start_httpd',
-                   'bin/tuba_stop_httpd'
-                 ],
   'PL_FILES' => {},
-  'INSTALLDIRS' => 'site',
   'NAME' => 'Tuba',
+  'INSTALLDIRS' => 'site',
+  'VERSION_FROM' => 'lib/Tuba.pm',
   'PREREQ_PM' => {
-                   'Number::Bytes::Human' => 0,
-                   'Digest::SHA1' => 0,
-                   'Rose::DB::Object' => 0,
-                   'URI::Find' => 0,
-                   'String::Diff' => 0,
-                   'Mojolicious::Plugin::InstallablePaths' => 0,
-                   'Mojolicious' => '6.08',
-                   'Module::Build::Mojolicious' => 0,
-                   'DateTime::Format::Human::Duration' => 0,
-                   'YAML::Syck' => 0,
-                   'YAML::XS' => 0,
-                   'Text::CSV_XS' => 0,
-                   'RDF::Query' => 0,
-                   'Rose::DB' => '0.772',
+                   'Mojolicious::Plugin::YamlConfig' => 0,
                    'SQL::Abstract' => 0,
-                   'Time::Duration' => 0,
-                   'JSON::WebToken' => 0,
+                   'Scalar::Util' => 0,
+                   'Text::Format' => 0,
                    'DBIx::Custom' => 0,
-                   'Path::Class' => 0,
-                   'Number::Format' => 0,
-                   'Data::Rmap' => 0,
                    'HTML::Restrict' => '2.002004',
-                   'Mojolicious::Plugin::Mail' => '1.5',
-                   'LWP::UserAgent' => 0,
-                   'Mojolicious::Plugin::YamlConfig' => 0,
-                   'Hash::Flatten' => 0,
-                   'Date::Parse' => 0,
-                   'Lingua::EN::Inflect' => 0,
-                   'RDF::Trine' => 0,
-                   'Captcha::reCAPTCHA' => '0.99',
-                   'DBIx::Simple' => 0,
-                   'Crypt::OpenSSL::RSA' => 0,
-                   'Scalar::Util' => 0,
-                   'Test::More' => 0,
+                   'YAML::XS' => 0,
                    'List::MoreUtils' => '0.427',
-                   'Sort::Key' => 0,
+                   'SQL::Interp' => 0,
+                   'LWP::Protocol::https' => '6.07',
+                   'Path::Class' => 0,
+                   'Algorithm::Permute' => 0,
+                   'Mojolicious' => '6.08',
                    'YAML' => 0,
-                   'File::ShareDir' => '1.00',
+                   'DateTime::Format::Human::Duration' => 0,
+                   'Captcha::reCAPTCHA' => '0.99',
+                   'JSON::WebToken' => 0,
+                   'Module::Build::Mojolicious' => 0,
                    'DBIx::Connector' => 0,
-                   'Text::Format' => 0,
-                   'UUID::Tiny' => 0,
+                   'Lingua::EN::Inflect' => 0,
+                   'Hash::Flatten' => 0,
+                   'RDF::Query' => 0,
+                   'Crypt::OpenSSL::RSA' => 0,
+                   'Mojolicious::Plugin::Mail' => '1.5',
+                   'RDF::Trine' => 0,
+                   'String::Diff' => 0,
+                   'YAML::Syck' => 0,
+                   'Time::Duration' => 0,
                    'IO::Socket::SSL' => 2,
-                   'LWP::Protocol::https' => '6.07',
-                   'SQL::Interp' => 0,
-                   'Pg::hstore' => 0,
-                   'Algorithm::Permute' => 0,
                    'JSON::XS' => 0,
-                   'DBD::Pg' => '3.003'
-                 }
+                   'Rose::DB::Object' => 0,
+                   'Pg::hstore' => 0,
+                   'Date::Parse' => 0,
+                   'Mojolicious::Plugin::InstallablePaths' => 0,
+                   'Test::More' => 0,
+                   'Text::CSV_XS' => 0,
+                   'Digest::SHA1' => 0,
+                   'Rose::DB' => '0.772',
+                   'Sort::Key' => 0,
+                   'DBIx::Simple' => 0,
+                   'DBD::Pg' => '3.003',
+                   'File::ShareDir' => '1.00',
+                   'URI::Find' => 0,
+                   'LWP::UserAgent' => 0,
+                   'Number::Format' => 0,
+                   'Number::Bytes::Human' => 0,
+                   'Data::Rmap' => 0,
+                   'UUID::Tiny' => 0
+                 },
+  'EXE_FILES' => [
+                   'bin/hypnotoad.pid',
+                   'bin/tuba',
+                   'bin/tuba_generate_sitemap',
+                   'bin/tuba_get_ontology',
+                   'bin/tuba_start_httpd',
+                   'bin/tuba_stop_httpd'
+                 ]
 )
 ;
diff --git a/lib/Tuba.pm b/lib/Tuba.pm
@@ -72,7 +72,7 @@ use Path::Class qw/file/;
 use Data::Rmap qw/rmap_all/;
 use strict;
 
-our $VERSION = '1.52.2';
+our $VERSION = '1.53.0';
 our @supported_formats = qw/json yaml ttl html nt rdfxml dot rdfjson jsontriples svg txt thtml csv/;
 
 sub startup {