Merge branch 'main' into release-please--branches--main--components--…

…das_client
SchweizerischeBundesbahnen · Mar 6, 2024 · b4f1016 · b4f1016
2 parents 1dd9067 + 9d01112
commit b4f1016
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 10 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1 +1,5 @@
-{"das_client":"0.1.0"}
+{
+  "webapp": "0.2.0",
+  "playground-backend": "0.1.0",
+  "das_client":"0.1.0"
+}
diff --git a/playground-backend/CHANGELOG.md b/playground-backend/CHANGELOG.md
@@ -0,0 +1,17 @@
+# Changelog
+
+## 0.1.0 (2024-03-04)
+
+
+### Features
+
+* add backend actions ([#6](https://github.com/SchweizerischeBundesbahnen/DAS/issues/6)) ([d7fc9e8](https://github.com/SchweizerischeBundesbahnen/DAS/commit/d7fc9e883baddcaf343d658309457eca7137fe94))
+* change java version from 17 to 21 ([e2a1491](https://github.com/SchweizerischeBundesbahnen/DAS/commit/e2a1491fb39722f27135616b1d1b823ee5370aa3))
+* rename method ([b99f563](https://github.com/SchweizerischeBundesbahnen/DAS/commit/b99f5636ebbac3840e25e48944fa61b1bcf6c9a9))
+* rename test ([83acd14](https://github.com/SchweizerischeBundesbahnen/DAS/commit/83acd1469cf86f4b1ac99994bdba8dcdc8232fa2))
+* trigger build ([3f41ab7](https://github.com/SchweizerischeBundesbahnen/DAS/commit/3f41ab714bfedffedadaffaaf8a8905176424c6d))
+
+
+### Miscellaneous Chores
+
+* release 0.1.0 ([e73de8e](https://github.com/SchweizerischeBundesbahnen/DAS/commit/e73de8ed6c8f44c533afcc709c822d14f554c065))
diff --git a/playground-backend/pom.xml b/playground-backend/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -10,7 +9,7 @@
 	</parent>
 	<groupId>ch.sbb</groupId>
 	<artifactId>playground-backend</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.1.1-SNAPSHOT</version>
 	<name>playground-backend</name>
 	<description>Demo playground project</description>
 	<properties>

diff --git a/...round-backend/src/main/java/ch/sbb/playgroundbackend/controller/HelloWorldController.java b/...round-backend/src/main/java/ch/sbb/playgroundbackend/controller/HelloWorldController.java
@@ -8,7 +8,7 @@ public class HelloWorldController {
 
     @GetMapping
     String get() {
-        return "Hello DAS Playground";
+        return "Hello DAS Test";
     }
 
 }
diff --git a/...d-backend/src/test/java/ch/sbb/playgroundbackend/controller/HelloWorldControllerTest.java b/...d-backend/src/test/java/ch/sbb/playgroundbackend/controller/HelloWorldControllerTest.java
@@ -21,6 +21,6 @@ class HelloWorldControllerTest {
     @Test
     void getShouldReturnDefaultMessage() {
         assertThat(this.restTemplate.getForObject("http://localhost:" + port + "/", String.class))
-            .contains("Hello DAS Playground");
+            .contains("Hello DAS Test");
     }
 }
diff --git a/webapp/CHANGELOG.md b/webapp/CHANGELOG.md
@@ -0,0 +1,25 @@
+# Changelog
+
+## [0.2.0](https://github.com/SchweizerischeBundesbahnen/DAS/compare/webapp-v0.1.0...webapp-v0.2.0) (2024-03-04)
+
+
+### Features
+
+* remove html ([#22](https://github.com/SchweizerischeBundesbahnen/DAS/issues/22)) ([77f28ea](https://github.com/SchweizerischeBundesbahnen/DAS/commit/77f28eadf6dd7b8bb31ad1d4d20b400d2a65375a))
+
+
+### Bug Fixes
+
+* try bugfix ([a4bb9df](https://github.com/SchweizerischeBundesbahnen/DAS/commit/a4bb9df616f3d2333e5d8f7c6858b6310f1b28a3))
+
+## 0.1.0 (2024-03-04)
+
+
+### Features
+
+* add webapp ([89d92c6](https://github.com/SchweizerischeBundesbahnen/DAS/commit/89d92c6cd8b6a4e010c10522dc94b6a42b630b34))
+
+
+### Miscellaneous Chores
+
+* release 0.1.0 ([e73de8e](https://github.com/SchweizerischeBundesbahnen/DAS/commit/e73de8ed6c8f44c533afcc709c822d14f554c065))
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webapp",
-  "version": "0.0.0",
+  "version": "0.2.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/webapp/src/index.html b/webapp/src/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <title>Webapp</title>
-    <p>Hallo DAS</p>
+    <p>Hello Playground Test</p>
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />