diff --git a/.env b/.env index 607f800c5..7ea2d0407 100644 --- a/.env +++ b/.env @@ -4,6 +4,7 @@ DB_PORT=8293 DB_USER=pguser DB_PASSWORD=password DB_DATA=./docker/postgres-data/ +DB_CONNECTION_POOL=30 APP_CONTEXT=ubo APP_HTTP=8291 diff --git a/.github/workflows/maven-publish-snapshot.yml b/.github/workflows/maven-publish-snapshot.yml index c5048cd43..08568de5d 100644 --- a/.github/workflows/maven-publish-snapshot.yml +++ b/.github/workflows/maven-publish-snapshot.yml @@ -9,7 +9,8 @@ on: - 'main' - '2025.06.x' - '2024.06.x' - + workflow_dispatch: + jobs: build: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 832cebad4..09bb76950 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -31,6 +31,7 @@ services: - JDBC_PASSWORD=${DB_PASSWORD} - JDBC_DRIVER=org.postgresql.Driver - JDBC_URL=jdbc:postgresql://db:5432/ubo + - JDBC_CONNECTION_POOL_SIZE=${DB_CONNECTION_POOL} - SOLR_URL=http://solr:8983 - SOLR_CORE=ubo - SOLR_CLASSIFICATION_CORE=ubo-classifications diff --git a/docker-compose.yml b/docker-compose.yml index e0f993276..72f567290 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,6 +39,7 @@ services: - JDBC_DRIVER=org.postgresql.Driver - JDBC_URL=jdbc:postgresql://db:5432/ubo - JDBC_SCHEMA=${DB_SCHEMA} + - JDBC_CONNECTION_POOL_SIZE=${DB_CONNECTION_POOL} - SOLR_URL=http://solr:8983 - SOLR_CORE=ubo - SOLR_CLASSIFICATION_CORE=ubo-classifications diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index b5c6bc4b4..085d914a3 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -158,7 +158,7 @@ function setDockerValues() { # s/(<\/properties>)/\n\n\n\n\n setOrAddProperty "MCR.JPA.Connection.ProviderClass" "org.hibernate.hikaricp.internal.HikariCPConnectionProvider" - setOrAddProperty "MCR.JPA.Connection.MaximumPoolSize" "30" + setOrAddProperty "MCR.JPA.Connection.MaximumPoolSize" "${JDBC_CONNECTION_POOL_SIZE:-30}" setOrAddProperty "MCR.JPA.Connection.MinimumIdle" "2" setOrAddProperty "MCR.JPA.Connection.IdleTimeout" "30000" setOrAddProperty "MCR.JPA.Connection.MaxLifetime" "180000" diff --git a/ubo-common/src/main/resources/config/ubo-common/mycore.properties b/ubo-common/src/main/resources/config/ubo-common/mycore.properties index b2143cbca..8270aa461 100644 --- a/ubo-common/src/main/resources/config/ubo-common/mycore.properties +++ b/ubo-common/src/main/resources/config/ubo-common/mycore.properties @@ -695,7 +695,7 @@ MCR.MODS.EnrichmentResolver.DataSource.EVALuna.evaluna.URI=xslStyle:import/evalu ###################################################################### UBO.PubMed.Link=https://www.ncbi.nlm.nih.gov/pubmed/ -UBO.PubMed.REST.URL=https://www.ebi.ac.uk/europepmc/webservices/rest/search/resulttype=core&query= +UBO.PubMed.REST.URL=https://www.ebi.ac.uk/europepmc/webservices/rest/search?resulttype=core&query= # Configuration for importing PubMed RSS feed MCR.MODS.RSSFeedImporter.PubMed.FeedURL=https://eutils.ncbi.nlm.nih.gov/entrez/eutils/erss.cgi?rss_guid=1LgINZmdEb7dTjgV40Ro8AN9MSFRAFarM7cb16kssgU3LD2Afd diff --git a/ubo-common/src/main/resources/xsl/import/pubmed2mods.xsl b/ubo-common/src/main/resources/xsl/import/pubmed2mods.xsl index 220697fe2..7aa62eea7 100644 --- a/ubo-common/src/main/resources/xsl/import/pubmed2mods.xsl +++ b/ubo-common/src/main/resources/xsl/import/pubmed2mods.xsl @@ -1,7 +1,7 @@ - +
- +