Merge pull request #75 from eclipse-tractusx/revert-72-main

Revert "Fix: local deployment issues"
eclipse-tractusx · May 17, 2024 · d76da33 · d76da33
2 parents 7019114 + b9a80e2
commit d76da33
Show file tree

Hide file tree

Showing 14 changed files with 172 additions and 2,743 deletions.
diff --git a/DEPENDENCIES_BACKEND b/DEPENDENCIES_BACKEND
diff --git a/compose.yaml b/compose.yaml
diff --git a/demand-capacity-mgmt-backend/pom.xml b/demand-capacity-mgmt-backend/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>3.2.5</version>
+            <version>3.1.5</version>
         </dependency>
 
         <dependency>
@@ -83,6 +83,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -136,36 +140,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-docker-compose</artifactId>
-        </dependency>
-
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.14.0</version>
-		</dependency>
-
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-common</artifactId>
-            <version>2.5.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-            <version>2.5.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>2.2.21</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -191,9 +165,9 @@
             <plugin>
                 <groupId>com.hubspot.maven.plugins</groupId>
                 <artifactId>prettier-maven-plugin</artifactId>
-                <version>0.22</version>
+                <version>0.13</version>
                 <configuration>
-                    <prettierJavaVersion>2.6.0</prettierJavaVersion>
+                    <prettierJavaVersion>1.0.2</prettierJavaVersion>
                     <printWidth>120</printWidth>
                     <tabWidth>4</tabWidth>
                     <ignoreConfigFile>true</ignoreConfigFile>
@@ -226,7 +200,7 @@
             <resource>
                 <directory>${project.basedir}/src/main/resources</directory>
                 <includes>
-                    <include>application.yml</include>
+                    <include>application.properties</include>
                 </includes>
                 <targetPath>BOOT-INF/classes/</targetPath>
             </resource>
@@ -242,11 +216,6 @@
                 </includes>
                 <targetPath>META-INF</targetPath>
             </resource>
-            <!-- add content of resources folder -->
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
         </resources>
     </build>
     <repositories>

diff --git a/...sx/demandcapacitymgmt/demandcapacitymgmtbackend/DemandCapacityMgmtBackendApplication.java b/...sx/demandcapacitymgmt/demandcapacitymgmtbackend/DemandCapacityMgmtBackendApplication.java
@@ -24,12 +24,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableScheduling
-@ConfigurationPropertiesScan
 public class DemandCapacityMgmtBackendApplication {
 
     public static void main(String[] args) {

diff --git a/...ipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/appinfo/InfoConfiguration.java b/...ipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/appinfo/InfoConfiguration.java
diff --git a/...e/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/config/openapi/OpenApiConfig.java b/...e/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/config/openapi/OpenApiConfig.java
diff --git a/...sx/demandcapacitymgmt/demandcapacitymgmtbackend/security/AppSecurityConfigProperties.java b/...sx/demandcapacitymgmt/demandcapacitymgmtbackend/security/AppSecurityConfigProperties.java
diff --git a/...clipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/security/SecurityConfig.java b/...clipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/security/SecurityConfig.java
@@ -70,8 +70,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                         "/token/introspect"
                     )
                     .permitAll()
-                    .requestMatchers(HttpMethod.GET, "/docs/api-docs/**", "/ui/swagger-ui/**")
-                    .permitAll()
                     .anyRequest()
                     .authenticated()
         );

diff --git a/demand-capacity-mgmt-backend/src/main/resources/application.yml b/demand-capacity-mgmt-backend/src/main/resources/application.yml
@@ -18,23 +18,12 @@
 #   SPDX-License-Identifier: Apache-2.0
 #   ********************************************************************************
 
-app:
-  openapi:
-    name: Demand and Capacity Management
-    description: Demand and Capacity Management project
-    version: 1
-    security:
-      enabled: ${SECURITY_ENABLE:true}
-      auth-url: ${keycloak.baseUrl}/realms/${keycloak.realm}/protocol/openid-connect/auth
-      token-url: ${keycloak.baseUrl}/realms/${keycloak.realm}/protocol/openid-connect/token
-      refresh-token-url: ${KEYCLOAK_TOKEN_URL}
-
 spring:
   security:
     oauth2:
       resource-server:
         jwt:
-          issuer-uri: ${keycloak.baseUrl}/realms/${keycloak.realm}
+          issuer-uri: http://localhost:8888/realms/dcm
 
   datasource:
     url: jdbc:postgresql://${DCM_DATASOURCE_HOST:localhost:5432}/${DCM_DATASOURCE_NAME:dcm}
@@ -51,24 +40,13 @@ spring:
     user: ${DCM_DATASOURCE_USER:dcm}
     password: ${DCM_DATASOURCE_PASS:dcm}
     schemas: migrations
-    locations: classpath:db/migration
-
+    locations: classpath:db/migration/postgresql
+    
 keycloak:
-  baseUrl: ${KEYCLOAK_BASE_URL:http://localhost:28080}
-  realm: ${KEYCLOAK_REALM_NAME:dcm}
-  clientId: ${KEYCLOAK_CLIENT_ID:dcmauth}
-  clientSecret: ${DCMSECR:test}
+  baseUrl: http://localhost:8888
+  realm: dcm
+  clientId: dcmauth
+  clientSecret: ${DCMSECR}
   grant_type_token: password
   grant_type_refresh_token : refresh_token
 
-springdoc:
-  swagger-ui:
-    oauth:
-      clientId: ${keycloak.clientId}
-    disable-swagger-default-url: true
-    path: /ui/swagger-ui
-    show-common-extensions: true
-    csrf:
-      enabled: true
-  api-docs:
-    path: /docs/api-docs