Skip to content

Commit

Permalink
RIPE NCC has merged 2b16808
Browse files Browse the repository at this point in the history
* Add dependency dashboard MR [c3cf6d53]
* Use spring boot 2.7.16 [2b4d1ec3]
* Use keepalive in hikari [a627b173]
* pilot also inherits from the main config [da8c900f]
* Shuffle properties around [e8c69a9e]
* Change connection poll setting for localcert as well [50b3e8e4]
* Change Hikari parameters [1649c080]
* Update plugin org.springframework.boot to v2.7.15 [703be0d0]
* Allow 60m build for build step due to slow build infrastructure [a830fe25]
* Update dependency net.ripe.rpki:rpki-commons to v1.34 [00627e2b]
* Update dependency io.sentry:sentry-bom to v6.28.0 [d1419351]
* Fix javadoc [666e0cf9]
* Update dependency gradle to v8.3 [b7d2116b]
* Update dependency net.jqwik:jqwik to v1.7.4 [f053da00]
  • Loading branch information
RPKI Team at RIPE NCC committed Oct 9, 2023
1 parent 407356a commit ee619db
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 10 deletions.
5 changes: 4 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
image: gradle:8.2-jdk11
default:
image: gradle:8.3-jdk11

# Explicit version of the Mergerequests-Pipelines workflow, with the main branch
# added.
Expand Down Expand Up @@ -41,6 +42,8 @@ variables:
######## Build stage ########
build:
stage: build
# slow builds in augusts 2023
timeout: 60m
services:
- postgres:14
variables:
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'rpki-ripe-ncc.build-conventions'
id 'org.springframework.boot' version '2.7.13'
id 'org.springframework.boot' version '2.7.16'
id 'distribution'
id 'jacoco'
id "com.google.cloud.tools.jib" version "3.3.2"
Expand Down Expand Up @@ -43,7 +43,7 @@ dependencies {
implementation "org.thymeleaf:thymeleaf:3.1.1.RELEASE"
implementation "org.thymeleaf:thymeleaf-spring5:3.1.1.RELEASE"

implementation platform('io.sentry:sentry-bom:6.24.0')
implementation platform('io.sentry:sentry-bom:6.28.0')
implementation 'io.sentry:sentry-spring-boot-starter'
implementation 'io.sentry:sentry-logback'

Expand Down Expand Up @@ -73,7 +73,7 @@ dependencies {
}

testImplementation 'com.github.tomakehurst:wiremock-jre8:2.35.0'
testImplementation 'net.jqwik:jqwik:1.7.3'
testImplementation 'net.jqwik:jqwik:1.7.4'
testImplementation "net.ripe.rpki:rpki-commons:$rpki_commons_version:tests"
testImplementation 'org.assertj:assertj-core'

Expand Down
4 changes: 2 additions & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ext {
rpki_commons_version = '1.33'
spring_boot_version = '2.7.13'
rpki_commons_version = '1.34'
spring_boot_version = '2.7.16'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 2 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
1 change: 1 addition & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"dependencyDashboard": true,
"packageRules": [
{
"managers": ["maven"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@

/**
* Updates all needed CRLs and manifests to generate a new, consistent set of published RPKI objects. The update
* is done inside a single transaction to ensure that no inconsistent set of objects can be published.
* is done top-down to ensure that no inconsistent set of objects can be published (parent CAs never issue
* certificates that cause child CAs to be invalidated).
* <p>
* The actual publishing to RRDP or RSYNC is done in separate background services.
*/
Expand Down
8 changes: 7 additions & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@ spring:
driver-class-name: org.postgresql.Driver
username: certdb
hikari:
maximum-pool-size: 90
# use keepalive to ensure there is traffic.
#
# Do not use a maximum connection lifetime. It does not help, because
# recycling ports may not keep the flow alive longer on a firewall
keepalive-time: 300000
maximum-pool-size: 50
connection-timeout: 5000
transaction-isolation: TRANSACTION_REPEATABLE_READ
jpa:
database-platform: org.hibernate.dialect.PostgreSQL10Dialect
Expand Down

0 comments on commit ee619db

Please sign in to comment.