From 13212ede3ed31fa7bf603ae52e69ec270b97fd7f Mon Sep 17 00:00:00 2001 From: Michael O'Brien Date: Sun, 9 Feb 2020 10:52:23 -0500 Subject: [PATCH] #3 - merge kubernetes gitignore changes --- README.md | 0 difference-kubernetes/.helmignore | 0 difference-kubernetes/Chart.yaml | 0 difference-kubernetes/pom.xml | 2 - difference-kubernetes/templates/NOTES.txt | 0 difference-kubernetes/templates/_helpers.tpl | 0 .../templates/deployment.yaml | 0 difference-kubernetes/templates/ingress.yaml | 0 difference-kubernetes/templates/service.yaml | 0 .../templates/tests/test-connection.yaml | 0 difference-kubernetes/values.yaml | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 difference-nbi/.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 difference-nbi/pom.xml | 46 +++++++++--------- difference-nbi/src/main/docker/DockerFile | 0 .../src/main/docker/startService.sh | 0 .../main/java/cloud/difference/nbi/Api.java | 0 .../cloud/difference/nbi/ApiController.java | 3 ++ .../cloud/difference/nbi/NbiApplication.java | 0 .../src/main/resources/application.properties | 0 .../difference/nbi/NbiApplicationTests.java | 0 pom.xml | 14 ++++++ 23 files changed, 40 insertions(+), 25 deletions(-) mode change 100644 => 100755 README.md mode change 100644 => 100755 difference-kubernetes/.helmignore mode change 100644 => 100755 difference-kubernetes/Chart.yaml mode change 100644 => 100755 difference-kubernetes/pom.xml mode change 100644 => 100755 difference-kubernetes/templates/NOTES.txt mode change 100644 => 100755 difference-kubernetes/templates/_helpers.tpl mode change 100644 => 100755 difference-kubernetes/templates/deployment.yaml mode change 100644 => 100755 difference-kubernetes/templates/ingress.yaml mode change 100644 => 100755 difference-kubernetes/templates/service.yaml mode change 100644 => 100755 difference-kubernetes/templates/tests/test-connection.yaml mode change 100644 => 100755 difference-kubernetes/values.yaml mode change 100644 => 100755 difference-nbi/.mvn/wrapper/MavenWrapperDownloader.java mode change 100644 => 100755 difference-nbi/.mvn/wrapper/maven-wrapper.jar mode change 100644 => 100755 difference-nbi/.mvn/wrapper/maven-wrapper.properties mode change 100644 => 100755 difference-nbi/pom.xml mode change 100644 => 100755 difference-nbi/src/main/docker/DockerFile mode change 100644 => 100755 difference-nbi/src/main/docker/startService.sh mode change 100644 => 100755 difference-nbi/src/main/java/cloud/difference/nbi/Api.java mode change 100644 => 100755 difference-nbi/src/main/java/cloud/difference/nbi/ApiController.java mode change 100644 => 100755 difference-nbi/src/main/java/cloud/difference/nbi/NbiApplication.java mode change 100644 => 100755 difference-nbi/src/main/resources/application.properties mode change 100644 => 100755 difference-nbi/src/test/java/cloud/difference/nbi/NbiApplicationTests.java mode change 100644 => 100755 pom.xml diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/difference-kubernetes/.helmignore b/difference-kubernetes/.helmignore old mode 100644 new mode 100755 diff --git a/difference-kubernetes/Chart.yaml b/difference-kubernetes/Chart.yaml old mode 100644 new mode 100755 diff --git a/difference-kubernetes/pom.xml b/difference-kubernetes/pom.xml old mode 100644 new mode 100755 index c85c17a..d781994 --- a/difference-kubernetes/pom.xml +++ b/difference-kubernetes/pom.xml @@ -7,9 +7,7 @@ difference-root 0.0.2-SNAPSHOT - cloud.difference difference-kubernetes - 0.0.2-SNAPSHOT difference-kubernetes difference-kubernetes project diff --git a/difference-kubernetes/templates/NOTES.txt b/difference-kubernetes/templates/NOTES.txt old mode 100644 new mode 100755 diff --git a/difference-kubernetes/templates/_helpers.tpl b/difference-kubernetes/templates/_helpers.tpl old mode 100644 new mode 100755 diff --git a/difference-kubernetes/templates/deployment.yaml b/difference-kubernetes/templates/deployment.yaml old mode 100644 new mode 100755 diff --git a/difference-kubernetes/templates/ingress.yaml b/difference-kubernetes/templates/ingress.yaml old mode 100644 new mode 100755 diff --git a/difference-kubernetes/templates/service.yaml b/difference-kubernetes/templates/service.yaml old mode 100644 new mode 100755 diff --git a/difference-kubernetes/templates/tests/test-connection.yaml b/difference-kubernetes/templates/tests/test-connection.yaml old mode 100644 new mode 100755 diff --git a/difference-kubernetes/values.yaml b/difference-kubernetes/values.yaml old mode 100644 new mode 100755 diff --git a/difference-nbi/.mvn/wrapper/MavenWrapperDownloader.java b/difference-nbi/.mvn/wrapper/MavenWrapperDownloader.java old mode 100644 new mode 100755 diff --git a/difference-nbi/.mvn/wrapper/maven-wrapper.jar b/difference-nbi/.mvn/wrapper/maven-wrapper.jar old mode 100644 new mode 100755 diff --git a/difference-nbi/.mvn/wrapper/maven-wrapper.properties b/difference-nbi/.mvn/wrapper/maven-wrapper.properties old mode 100644 new mode 100755 diff --git a/difference-nbi/pom.xml b/difference-nbi/pom.xml old mode 100644 new mode 100755 index 96bce67..0617fc1 --- a/difference-nbi/pom.xml +++ b/difference-nbi/pom.xml @@ -17,10 +17,21 @@ 1.8 + 1.8 + 1.8 2.9.8 + 1.11.339 + 2.27 + + + com.amazonaws + aws-java-sdk-secretsmanager + ${aws-secrets-manager-version} + + org.springframework.boot @@ -44,8 +55,7 @@ test - - + javax.ws.rs javax.ws.rs-api @@ -54,29 +64,25 @@ org.glassfish.jersey.containers jersey-container-servlet - 2.27 + org.glassfish.jersey.core jersey-server - 2.27 - + org.glassfish.jersey.core jersey-client - 2.27 - + org.glassfish.jersey.media jersey-media-multipart - 2.27 - + org.glassfish.jersey.media jersey-media-json-jackson - 2.27 - + org.glassfish.jersey.ext @@ -108,42 +114,36 @@ com.fasterxml.jackson.core jackson-core - ${jackson-2-version} - + com.fasterxml.jackson.core jackson-annotations - ${jackson-2-version} - + com.fasterxml.jackson.core jackson-databind - ${jackson-2-version} - + com.fasterxml.jackson.dataformat jackson-dataformat-smile - ${jackson-2-version} - + com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - ${jackson-2-version} - + com.fasterxml.jackson.module jackson-module-jaxb-annotations - ${jackson-2-version} - + com.owlike genson diff --git a/difference-nbi/src/main/docker/DockerFile b/difference-nbi/src/main/docker/DockerFile old mode 100644 new mode 100755 diff --git a/difference-nbi/src/main/docker/startService.sh b/difference-nbi/src/main/docker/startService.sh old mode 100644 new mode 100755 diff --git a/difference-nbi/src/main/java/cloud/difference/nbi/Api.java b/difference-nbi/src/main/java/cloud/difference/nbi/Api.java old mode 100644 new mode 100755 diff --git a/difference-nbi/src/main/java/cloud/difference/nbi/ApiController.java b/difference-nbi/src/main/java/cloud/difference/nbi/ApiController.java old mode 100644 new mode 100755 index c278b1b..180391e --- a/difference-nbi/src/main/java/cloud/difference/nbi/ApiController.java +++ b/difference-nbi/src/main/java/cloud/difference/nbi/ApiController.java @@ -20,12 +20,15 @@ public class ApiController { @RequestMapping(method=RequestMethod.GET) public @ResponseBody Api process(@RequestParam(value="action", required=true, defaultValue="undefined") String action) { String message = "pass"; + System.out.println(this.getClass().getCanonicalName()); // external call //message = externalAPICall(action); Api api = new Api(counter.incrementAndGet(), message); return api; } + + /* private String externalAPICall(String action) { String content = null; JAXRSClient client = new JAXRSClient(); diff --git a/difference-nbi/src/main/java/cloud/difference/nbi/NbiApplication.java b/difference-nbi/src/main/java/cloud/difference/nbi/NbiApplication.java old mode 100644 new mode 100755 diff --git a/difference-nbi/src/main/resources/application.properties b/difference-nbi/src/main/resources/application.properties old mode 100644 new mode 100755 diff --git a/difference-nbi/src/test/java/cloud/difference/nbi/NbiApplicationTests.java b/difference-nbi/src/test/java/cloud/difference/nbi/NbiApplicationTests.java old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index fe0425f..7b303e5 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,20 @@ difference difference-cloud project pom + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.2 + + 1.8 + 1.8 + + + + + difference-nbi difference-kubernetes