diff --git a/CHANGELOG.md b/CHANGELOG.md index a641ac3d527..5ca3420c950 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +## 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) + +## 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) 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) 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 @@ </bean> <bean id="ORCIDMarshaller" class="org.orcid.utils.jersey.marshaller.ORCIDMarshaller" /> + + <!-- Panoply Redshift --> + <bean id="panoplyRedshiftDataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close"> + <property name="driverClassName" value="\${org.orcid.core.utils.panoply.driver:com.amazon.redshift.jdbc.Driver}" /> + <property name="jdbcUrl" value="\${org.orcid.core.utils.panoply.jdbcUrl}" /> + <property name="username" value="\${org.orcid.core.utils.panoply.username}" /> + <property name="password" value="\${org.orcid.core.utils.panoply.password}" /> + <property name="maximumPoolSize" value="\${org.orcid.core.utils.panoply.maxPoolSize:5}" /> + <property name="idleTimeout" value="\${org.orcid.core.utils.panoply.idleConnectionTimeout:3600}" /> + <property name="connectionTimeout" value="\${org.orcid.core.utils.panoply.connectionTimeout:3600}" /> + </bean> + + <!-- Panoply JdbcTemplate Bean Definition --> + <bean id="panoplyJdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate"> + <property name="dataSource" ref="panoplyRedshiftDataSource" /> + </bean> + + <!-- Redshift panoply --> + <bean id="panoplyClient" class="org.orcid.utils.panoply.PanoplyRedshiftClient" /> + </beans> \ No newline at end of file