Skip to content

S
spring-boot
Commit b9152345 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.0.x'

parents 5bbdca8c 0ad0785b
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 1 deletion
spring-boot-project/spring-boot-dependencies/pom.xml
View file @ b9152345
...@@ -112,7 +112,9 @@ ...@@ -112,7 +112,9 @@
<jna.version>4.5.2</jna.version> <jna.version>4.5.2</jna.version>
<joda-time.version>2.10</joda-time.version> <joda-time.version>2.10</joda-time.version>
<jolokia.version>1.6.0</jolokia.version> <jolokia.version>1.6.0</jolokia.version>
<!-- Deprecated in favor of "johnzon.version" -->
<johnzon-jsonb.version>1.1.10</johnzon-jsonb.version> <johnzon-jsonb.version>1.1.10</johnzon-jsonb.version>
<johnzon.version>${johnzon-jsonb.version}</johnzon.version>
<jooq.version>3.11.5</jooq.version> <jooq.version>3.11.5</jooq.version>
<jsonassert.version>1.5.0</jsonassert.version> <jsonassert.version>1.5.0</jsonassert.version>
<json-path.version>2.4.0</json-path.version> <json-path.version>2.4.0</json-path.version>
...@@ -1515,10 +1517,40 @@ ...@@ -1515,10 +1517,40 @@
<artifactId>httpmime</artifactId> <artifactId>httpmime</artifactId>
<version>${httpclient.version}</version> <version>${httpclient.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
<version>${johnzon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jaxrs</artifactId>
<version>${johnzon.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.johnzon</groupId> <groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId> <artifactId>johnzon-jsonb</artifactId>
<version>${johnzon-jsonb.version}</version> <version>${johnzon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb-extras</artifactId>
<version>${johnzon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonschema</artifactId>
<version>${johnzon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-mapper</artifactId>
<version>${johnzon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-websocket</artifactId>
<version>${johnzon.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.kafka</groupId> <groupId>org.apache.kafka</groupId>
...@@ -2936,6 +2968,11 @@ ...@@ -2936,6 +2968,11 @@
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-maven-plugin</artifactId>
<version>${johnzon.version}</version>
</plugin>
<plugin> <plugin>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
......
Markdown is supported
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