Merge branch 'version1.1' into version2.0

ArneLimburg · ArneLimburg · commit 2300f0cfaa25 · 2022-11-29T08:17:20.000+01:00
diff --git a/customer-service/Dockerfile b/customer-service/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /usr/src/customer-service
 COPY pom.xml ./
 RUN mvn package dependency:go-offline # cache dependencies
 COPY src ./src
-RUN mvn clean package
+RUN mvn clean package -DskipTests
 
 FROM openjdk:11
 
diff --git a/customer-service/src/main/java/de/openknowledge/sample/customer/application/CustomMediaType.java b/customer-service/src/main/java/de/openknowledge/sample/customer/application/CustomMediaType.java
@@ -20,7 +20,7 @@
  */
 public final class CustomMediaType {
 
-    public static final String CUSTOMER_V1 = "application/vnd.de.openknowledge.sample.customer.v1+json2";
-    public static final String CUSTOMER_V2 = "application/vnd.de.openknowledge.sample.customer.v2+json2";
+    public static final String CUSTOMER_V1 = "application/vnd.de.openknowledge.sample.customer.v1+json";
+    public static final String CUSTOMER_V2 = "application/vnd.de.openknowledge.sample.customer.v2+json";
 
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`public final class CustomMediaType {`
`22`	`22`
`23`		`- public static final String CUSTOMER_V1 = "application/vnd.de.openknowledge.sample.customer.v1+json2";`
`24`		`- public static final String CUSTOMER_V2 = "application/vnd.de.openknowledge.sample.customer.v2+json2";`
	`23`	`+ public static final String CUSTOMER_V1 = "application/vnd.de.openknowledge.sample.customer.v1+json";`
	`24`	`+ public static final String CUSTOMER_V2 = "application/vnd.de.openknowledge.sample.customer.v2+json";`
`25`	`25`
`26`	`26`	`}`