From 97dbe9cc3072ca17e9f092cc6d3df5a510778ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Antonio=20Mu=C3=B1oz=20Herbas?=
<45716853+jmunozherbas@users.noreply.github.com>
Date: Fri, 8 Jul 2022 09:51:28 -0400
Subject: [PATCH] fix(jans-client-api): remove jans-config-api dependency and
solve wrong test dependencies (#1737)
---
jans-client-api/README.md | 2 +-
jans-client-api/gen-client/pom.xml | 37 +++++++++++------
jans-client-api/pom.xml | 18 ++-------
jans-client-api/server/pom.xml | 40 ++++++++++++-------
.../service/MainPersistenceService.java | 10 -----
5 files changed, 54 insertions(+), 53 deletions(-)
diff --git a/jans-client-api/README.md b/jans-client-api/README.md
index 08993a67f51..24098ee27e6 100644
--- a/jans-client-api/README.md
+++ b/jans-client-api/README.md
@@ -70,7 +70,7 @@ mvn test -Djans.base=/etc/jans
`Djans.base` is the conf path of the local running `jans-auth-server`
### Running tests with external jans-client-api
```
-mvn test -Dtest.client.api.url=http://localhost:9999/jans-client-api-server/
+mvn test -Dmaven.test.skip=false -Dtest.client.api.url=http://localhost:9999/jans-client-api-server/
```
`Dtest.client.api.url` is the url of a running `jans-client-api-server`
diff --git a/jans-client-api/gen-client/pom.xml b/jans-client-api/gen-client/pom.xml
index 813a131623b..7bc268d6fdd 100644
--- a/jans-client-api/gen-client/pom.xml
+++ b/jans-client-api/gen-client/pom.xml
@@ -212,6 +212,30 @@
+
+ test-dependencies
+
+
+ maven.test.skip
+ false
+
+
+
+
+ io.jans
+ jans-client-api-common
+ ${project.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ test-jar
+ test
+
+
+
@@ -225,19 +249,6 @@
-
- io.jans
- jans-client-api-common
- ${project.version}
-
-
- org.slf4j
- slf4j-log4j12
-
-
- test-jar
- test
-
com.google.guava
guava
diff --git a/jans-client-api/pom.xml b/jans-client-api/pom.xml
index 5cbc70ad6cb..254573257ff 100644
--- a/jans-client-api/pom.xml
+++ b/jans-client-api/pom.xml
@@ -36,7 +36,7 @@
31.1-jre
11
11
- 1.0.1
+ 1.0.2-SNAPSHOT
4.0.3.Final
11.0.8
4.7.5.Final
@@ -90,9 +90,9 @@
- https://github.com/JanssenProject/jans-config-api
- scm:git:git://github.com/JanssenProject/jans-config-api.git
- scm:git:git@github.com:v/jans-config-api.git
+ https://github.com/JanssenProject/jans-client-api
+ scm:git:git://github.com/JanssenProject/jans-client-api.git
+ scm:git:git@github.com:v/jans-client-api.git
@@ -136,16 +136,6 @@
jans-client-api-server
${project.version}
-
- io.jans
- jans-config-api-common
- ${project.version}
-
-
- io.jans
- jans-config-api-shared
- ${jans.version}
-
io.jans
jans-core-server
diff --git a/jans-client-api/server/pom.xml b/jans-client-api/server/pom.xml
index e8961cfe6c3..e2b7330e309 100644
--- a/jans-client-api/server/pom.xml
+++ b/jans-client-api/server/pom.xml
@@ -74,14 +74,6 @@
io.jans
jans-core-service
-
- io.jans
- jans-config-api-common
-
-
- io.jans
- jans-config-api-shared
-
io.jans
@@ -104,13 +96,7 @@
jans-client-api-common
${project.version}
-
- io.jans
- jans-client-api-common
- ${project.version}
- test-jar
- test
-
+
io.jans
jans-client-api
@@ -836,5 +822,29 @@
+
+ test-dependencies
+
+
+ maven.test.skip
+ false
+
+
+
+
+ io.jans
+ jans-client-api-common
+ ${project.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ test-jar
+ test
+
+
+
\ No newline at end of file
diff --git a/jans-client-api/server/src/main/java/io/jans/ca/server/persistence/service/MainPersistenceService.java b/jans-client-api/server/src/main/java/io/jans/ca/server/persistence/service/MainPersistenceService.java
index 1f549b641b3..82eeff6daf9 100644
--- a/jans-client-api/server/src/main/java/io/jans/ca/server/persistence/service/MainPersistenceService.java
+++ b/jans-client-api/server/src/main/java/io/jans/ca/server/persistence/service/MainPersistenceService.java
@@ -18,7 +18,6 @@
import io.jans.ca.server.persistence.modal.OrganizationBranch;
import io.jans.ca.server.persistence.modal.RpObject;
import io.jans.ca.server.service.MigrationService;
-import io.jans.configapi.model.status.StatsData;
import io.jans.orm.PersistenceEntryManager;
import io.jans.orm.exception.EntryPersistenceException;
import io.jans.orm.model.base.SimpleBranch;
@@ -49,7 +48,6 @@ public class MainPersistenceService implements PersistenceService {
@Inject
Logger logger;
- private StatsData statsData;
private static final String BASE_DN = "o=jans";
private static final String OU_CONFIGURATION = "configuration";
private static final String OU_JANS_CLIENT_API = "jans-client-api";
@@ -86,14 +84,6 @@ public String getPersistenceType() {
return configurationFactory.getBaseConfiguration().getString("persistence.type");
}
- public StatsData getStatsData() {
- return statsData;
- }
-
- public void setStatsData(StatsData statsData) {
- this.statsData = statsData;
- }
-
public void create() {
logger.debug("Creating JansPersistence for Api Client...");
try {