Commit b9df07e7 authored by Steinberg, Jan's avatar Steinberg, Jan
Browse files

Merge branch 'master' into customizr-setup-via-github-url-etc

parents 3b695892 2e40509e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<parent> <parent>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<version>1.5.2.RELEASE</version> <version>1.5.22.RELEASE</version>
<relativePath /> <relativePath />
</parent> </parent>
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
</prerequisites> </prerequisites>
<properties> <properties>
<jackson.version>2.8.11</jackson.version>
<gesis.repository.visibility>public</gesis.repository.visibility> <gesis.repository.visibility>public</gesis.repository.visibility>
<publishing-context.version>0.4.6</publishing-context.version> <publishing-context.version>0.4.6</publishing-context.version>
<hikaricp.version>2.4.1</hikaricp.version> <hikaricp.version>2.4.1</hikaricp.version>
...@@ -67,7 +68,7 @@ ...@@ -67,7 +68,7 @@
<metrics-spark-reporter.version>1.2</metrics-spark-reporter.version> <metrics-spark-reporter.version>1.2</metrics-spark-reporter.version>
<metrics-spring.version>3.1.2</metrics-spring.version> <metrics-spring.version>3.1.2</metrics-spring.version>
<run.addResources>false</run.addResources> <run.addResources>false</run.addResources>
<spring-security.version>4.0.2.RELEASE</spring-security.version> <spring-security.version>4.2.20.RELEASE</spring-security.version>
<springfox.version>2.0.3</springfox.version> <springfox.version>2.0.3</springfox.version>
<poi.version>3.14</poi.version> <poi.version>3.14</poi.version>
<poi-ooxml.version>3.14</poi-ooxml.version> <poi-ooxml.version>3.14</poi-ooxml.version>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment