feat: update maven configuration, fix permission config (#126)

onecx · Apr 17, 2024 · cf19648 · cf19648
1 parent c2c04bb
commit cf19648
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/docs/modules/onecx-quarkus/pages/includes/attributes.adoc b/docs/modules/onecx-quarkus/pages/includes/attributes.adoc
@@ -1,4 +1,4 @@
-:project-version: 0.15.0
+:project-version: 0.16.0
 :quarkus-version: 3.9.3
 
 :examples-dir: ./../examples/
diff --git a/docs/modules/onecx-quarkus/pages/includes/onecx-tenant.adoc b/docs/modules/onecx-quarkus/pages/includes/onecx-tenant.adoc
@@ -41,6 +41,6 @@ ifndef::add-copy-button-to-env-var[]
 Environment variable: `+++ONECX_TENANT_SERVICE_CLIENT_URL+++`
 endif::add-copy-button-to-env-var[]
 --|string 
-|`http://onecx-tenant:8080`
+|`http://onecx-tenant-svc:8080`
 
 |===
diff --git a/extensions/permissions/runtime/src/main/resources/application.properties b/extensions/permissions/runtime/src/main/resources/application.properties
@@ -1,2 +1,2 @@
-onecx.permissions.service.client.url=http://onecx-permission:8080
+onecx.permissions.service.client.url=http://onecx-permission-svc:8080
 quarkus.rest-client.onecx_permission.url=${onecx.permissions.service.client.url}
diff --git a/extensions/tenant/src/main/java/org/tkit/onecx/quarkus/tenant/TenantConfig.java b/extensions/tenant/src/main/java/org/tkit/onecx/quarkus/tenant/TenantConfig.java
@@ -25,6 +25,6 @@ public interface TenantConfig {
      * This property is alias for rest-client generated configuration property `quarkus.rest-client.onecx_tenant.url`
      */
     @WithName(value = "service.client.url")
-    @WithDefault(value = "http://onecx-tenant:8080")
+    @WithDefault(value = "http://onecx-tenant-svc:8080")
     String clientUrl();
 }
diff --git a/it/permissions-mock/pom.xml b/it/permissions-mock/pom.xml
@@ -74,7 +74,6 @@
             <plugin>
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
-                <version>7.5.0</version>
                 <configuration>
                     <generatorName>jaxrs-spec</generatorName>
                     <modelNameSuffix>DTO</modelNameSuffix>

diff --git a/it/permissions/pom.xml b/it/permissions/pom.xml
@@ -88,7 +88,6 @@
             <plugin>
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
-                <version>7.5.0</version>
                 <configuration>
                     <generatorName>jaxrs-spec</generatorName>
                     <modelNameSuffix>DTO</modelNameSuffix>

diff --git a/it/security/pom.xml b/it/security/pom.xml
@@ -74,7 +74,6 @@
             <plugin>
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
-                <version>7.5.0</version>
                 <configuration>
                     <generatorName>jaxrs-spec</generatorName>
                     <modelNameSuffix>DTO</modelNameSuffix>

diff --git a/pom.xml b/pom.xml
@@ -81,6 +81,7 @@
         <git-commit-id-maven-plugin.version>8.0.2</git-commit-id-maven-plugin.version>
 
         <!-- Other -->
+        <openapitools.openapi-generator-maven-plugin.version>7.5.0</openapitools.openapi-generator-maven-plugin.version>
         <download-maven-plugin.version>1.9.0</download-maven-plugin.version>
         <projectlombok.version>1.18.32</projectlombok.version>
         <projectlombok.mapstruct-binding.version>0.2.0</projectlombok.mapstruct-binding.version>
@@ -196,6 +197,11 @@
                     <artifactId>download-maven-plugin</artifactId>
                     <version>${download-maven-plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.openapitools</groupId>
+                    <artifactId>openapi-generator-maven-plugin</artifactId>
+                    <version>${openapitools.openapi-generator-maven-plugin.version}</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>