From cba99cf85602430a30fdc6ec465397f4fef8ceba Mon Sep 17 00:00:00 2001 From: Emmanuel Ferdman Date: Sat, 26 Oct 2024 02:31:38 -0700 Subject: [PATCH 1/5] update license reference Signed-off-by: Emmanuel Ferdman --- PROJECTS.md | 2 +- TESTAUTO.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PROJECTS.md b/PROJECTS.md index edeb832269a..9f4421d869c 100644 --- a/PROJECTS.md +++ b/PROJECTS.md @@ -12,7 +12,7 @@ Also see our active contributors: [CREDITS.md](https://github.com/ORCID/ORCID-Wo > > Copyright (c) 2013 ORCID, Inc. > Licensed under an MIT-Style License (MIT) -> https://github.com/ORCID/ORCID-Source/blob/master/LICENSE.md +> https://github.com/ORCID/ORCID-Source/blob/main/LICENSE > http://orcid.org/OpenSource/license > > This copyright and license information (including a link to the full license) shall be included in its entirety in all copies or substantial portion of the software. diff --git a/TESTAUTO.md b/TESTAUTO.md index 9233ff29480..bc9f89b445e 100644 --- a/TESTAUTO.md +++ b/TESTAUTO.md @@ -124,5 +124,5 @@ Mac: ```/Applications/Firefox.app/Contents/MacOS/firefox-bin``` [src/test/resources/test-client.properties](https://github.com/ORCID/ORCID-Source/blob/master/orcid-integration-test/src/test/resources/test-client.properties) # License -See [LICENSE.md](https://github.com/ORCID/ORCID-Source/blob/master/LICENSE.md) +See [LICENSE](https://github.com/ORCID/ORCID-Source/blob/main/LICENSE) From a895ef73168df04de35b0fbf80cefccd6951b671 Mon Sep 17 00:00:00 2001 From: github actions Date: Mon, 28 Oct 2024 13:24:34 +0000 Subject: [PATCH 2/5] v2.66.6 changelog update --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a641ac3d527..6665393febc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v2.66.6 - 2024-10-28 + +[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.66.5...v2.66.6) + +- [#7111](https://github.com/ORCID/ORCID-Source/pull/7111): update license reference + ## v2.66.5 - 2024-10-15 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.66.4...v2.66.5) From 7dae1f1410c951817a5dde2541a124432d642270 Mon Sep 17 00:00:00 2001 From: github actions Date: Tue, 29 Oct 2024 15:28:56 +0000 Subject: [PATCH 3/5] v2.67.0 changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6665393febc..01a2af9c7fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.67.0 - 2024-10-29 + +[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.66.6...v2.67.0) + ## v2.66.6 - 2024-10-28 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.66.5...v2.66.6) From e3eddca0c99c06fbb77d5ed00ef46cf5b2599c25 Mon Sep 17 00:00:00 2001 From: Camelia Dumitru <62257307+Camelia-Orcid@users.noreply.github.com> Date: Tue, 29 Oct 2024 15:29:57 +0000 Subject: [PATCH 4/5] Fixes for the ML startup error (#7114) --- .../resources/message-listener.properties | 13 +++++++++++- .../orcid-message-listener-web-context.xml | 20 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/orcid-activemq/src/main/resources/message-listener.properties b/orcid-activemq/src/main/resources/message-listener.properties index f7ff7385fce..f4d5343a573 100644 --- a/orcid-activemq/src/main/resources/message-listener.properties +++ b/orcid-activemq/src/main/resources/message-listener.properties @@ -70,4 +70,15 @@ org.orcid.message-listener.index.s3.search.max_elements=5 org.orcid.message-listener.index.summaries.bucket_name=v2.0-summaries-dev org.orcid.message-listener.index.activities.bucket_name=v2.0-activities-dev org.orcid.message-listener.index.summaries.v3.bucket_name=v3.0-summaries-dev -org.orcid.message-listener.index.activities.v3.bucket_name=v3.0-activities-dev \ No newline at end of file +org.orcid.message-listener.index.activities.v3.bucket_name=v3.0-activities-dev + + +org.orcid.persistence.panoply.cleanup.production=false +# Panoply redshift database +org.orcid.core.utils.panoply.driver=com.amazon.redshift.jdbc.Driver +org.orcid.core.utils.panoply.maxPoolSize=20 +org.orcid.core.utils.panoply.password=xxx +org.orcid.core.utils.panoply.idleConnectionTimeout=3600 +org.orcid.core.utils.panoply.connectionTimeout=36000 +org.orcid.core.utils.panoply.jdbcUrl=xxx +org.orcid.core.utils.panoply.username=xxx \ No newline at end of file diff --git a/orcid-message-listener/src/main/resources/orcid-message-listener-web-context.xml b/orcid-message-listener/src/main/resources/orcid-message-listener-web-context.xml index 13166f997da..ac1054dee18 100644 --- a/orcid-message-listener/src/main/resources/orcid-message-listener-web-context.xml +++ b/orcid-message-listener/src/main/resources/orcid-message-listener-web-context.xml @@ -158,4 +158,24 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From e68bfbeaa983e0d83286bbc37c46f6e5ad703b0a Mon Sep 17 00:00:00 2001 From: github actions Date: Tue, 29 Oct 2024 15:45:17 +0000 Subject: [PATCH 5/5] v2.67.1 changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01a2af9c7fb..5ca3420c950 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.67.1 - 2024-10-29 + +[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.67.0...v2.67.1) + ## v2.67.0 - 2024-10-29 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.66.6...v2.67.0)