Skip to content

Commit

Permalink
spring cloud update Greenwich.SR3
Browse files Browse the repository at this point in the history
  • Loading branch information
Ulises Bocchio authored and Ulises Bocchio committed Nov 25, 2019
1 parent f4719e5 commit c548acb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions jasypt-spring-boot-demo-cloud-config/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM java:9
FROM openjdk:12

ENV JAVA_CONF_DIR=$JAVA_HOME/conf

RUN apt-get update && apt-get install -y netcat
RUN yum install -y nmap-ncat.x86_64
RUN bash -c '([[ ! -d $JAVA_SECURITY_DIR ]] && ln -s $JAVA_HOME/lib $JAVA_HOME/conf) || (echo "Found java conf dir, package has been fixed, remove this hack"; exit -1)'

ADD ./target/jasypt-spring-boot-demo-cloud-config-0.1-SNAPSHOT.jar app.jar
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
user: cloud
defaultPassword: ENC(nrmZtkF7T0kjG/VodDvBw93Ct8EgjCA+)
defaultPassword: ENC(Zu51R5wTUaBbhJJoj8usPJ+h3Rd4Mw8qU1NxqOtSPJM0nZaYhhdpndWp1xcEdvsr)
# works with @EnableEncryptableProperties and StandardEncryptableEnvironment
endpoint: https://${user}:${defaultPassword}@remote:3000
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring.boot.version>2.2.1.RELEASE</spring.boot.version>
<spring.cloud.version>Finchley.RELEASE</spring.cloud.version>
<spring.cloud.version>Greenwich.SR3</spring.cloud.version>
<maven.compiler.version>3.7.0</maven.compiler.version>
<start-class>Application</start-class>
<jasypt.spring.boot.version>3.0.0-SNAPSHOT</jasypt.spring.boot.version>
Expand Down

0 comments on commit c548acb

Please sign in to comment.