diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..4e379d2 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.0.2 diff --git a/charts/okta-spring-jx-example/Chart.yaml b/charts/okta-spring-jx-example/Chart.yaml index 76cd89d..f162590 100644 --- a/charts/okta-spring-jx-example/Chart.yaml +++ b/charts/okta-spring-jx-example/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 description: A Helm chart for Kubernetes icon: https://raw.githubusercontent.com/jenkins-x/jenkins-x-platform/master/images/java.png name: okta-spring-jx-example -version: 0.1.0-SNAPSHOT +version: 0.0.2 diff --git a/charts/okta-spring-jx-example/values.yaml b/charts/okta-spring-jx-example/values.yaml index 3086b38..7071892 100755 --- a/charts/okta-spring-jx-example/values.yaml +++ b/charts/okta-spring-jx-example/values.yaml @@ -3,8 +3,8 @@ # Declare variables to be passed into your templates. replicaCount: 1 image: - repository: draft - tag: dev + repository: 10.19.247.17:5000/mraible/okta-spring-jx-example + tag: 0.0.2 pullPolicy: IfNotPresent service: name: okta-spring-jx-example diff --git a/charts/okta-spring-jx-example@tmp/durable-4c94fdaf/jenkins-log.txt b/charts/okta-spring-jx-example@tmp/durable-4c94fdaf/jenkins-log.txt new file mode 100644 index 0000000..ce463ac --- /dev/null +++ b/charts/okta-spring-jx-example@tmp/durable-4c94fdaf/jenkins-log.txt @@ -0,0 +1,5 @@ ++ make tag +sed -i -e "s/version:.*/version: 0.0.2/" Chart.yaml +sed -i -e "s|repository: .*|repository: 10.19.247.17:5000\/mraible\/okta-spring-jx-example|" values.yaml +sed -i -e "s/tag: .*/tag: 0.0.2/" values.yaml +git add --all diff --git a/charts/okta-spring-jx-example@tmp/durable-4c94fdaf/script.sh b/charts/okta-spring-jx-example@tmp/durable-4c94fdaf/script.sh new file mode 100755 index 0000000..3c3be81 --- /dev/null +++ b/charts/okta-spring-jx-example@tmp/durable-4c94fdaf/script.sh @@ -0,0 +1,2 @@ +#!/bin/sh -xe +make tag \ No newline at end of file diff --git a/holdings-api/pom.xml b/holdings-api/pom.xml index fde9f22..40485d8 100644 --- a/holdings-api/pom.xml +++ b/holdings-api/pom.xml @@ -5,7 +5,7 @@ com.okta.developer holdings-api - 0.0.1-SNAPSHOT + 0.0.2 jar holdings-api diff --git a/holdings-api/pom.xml.versionsBackup b/holdings-api/pom.xml.versionsBackup new file mode 100644 index 0000000..fde9f22 --- /dev/null +++ b/holdings-api/pom.xml.versionsBackup @@ -0,0 +1,314 @@ + + + 4.0.0 + + com.okta.developer + holdings-api + 0.0.1-SNAPSHOT + jar + + holdings-api + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 2.0.2.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + 0.5.0 + 1.6 + v8.10.0 + 1.6.0 + default + override-me + + + + + org.springframework.boot + spring-boot-starter-web + + + com.okta.spring + okta-spring-boot-starter + ${okta.version} + + + com.okta.spring + okta-spring-sdk + ${okta.version} + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + 2.0.1.RELEASE + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-devtools + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + org.mockito + mockito-core + 2.17.0 + test + + + com.spotify + hamcrest-pojo + 1.1.1 + test + + + com.spotify + hamcrest-jackson + 1.1.1 + test + + + com.github.tomakehurst + wiremock + 2.8.0 + test + + + io.rest-assured + rest-assured + 3.0.3 + test + + + + + spring-boot:run + holdings-app-${project.version} + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.21.0 + + + + ${basedir}/target/classes + + + + + + integration-test + verify + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.1 + + + prepare-agent + process-test-classes + + prepare-agent + + + + prepare-agent-integration + pre-integration-test + + prepare-agent-integration + + + + jacoco-report + verify + + report + report-integration + + + + jacoco-merge-report + verify + + merge + report + + + ${project.build.directory}/jacoco-merge.exec + ${project.reporting.outputDirectory}/jacoco-merge + ${project.build.directory}/jacoco-merge.exec + + + ${project.build.directory} + + *.exec + + + + + + + + + maven-resources-plugin + + + default-resources + validate + + copy-resources + + + target/classes + + + src/main/resources + true + + + + + + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + add-redirect + + java + + + + + com.okta.developer.cli.AppRedirectUriManager + test + + appId ${appId} redirectUri ${redirectUri} + + + + + + + + + dev + + true + + + dev + + + + prod + + + + maven-resources-plugin + + + copy-resources + prepare-package + + copy-resources + + + ${basedir}/target/classes/static + + + ../crypto-pwa/www + + + + + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-maven-plugin.version} + + ../crypto-pwa + + + + install node and npm + + install-node-and-npm + + + ${node.version} + + + + npm install + + npm + + generate-resources + + install --unsafe-perm + + + + ionic test + + npm + + test + + run test + + + + ionic build prod + + npm + + compile + + run build --prod + + + + + + + + prod + + + +