Skip to content

Commit

Permalink
0.1.3 (#74)
Browse files Browse the repository at this point in the history
* Create renovate.json

* Update dependency chai to v4.3.7

* Update dependency gradle to v7.6.1

* Update docker.elastic.co/elasticsearch/elasticsearch Docker tag to v7.17.9 (#4)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency sinon to v14.0.2 (#3)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update docker.elastic.co/kibana/kibana Docker tag to v7.17.9 (#6)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update docker.elastic.co/logstash/logstash Docker tag to v7.17.9 (#7)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update eclipse-temurin Docker tag to v17.0.6_10-jre-focal (#8)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency googleJavaFormat to v1.16.0 (#9)

* Update dependency googleJavaFormat to v1.16.0

* upgrade to latest version for maven build

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Raja Kolli <rajadilipkolli@gmail.com>

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
rajadilipkolli and renovate[bot] committed Apr 13, 2023
1 parent 219b830 commit 86c1229
Show file tree
Hide file tree
Showing 8 changed files with 148 additions and 57 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions generators/server/templates/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17.0.5_8-jre-focal as builder
FROM eclipse-temurin:17.0.6_10-jre-focal as builder
WORKDIR application
<%_ if (buildTool === 'maven') { _%>
ARG JAR_FILE=target/<%= appName %>-<%= DEFAULT_APP_VERSION %>.jar
Expand All @@ -10,7 +10,7 @@ COPY ${JAR_FILE} application.jar
RUN java -Djarmode=layertools -jar application.jar extract

# the second stage of our build will copy the extracted layers
FROM eclipse-temurin:17.0.5_8-jre-focal
FROM eclipse-temurin:17.0.6_10-jre-focal
WORKDIR application
COPY --from=builder application/dependencies/ ./
COPY --from=builder application/spring-boot-loader/ ./
Expand Down
6 changes: 3 additions & 3 deletions generators/server/templates/app/docker/docker-compose-elk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.8'
services:

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.7
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.9
container_name: elasticsearch
environment:
- cluster.name=docker-cluster
Expand All @@ -20,7 +20,7 @@ services:
hard: -1

logstash:
image: docker.elastic.co/logstash/logstash:7.17.7
image: docker.elastic.co/logstash/logstash:7.17.9
container_name: logstash
command: logstash -f /etc/logstash/conf.d/logstash.conf
volumes:
Expand All @@ -31,7 +31,7 @@ services:
- elasticsearch

kibana:
image: docker.elastic.co/kibana/kibana:7.17.7
image: docker.elastic.co/kibana/kibana:7.17.9
container_name: kibana
environment:
- ELASTICSEARCH_URL=http://elasticsearch:9200
Expand Down
2 changes: 1 addition & 1 deletion generators/server/templates/gradle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ gitProperties {
}

googleJavaFormat {
toolVersion = '1.15.0'
toolVersion = '1.16.0'
options style: 'AOSP'
}

Expand Down
2 changes: 1 addition & 1 deletion generators/server/templates/maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@
<configuration>
<java>
<googleJavaFormat>
<version>1.15.0</version>
<version>1.16.0</version>
<style>AOSP</style>
</googleJavaFormat>
</java>
Expand Down
172 changes: 125 additions & 47 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
"yeoman-generator": "5.7.0"
},
"devDependencies": {
"chai": "4.3.6",
"chai": "4.3.7",
"fs-extra": "10.1.0",
"mocha": "10.0.0",
"sinon": "14.0.0",
"sinon": "14.0.2",
"yeoman-assert": "3.1.1",
"yeoman-test": "6.3.0"
}
Expand Down
13 changes: 13 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"extends": [
"config:base"
],
"includeForks": true,
"labels": ["dependencies"],
"packageRules": [
{
"updateTypes": ["minor", "patch", "pin", "digest"],
"automerge": true
}
]
}

0 comments on commit 86c1229

Please sign in to comment.