Merge branch 'version1.1' into version2.0

Author: ArneLimburg

README.md

@@ -1,12 +1,22 @@
 # Api Versioning
 Showcase to demonstrate the implementation of backward-compatible APIs and versioning
 
+## Run via Docker
 Run
 ```
+docker build -t customer-service customer-service/
+docker run -p8080:8080 customer-service
+```
+to build and run the sample.
+
+## Run without Docker
+You need Apache Maven installed to run the sample without Docker. Run
+```
 cd customer-service
 mvn package meecrowave:run
 ```
-to run the sample.
+
+## Accessing the UI
 After the server is running, you can access the Swagger UI at
 http://localhost:8080/index.html
 

customer-service/Dockerfile

@@ -0,0 +1,15 @@
+FROM maven:3.6.3-jdk-11-openj9 AS mvn
+
+WORKDIR /usr/src/customer-service
+COPY pom.xml ./
+RUN mvn package dependency:go-offline # cache dependencies
+COPY src ./src
+RUN mvn clean package
+
+FROM openjdk:11
+
+EXPOSE 8080
+COPY --from=mvn /usr/src/customer-service/target/runner/meecrowave-core-runner.jar /opt/meecrowave-runner.jar
+COPY --from=mvn /usr/src/customer-service/target/customer-service.war /opt/customer-service.war
+
+ENTRYPOINT ["java", "--illegal-access=permit", "-Djava.net.preferIPv4Stack=true", "-jar", "/opt/meecrowave-runner.jar", "--webapp", "/opt/customer-service.war"]

customer-service/pom.xml

@@ -19,6 +19,7 @@
   </properties>
 
   <build>
+    <finalName>customer-service</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -30,6 +31,31 @@
         <artifactId>meecrowave-maven-plugin</artifactId>
         <version>${meecrowave.version}</version>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-runner</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.meecrowave</groupId>
+                  <artifactId>meecrowave-core</artifactId>
+                  <version>${meecrowave.version}</version>
+                  <classifier>runner</classifier>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>${project.build.directory}/runner</outputDirectory>
+              <stripVersion>true</stripVersion>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

customer-service/src/main/java/de/openknowledge/sample/customer/application/JaxRsActivator.java

@@ -27,6 +27,7 @@
 import org.eclipse.microprofile.openapi.annotations.media.Content;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody;
+import org.eclipse.microprofile.openapi.annotations.servers.Server;
 
 /**
  * JAX-RS Activator
@@ -44,6 +45,7 @@
                 url = "http://www.apache.org/licenses/LICENSE-2.0"),
         version = "2",
         description = "A customer service"),
+        servers = @Server(url = "http://localhost:8080/api"),
     components = @Components(requestBodies = @RequestBody(name = "Customer", content = @Content(schema = @Schema(implementation = CustomerResourceType.class)))))
 public class JaxRsActivator extends Application {