You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2021/04/06 06:45:25 UTC
[syncope] branch master updated (2646c26 -> bf197b2)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 2646c26 [SYNCOPE-1626] Fix spelling org.apache.syncope.common.keymaster.client.zookeper -> org.apache.syncope.common.keymaster.client.zookeeper
new 7b0683f Upgrading Nimnus JOSE JWT, Zookeeper and docker-maven-plugin
new bf197b2 [SYNCOPE-1625] Fix Payara build
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../syncope/common/rest/api/service/wa/ImpersonationService.java | 3 ++-
.../keymaster/client/zookeeper/ZookeeperConfParamOpsITCase.java | 2 --
.../keymaster/client/zookeeper/ZookeeperDomainOpsITCase.java | 5 ++---
.../keymaster/client/zookeeper/ZookeeperServiceOpsITCase.java | 2 --
.../syncope/core/rest/cxf/service/wa/ImpersonationServiceImpl.java | 4 ++--
.../java/org/apache/syncope/fit/core/wa/ImpersonationITCase.java | 2 +-
pom.xml | 6 +++---
.../org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java | 7 +++----
8 files changed, 13 insertions(+), 18 deletions(-)
[syncope] 02/02: [SYNCOPE-1625] Fix Payara build
Posted by il...@apache.org.
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
commit bf197b2b4c69bd728133742d89f6fa45e5724e2d
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Apr 6 08:45:13 2021 +0200
[SYNCOPE-1625] Fix Payara build
---
.../syncope/common/rest/api/service/wa/ImpersonationService.java | 3 ++-
.../syncope/core/rest/cxf/service/wa/ImpersonationServiceImpl.java | 4 ++--
.../java/org/apache/syncope/fit/core/wa/ImpersonationITCase.java | 2 +-
.../org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java | 7 +++----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/wa/ImpersonationService.java b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/wa/ImpersonationService.java
index 8ecac7c..67ac6d4 100644
--- a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/wa/ImpersonationService.java
+++ b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/wa/ImpersonationService.java
@@ -68,9 +68,10 @@ public interface ImpersonationService extends JAXRSService {
Response create(@NotNull ImpersonationAccount account);
@DELETE
+ @Path("accounts/{owner}")
@Consumes({ MediaType.APPLICATION_JSON, RESTHeaders.APPLICATION_YAML, MediaType.APPLICATION_XML })
@Produces({ MediaType.APPLICATION_JSON, RESTHeaders.APPLICATION_YAML, MediaType.APPLICATION_XML })
- Response delete(@NotNull ImpersonationAccount account);
+ Response delete(@NotNull @PathParam("owner") String owner, @NotNull @QueryParam("id") String id);
@ApiResponses(
@ApiResponse(responseCode = "204", description = "Operation was successful"))
diff --git a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/wa/ImpersonationServiceImpl.java b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/wa/ImpersonationServiceImpl.java
index 17b7e88..1d79c77 100644
--- a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/wa/ImpersonationServiceImpl.java
+++ b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/wa/ImpersonationServiceImpl.java
@@ -56,8 +56,8 @@ public class ImpersonationServiceImpl extends AbstractServiceImpl implements Imp
}
@Override
- public Response delete(final ImpersonationAccount account) {
- logic.delete(account);
+ public Response delete(final String owner, final String id) {
+ logic.delete(logic.find(owner, id));
return Response.noContent().build();
}
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/ImpersonationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/ImpersonationITCase.java
index 71e1706..752a390 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/ImpersonationITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/ImpersonationITCase.java
@@ -51,7 +51,7 @@ public class ImpersonationITCase extends AbstractITCase {
account = impersonationService.find(account.getOwner(), account.getKey());
assertNotNull(account);
- response = impersonationService.delete(account);
+ response = impersonationService.delete(account.getOwner(), account.getKey());
assertNotNull(response);
try {
diff --git a/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java b/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java
index c77e4c4..7aa974b 100644
--- a/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java
+++ b/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java
@@ -38,7 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
-import javax.validation.constraints.NotNull;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Response;
@@ -133,9 +132,9 @@ public class SyncopeCoreTestingServer implements ApplicationListener<ContextRefr
}
@Override
- public Response delete(final ImpersonationAccount account) {
- if (accounts.containsKey(account.getOwner())) {
- accounts.get(account.getOwner()).removeIf(acct -> acct.getKey().equalsIgnoreCase(account.getKey()));
+ public Response delete(final String owner, final String id) {
+ if (accounts.containsKey(owner)) {
+ accounts.get(owner).removeIf(acct -> acct.getKey().equalsIgnoreCase(id));
}
return Response.noContent().build();
}
[syncope] 01/02: Upgrading Nimnus JOSE JWT,
Zookeeper and docker-maven-plugin
Posted by il...@apache.org.
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
commit 7b0683fd301ddaa6185ee0a6bd50600718de7ed3
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Apr 6 08:44:58 2021 +0200
Upgrading Nimnus JOSE JWT, Zookeeper and docker-maven-plugin
---
.../keymaster/client/zookeeper/ZookeeperConfParamOpsITCase.java | 2 --
.../common/keymaster/client/zookeeper/ZookeeperDomainOpsITCase.java | 5 ++---
.../keymaster/client/zookeeper/ZookeeperServiceOpsITCase.java | 2 --
pom.xml | 6 +++---
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperConfParamOpsITCase.java b/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperConfParamOpsITCase.java
index 521e81a..97b6deb 100644
--- a/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperConfParamOpsITCase.java
+++ b/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperConfParamOpsITCase.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.common.keymaster.client.zookeeper;
-import org.apache.syncope.common.keymaster.client.zookeeper.ZookeeperKeymasterClientContext;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperDomainOpsITCase.java b/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperDomainOpsITCase.java
index ce488a1..624ae1a 100644
--- a/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperDomainOpsITCase.java
+++ b/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperDomainOpsITCase.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.common.keymaster.client.zookeeper;
-import org.apache.syncope.common.keymaster.client.zookeeper.ZookeeperKeymasterClientContext;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -97,6 +95,7 @@ public class ZookeeperDomainOpsITCase {
@Test
public void createMaster() {
- assertThrows(KeymasterException.class, () -> domainOps.create(new Domain.Builder(SyncopeConstants.MASTER_DOMAIN).build()));
+ assertThrows(KeymasterException.class, () -> domainOps.create(
+ new Domain.Builder(SyncopeConstants.MASTER_DOMAIN).build()));
}
}
diff --git a/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperServiceOpsITCase.java b/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperServiceOpsITCase.java
index 48bac0b..7b63d4f 100644
--- a/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperServiceOpsITCase.java
+++ b/common/keymaster/client-zookeeper/src/test/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperServiceOpsITCase.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.common.keymaster.client.zookeeper;
-import org.apache.syncope.common.keymaster.client.zookeeper.ZookeeperKeymasterClientContext;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/pom.xml b/pom.xml
index 0f9e788..145a7c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -406,7 +406,7 @@ under the License.
<cxf.version>3.4.3</cxf.version>
<bouncycastle.version>1.68</bouncycastle.version>
- <nimbus-jose-jwt.version>9.7</nimbus-jose-jwt.version>
+ <nimbus-jose-jwt.version>9.8</nimbus-jose-jwt.version>
<jackson.version>2.12.2</jackson.version>
@@ -486,7 +486,7 @@ under the License.
<antlr4.version>4.9.2</antlr4.version>
<curator.version>5.1.0</curator.version>
- <zookeeper.version>3.6.2</zookeeper.version>
+ <zookeeper.version>3.7.0</zookeeper.version>
<testds.port>1389</testds.port>
<testdb.webport>9082</testdb.webport>
@@ -2442,7 +2442,7 @@ under the License.
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.34.1</version>
+ <version>0.35.0</version>
</plugin>
<plugin>