This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push: new 7449bf5026 Upgrading PostgreSQL, Nimbus JOSE JWT, Groovy and Wicket 7449bf5026 is described below commit 7449bf50267c195ebf2943ddb7925bb8830b807d Author: Francesco Chicchiriccò <ilgro...@apache.org> AuthorDate: Mon Oct 17 09:04:02 2022 +0200 Upgrading PostgreSQL, Nimbus JOSE JWT, Groovy and Wicket --- .../java/org/apache/syncope/core/provisioning/api/Connector.java | 2 +- .../syncope/core/provisioning/java/pushpull/PullJobDelegate.java | 7 +++---- docker/src/main/resources/docker-compose/docker-compose-all.yml | 2 +- docker/src/main/resources/docker-compose/docker-compose-ha.yml | 2 +- .../src/main/resources/docker-compose/docker-compose-pgjsonb.yml | 2 +- .../main/resources/docker-compose/docker-compose-postgresql.yml | 2 +- pom.xml | 8 ++++---- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java index 3916039e5f..85e69d7c5a 100644 --- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java +++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java @@ -97,7 +97,7 @@ public interface Connector { * @param modifications attribute modifications to apply * @param options ConnId's OperationOptions * @param propagationAttempted if creation is actually performed (based on connector instance's capabilities) - * @return + * @return the applied modifications */ Set<AttributeDelta> updateDelta( ObjectClass objectClass, diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullJobDelegate.java index 055449838d..6f357c7fb8 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullJobDelegate.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullJobDelegate.java @@ -397,10 +397,9 @@ public class PullJobDelegate extends AbstractProvisioningJobDelegate<PullTask> i throw new JobExecutionException("While pulling from connector", t); } finally { if (setSyncTokens) { - latestSyncTokens.forEach((objectClass, syncToken) -> { - pullTask.getResource().getProvisionByObjectClass(objectClass). - ifPresent(p -> p.setSyncToken(ConnObjectUtils.toString(syncToken))); - }); + latestSyncTokens.forEach((objectClass, syncToken) -> pullTask.getResource(). + getProvisionByObjectClass(objectClass). + ifPresent(p -> p.setSyncToken(ConnObjectUtils.toString(syncToken)))); resourceDAO.save(pullTask.getResource()); } } diff --git a/docker/src/main/resources/docker-compose/docker-compose-all.yml b/docker/src/main/resources/docker-compose/docker-compose-all.yml index 0699045dca..afaffa9f31 100644 --- a/docker/src/main/resources/docker-compose/docker-compose-all.yml +++ b/docker/src/main/resources/docker-compose/docker-compose-all.yml @@ -28,7 +28,7 @@ services: restart: always db: - image: postgres:14 + image: postgres:15 restart: always environment: POSTGRES_DB: syncope diff --git a/docker/src/main/resources/docker-compose/docker-compose-ha.yml b/docker/src/main/resources/docker-compose/docker-compose-ha.yml index 474933dcff..58b8fb0ebf 100644 --- a/docker/src/main/resources/docker-compose/docker-compose-ha.yml +++ b/docker/src/main/resources/docker-compose/docker-compose-ha.yml @@ -22,7 +22,7 @@ version: '3.3' services: db: - image: postgres:14 + image: postgres:15 restart: always environment: POSTGRES_DB: syncope diff --git a/docker/src/main/resources/docker-compose/docker-compose-pgjsonb.yml b/docker/src/main/resources/docker-compose/docker-compose-pgjsonb.yml index ec02d672bc..a4eb0108b3 100644 --- a/docker/src/main/resources/docker-compose/docker-compose-pgjsonb.yml +++ b/docker/src/main/resources/docker-compose/docker-compose-pgjsonb.yml @@ -21,7 +21,7 @@ version: '3.3' services: db: - image: postgres:14 + image: postgres:15 restart: always environment: POSTGRES_DB: syncope diff --git a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml index c3ba54ba34..40759b91d7 100644 --- a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml +++ b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml @@ -21,7 +21,7 @@ version: '3.3' services: db: - image: postgres:14 + image: postgres:15 restart: always environment: POSTGRES_DB: syncope diff --git a/pom.xml b/pom.xml index 55e33ec0fc..c40f508afb 100644 --- a/pom.xml +++ b/pom.xml @@ -413,7 +413,7 @@ under the License. <cxf.version>3.5.4</cxf.version> <bouncycastle.version>1.70</bouncycastle.version> - <nimbus-jose-jwt.version>9.25.5</nimbus-jose-jwt.version> + <nimbus-jose-jwt.version>9.25.6</nimbus-jose-jwt.version> <jackson.version>2.14.0-rc2</jackson.version> @@ -426,7 +426,7 @@ under the License. <jasypt.version>1.9.3</jasypt.version> - <groovy.version>4.0.5</groovy.version> + <groovy.version>4.0.6</groovy.version> <flowable.version>6.7.2</flowable.version> @@ -469,7 +469,7 @@ under the License. <jsplumb.version>2.0.7</jsplumb.version> <chartjs.version>1.0.2</chartjs.version> - <wicket.version>9.11.0</wicket.version> + <wicket.version>9.12.0</wicket.version> <wicketstuff.version>9.11.0</wicketstuff.version> <wicket-jqueryui.version>9.11.0</wicket-jqueryui.version> <wicket-bootstrap.version>5.0.6</wicket-bootstrap.version> @@ -508,7 +508,7 @@ under the License. <payara.version>5.2022.3</payara.version> <javax.faces.version>2.3.14</javax.faces.version> - <docker.postgresql.version>14</docker.postgresql.version> + <docker.postgresql.version>15</docker.postgresql.version> <docker.mysql.version>8.0</docker.mysql.version> <docker.mariadb.version>10</docker.mariadb.version>