chore: use new oxCore version

GluuFederation · Apr 7, 2023 · 5662398 · 5662398
1 parent e78ea60
commit 5662398
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/api-server/src/main/java/org/gluu/oxtrust/api/server/api/impl/ApiConfigWebRecource.java b/api-server/src/main/java/org/gluu/oxtrust/api/server/api/impl/ApiConfigWebRecource.java
@@ -62,7 +62,7 @@ public Response retrieveApiConfiguration() {
 			apiConfig.setApiUmaClientKeyStorePassword(
 					encryptionService.decrypt(oxTrustappConfiguration.getApiUmaClientKeyStorePassword()));
 			apiConfig.setApiUmaResourceId(oxTrustappConfiguration.getApiUmaResourceId());
-			apiConfig.setApiUmaScopes(oxTrustappConfiguration.getApiUmaScopes());
+			apiConfig.setApiUmaScope(oxTrustappConfiguration.getApiUmaScope());
 			apiConfig.setOxTrustApiTestMode(oxTrustappConfiguration.isOxTrustApiTestMode());
 			return Response.ok(apiConfig).build();
 		} catch (Exception e) {
@@ -98,8 +98,8 @@ public Response updateApiConfiguration(ApiConfig apiConfig) {
 			if (!Strings.isNullOrEmpty(apiConfig.getApiUmaResourceId())) {
 				appConfiguration.setApiUmaResourceId(apiConfig.getApiUmaResourceId());
 			}
-			if (apiConfig.getApiUmaScopes() != null) {
-				appConfiguration.setApiUmaScopes(apiConfig.getApiUmaScopes());
+			if (apiConfig.getApiUmaScope() != null) {
+				appConfiguration.setApiUmaScope(apiConfig.getApiUmaScope());
 			}
 			appConfiguration.setOxTrustApiTestMode(apiConfig.getOxTrustApiTestMode());
 			jsonConfigurationService.saveOxTrustappConfiguration(appConfiguration);

diff --git a/api-server/src/main/java/org/gluu/oxtrust/api/server/model/ApiConfig.java b/api-server/src/main/java/org/gluu/oxtrust/api/server/model/ApiConfig.java
@@ -20,8 +20,8 @@ public class ApiConfig implements Serializable{
 	private String apiUmaClientKeyId;
 	@JsonProperty("apiUmaResourceId")
 	private String apiUmaResourceId;
-	@JsonProperty("apiUmaScopes")
-	private String[] apiUmaScopes = null;
+	@JsonProperty("apiUmaScope")
+	private String apiUmaScope;
 	@JsonProperty("apiUmaClientKeyStoreFile")
 	private String apiUmaClientKeyStoreFile;
 	@JsonProperty("apiUmaClientKeyStorePassword")
@@ -61,14 +61,14 @@ public void setApiUmaResourceId(String apiUmaResourceId) {
 		this.apiUmaResourceId = apiUmaResourceId;
 	}
 
-	@JsonProperty("apiUmaScopes")
-	public String[] getApiUmaScopes() {
-		return apiUmaScopes;
+	@JsonProperty("apiUmaScope")
+	public String getApiUmaScope() {
+		return apiUmaScope;
 	}
 
 	@JsonProperty("apiUmaScopes")
-	public void setApiUmaScopes(String[] strings) {
-		this.apiUmaScopes = strings;
+	public void setApiUmaScope(String apiUmaScope) {
+		this.apiUmaScope = apiUmaScope;
 	}
 
 	@JsonProperty("apiUmaClientKeyStoreFile")

diff --git a/pom.xml b/pom.xml
@@ -215,42 +215,42 @@
 			<dependency>
 				<groupId>org.gluu</groupId>
 				<artifactId>gluu-orm-annotation</artifactId>
-				<version>${oxcore.version}</version>
+				<version>${gluu.parent.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.gluu</groupId>
 				<artifactId>gluu-orm-model</artifactId>
-				<version>${oxcore.version}</version>
+				<version>${gluu.parent.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.gluu</groupId>
 				<artifactId>gluu-orm-ldap</artifactId>
-				<version>${oxcore.version}</version>
+				<version>${gluu.parent.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.gluu</groupId>
 				<artifactId>gluu-orm-ldap-sample</artifactId>
-				<version>${oxcore.version}</version>
+				<version>${gluu.parent.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.gluu</groupId>
 				<artifactId>gluu-orm-couchbase</artifactId>
-				<version>${oxcore.version}</version>
+				<version>${gluu.parent.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.gluu</groupId>
 				<artifactId>gluu-orm-hybrid</artifactId>
-				<version>${oxcore.version}</version>
+				<version>${gluu.parent.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.gluu</groupId>
 				<artifactId>gluu-orm-cdi</artifactId>
-				<version>${oxcore.version}</version>
+				<version>${gluu.parent.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.gluu</groupId>
 				<artifactId>gluu-orm-standalone</artifactId>
-				<version>${oxcore.version}</version>
+				<version>${gluu.parent.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.gluu</groupId>