Merge pull request #50 from FraunhoferISST/chore/updated_spring_boot_…

…dependencies chore: updated dependencies, included alternative commandline start o…
eclipse-tractusx · Oct 9, 2023 · 83f8fab · 83f8fab
2 parents b7d23f2 + 7b8b5a7
commit 83f8fab
Show file tree

Hide file tree

Showing 10 changed files with 214 additions and 202 deletions.
diff --git a/DEPENDENCIES_BACKEND b/DEPENDENCIES_BACKEND
diff --git a/DEPENDENCIES_FRONTEND b/DEPENDENCIES_FRONTEND
@@ -95,7 +95,7 @@ npm/npmjs/-/glob/7.2.3, ISC, approved, clearlydefined
 npm/npmjs/-/globals/13.16.0, MIT, approved, clearlydefined
 npm/npmjs/-/good-listener/1.2.2, MIT, approved, clearlydefined
 npm/npmjs/-/has-flag/4.0.0, MIT, approved, clearlydefined
-npm/npmjs/-/has/1.0.3, MIT, approved, clearlydefined
+npm/npmjs/-/has/1.0.3, MIT, approved, #10930
 npm/npmjs/-/ignore/5.2.0, MIT, approved, #5907
 npm/npmjs/-/import-fresh/3.3.0, MIT, approved, clearlydefined
 npm/npmjs/-/imurmurhash/0.1.4, MIT, approved, clearlydefined

diff --git a/backend/DEPENDENCIES b/backend/DEPENDENCIES
diff --git a/backend/INSTALL.md b/backend/INSTALL.md
@@ -16,9 +16,10 @@ mvn install
 
 # run for demo or development puroposes
 # customer role
-mvn spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=customer
+mvn spring-boot:run -Dspring-boot.run.arguments=--spring.config.location="./src/main/resources/application-customer.properties"
+
 # supplier role
-mvn spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=supplier
+mvn spring-boot:run -Dspring-boot.run.arguments=--spring.config.location="./src/main/resources/application-supplier.properties"
 ```
 5. Done! The Swagger UI should be available at 
     - (Java & Docker) `http://YOURIP:8081/catena/swagger-ui/index.html`

diff --git a/backend/mvnw b/backend/mvnw
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.2</version>
+    <version>3.1.4</version>
     <relativePath/>
   </parent>
   <groupId>org.eclipse.tractusx.puris</groupId>
@@ -41,6 +41,7 @@
     <springdoc.version>2.1.0</springdoc.version>
     <okhttp3.version>2.7.5</okhttp3.version>
     <hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
+      <snakeyaml.version>2.2</snakeyaml.version>
   </properties>
   <dependencies>
     <dependency>
@@ -59,12 +60,6 @@
       <groupId>org.springframework.session</groupId>
       <artifactId>spring-session-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-devtools</artifactId>
-      <scope>runtime</scope>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
@@ -116,21 +111,25 @@
   </dependencies>
 
   <pluginRepositories>
-    <pluginRepository>
-      <id>dash-licenses-snapshots</id>
-      <url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
+<!--    <pluginRepository>-->
+<!--      <id>dash-licenses-snapshots</id>-->
+<!--      <url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url>-->
+<!--      <snapshots>-->
+<!--        <enabled>true</enabled>-->
+<!--      </snapshots>-->
+<!--    </pluginRepository>-->
+      <pluginRepository>
+          <id>dash-licenses</id>
+          <url>https://repo.eclipse.org/content/repositories/dash-licenses</url>
+      </pluginRepository>
   </pluginRepositories>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.eclipse.dash</groupId>
         <artifactId>license-tool-plugin</artifactId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.2</version>
         <configuration>
           <projectId>automotive.tractusx</projectId>
           <!-- name of dependencies file -->

diff --git a/backend/src/main/resources/application-customer.properties b/backend/src/main/resources/application-customer.properties
@@ -39,14 +39,12 @@ own.bpnl=${OWN_BPNL:BPNL4444444444XX}
 own.name=${OWN_NAME:Scenario Customer}
 
 # Own BPNS (optional: if this is set, then set own.default.site.name as well)
-#own.default.bpns=${OWN_BPNS:BPNS4444444444XY}
-own.default.bpns=
+own.default.bpns=${OWN_BPNS:BPNS4444444444XY}
 # Name of Site (see above)
-#own.default.site.name=${OWN_SITE:Hauptwerk Musterhausen}
-own.default.site.name=
+own.default.site.name=${OWN_SITE:Hauptwerk Musterhausen}
 
 # If a BPNS is set, then this BPNA will be attached to it.
-# Otherwise it will be attached immediately to the BPNL (see above)
+# Otherwise, it will be attached immediately to the BPNL (see above)
 own.default.bpna=${OWN_BPNS:BPNA4444444444ZZ}
 own.default.streetandnumber=${OWN_STREETANDNUMBER:Musterstrasse 35b}
 own.default.zipcodeandcity=${OWN_ZIPCODEANDCITY:77777 Musterhausen}
@@ -59,4 +57,6 @@ own.edr.deletiontimer=2
 puris.apiversion=1.0.0
 puris.demonstrator.role=customer
 # run with:
-# mvn spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=customer
+# ./mvnw spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=customer
+# alternatively:
+# ./mvnw spring-boot:run -Dspring-boot.run.arguments=--spring.config.location="./src/main/resources/application-customer.properties"
diff --git a/backend/src/main/resources/application-supplier.properties b/backend/src/main/resources/application-supplier.properties
@@ -45,7 +45,7 @@ own.default.bpns=${OWN_BPNS:BPNS1234567890ZZ}
 own.default.site.name=${OWN_SITE:Konzernzentrale Dudelsdorf}
 
 # If a BPNS is set, then this BPNA will be attached to it.
-# Otherwise it will be attached immediately to the BPNL (see above)
+# Otherwise, it will be attached immediately to the BPNL (see above)
 own.default.bpna=${OWN_BPNS:BPNA1234567890AA}
 own.default.streetandnumber=${OWN_STREETANDNUMBER:Heinrich-Supplier-Strasse 1}
 own.default.zipcodeandcity=${OWN_ZIPCODEANDCITY:77785 Dudelsdorf}
@@ -58,4 +58,6 @@ own.edr.deletiontimer=2
 puris.apiversion=1.0.0
 puris.demonstrator.role=supplier
 # run with:
-# mvn spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=supplier
+# ./mvnw spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=supplier
+# alternatively:
+# ./mvnw spring-boot:run -Dspring-boot.run.arguments=--spring.config.location="./src/main/resources/application-supplier.properties"
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
@@ -39,14 +39,12 @@ own.bpnl=${OWN_BPNL:BPNL4444444444XX}
 own.name=${OWN_NAME:Scenario Customer}
 
 # Own BPNS (optional: if this is set, then set own.default.site.name as well)
-#own.default.bpns=${OWN_BPNS:BPNS4444444444XY}
 own.default.bpns=${OWN_BPNS:BPNS4444444444XY}
 # Name of Site (see above)
-#own.default.site.name=${OWN_SITE:Hauptwerk Musterhausen}
 own.default.site.name=${OWN_SITE:Hauptwerk Musterhausen}
 
 # If a BPNS is set, then this BPNA will be attached to it.
-# Otherwise it will be attached immediately to the BPNL (see above)
+# Otherwise, it will be attached immediately to the BPNL (see above)
 own.default.bpna=${OWN_BPNS:BPNA4444444444ZZ}
 own.default.streetandnumber=${OWN_STREETANDNUMBER:Musterstrasse 35b}
 own.default.zipcodeandcity=${OWN_ZIPCODEANDCITY:77777 Musterhausen}
@@ -59,4 +57,4 @@ own.edr.deletiontimer=2
 puris.apiversion=1.0.0
 puris.demonstrator.role=customer
 # run with:
-# mvn spring-boot:run -Dspring-boot.run.arguments=--spring.profiles.active=customer
+# ./mvnw spring-boot:run -Dspring-boot.run.arguments=--spring.config.location="./src/main/resources/application.properties"
diff --git a/backend/docs/dev.md → docs/DEVELOPMENT.md b/backend/docs/dev.md → docs/DEVELOPMENT.md
@@ -10,3 +10,17 @@ The first line runs the maven license tool with the parameters specified in the
 ./backend/pom.xml and produces a DEPENDENCIES file in the ./backend folder.  
 Then this file gets copied to the PURIS-project root folder under the name DEPENDENCIES_BACKEND. 
 Both files should be updated prior to any pull request.  
+
+### Frontend
+```
+# move to a persistent folder. Could also be ~/jars.
+mv org.eclipse.dash.licenses-1.0.2.jar ~/coding/org.eclipse.dash.licenses-1.0.2.jar
+vim ~/.bashrc
+# add following line using i
+alias eclipseDashTool='java -jar ~/coding/org.eclipse.dash.licenses-1.0.2.jar'
+# esc, qw -> enter to save and exit
+source ~/.bashrc
+# cd to puris-frontend
+cd frontend
+eclipseDashTool package-lock.json -project automotive.tractusx -summary ../DEPENDENCIES_FRONTEND
+```