Skip to content

Commit 0704eed

Browse files
jknackjknack
committed
v2.0.0.M2
1 parent 4eea713 commit 0704eed

File tree

20 files changed

+88
-34
lines changed

20 files changed

+88
-34
lines changed

‎docs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>jooby-project</artifactId>
9-
<version>2.0.0.M1</version>
9+
<version>2.0.0.M2</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎docs/src/main/java/io/jooby/adoc/DocGenerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public static void generate(Path basedir, boolean publish) throws Exception {
4646
Asciidoctor asciidoctor = Asciidoctor.Factory.create();
4747

4848
Attributes attributes = new Attributes();
49-
50-
attributes.setAttribute("joobyVersion", version());
49+
String version = version();
50+
attributes.setAttribute("joobyVersion", version);
5151
attributes.setAttribute("love", "&#9825;");
5252

5353
attributes.setAttribute("docinfo", "shared");
@@ -119,7 +119,7 @@ public static void generate(Path basedir, boolean publish) throws Exception {
119119
FileUtils.deleteQuietly(website.resolve("index.html").toFile());
120120

121121
FileUtils.copyDirectory(outdir.toFile(), website.toFile());
122-
git.commit("Sync documentation");
122+
git.commit(version);
123123
}
124124
}
125125

‎examples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>jooby-project</artifactId>
9-
<version>2.0.0.M1</version>
9+
<version>2.0.0.M2</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎jooby/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>jooby-project</artifactId>
9-
<version>2.0.0.M1</version>
9+
<version>2.0.0.M2</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎modules/jooby-bom/pom.xml‎

Lines changed: 66 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>io.jooby</groupId>
66
<artifactId>jooby-bom</artifactId>
7-
<version>2.0.0.M1</version>
7+
<version>2.0.0.M2</version>
88
<packaging>pom</packaging>
99
<name>jooby-bom</name>
1010
<description>Jooby (Bill of Materials)</description>
@@ -13,8 +13,8 @@
1313
<!-- THIS FILE IS AUTO GENERATED. DON'T EDIT -->
1414

1515
<properties>
16-
<jooby.version>2.0.0.M1</jooby.version>
17-
<HikariCP.version>3.2.0</HikariCP.version>
16+
<jooby.version>2.0.0.M2</jooby.version>
17+
<HikariCP.version>3.3.1</HikariCP.version>
1818
<apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
1919
<archetype-packaging.version>2.2</archetype-packaging.version>
2020
<asm.version>7.0</asm.version>
@@ -23,6 +23,7 @@
2323
<capsule-maven-plugin.version>1.0.4</capsule-maven-plugin.version>
2424
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
2525
<commons-io.version>2.6</commons-io.version>
26+
<config.version>1.3.3</config.version>
2627
<coveralls-maven-plugin.version>3.1.0</coveralls-maven-plugin.version>
2728
<depencency-check-maven.version>2.1.1</depencency-check-maven.version>
2829
<docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
@@ -36,17 +37,17 @@
3637
<guice.version>4.2.2</guice.version>
3738
<h2.version>1.4.197</h2.version>
3839
<handlebars.version>4.1.2</handlebars.version>
39-
<jackson.version>2.9.6</jackson.version>
40+
<jackson.version>2.9.8</jackson.version>
4041
<jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
4142
<jacoco.version>0.8.2</jacoco.version>
4243
<javassist.version>3.22.0-GA</javassist.version>
4344
<javax.inject.version>1</javax.inject.version>
44-
<jetty.version>9.4.14.v20181114</jetty.version>
45-
<jooby-maven-plugin.version>2.0.0.M1</jooby-maven-plugin.version>
46-
<jooby.version>2.0.0.M1</jooby.version>
45+
<jetty.version>9.4.15.v20190215</jetty.version>
46+
<jooby-maven-plugin.version>2.0.0.M2</jooby-maven-plugin.version>
47+
<jooby.version>2.0.0.M2</jooby.version>
4748
<jsr305.version>3.0.2</jsr305.version>
4849
<junit.version>5.3.2</junit.version>
49-
<kotlin.version>1.3.20</kotlin.version>
50+
<kotlin.version>1.3.21</kotlin.version>
5051
<kotlinx-coroutines-core.version>1.1.1</kotlinx-coroutines-core.version>
5152
<license-maven-plugin.version>3.0</license-maven-plugin.version>
5253
<log4jdbc.version>1.2</log4jdbc.version>
@@ -76,17 +77,20 @@
7677
<maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
7778
<mojo-executor.version>2.3.0</mojo-executor.version>
7879
<mysql-connector-java.version>8.0.13</mysql-connector-java.version>
79-
<netty.version>4.1.33.Final</netty.version>
80+
<netty.version>4.1.34.Final</netty.version>
8081
<nexus-staging-maven-plugin.version>1.6.5</nexus-staging-maven-plugin.version>
8182
<okhttp.version>3.11.0</okhttp.version>
8283
<plexus-utils.version>3.1.0</plexus-utils.version>
83-
<reactor.version>3.2.5.RELEASE</reactor.version>
84+
<reactor.version>3.2.8.RELEASE</reactor.version>
8485
<rest-assured.version>3.3.0</rest-assured.version>
85-
<rxjava.version>2.2.5</rxjava.version>
86+
<rocker.version>1.2.1</rocker.version>
87+
<rxjava.version>2.2.8</rxjava.version>
8688
<slf4j.version>1.7.25</slf4j.version>
89+
<spring.version>5.1.6.RELEASE</spring.version>
8790
<stork-maven-plugin.version>2.7.0</stork-maven-plugin.version>
88-
<undertow.version>2.0.17.Final</undertow.version>
91+
<undertow.version>2.0.19.Final</undertow.version>
8992
<versions-maven-plugin.version>2.1</versions-maven-plugin.version>
93+
<weld.version>3.1.0.Final</weld.version>
9094
</properties>
9195

9296
<dependencyManagement>
@@ -121,6 +125,31 @@
121125
<artifactId>jooby-hikari</artifactId>
122126
<version>${jooby.version}</version>
123127
</dependency>
128+
<dependency>
129+
<groupId>io.jooby</groupId>
130+
<artifactId>jooby-handlebars</artifactId>
131+
<version>${jooby.version}</version>
132+
</dependency>
133+
<dependency>
134+
<groupId>io.jooby</groupId>
135+
<artifactId>jooby-rocker</artifactId>
136+
<version>${jooby.version}</version>
137+
</dependency>
138+
<dependency>
139+
<groupId>io.jooby</groupId>
140+
<artifactId>jooby-spring</artifactId>
141+
<version>${jooby.version}</version>
142+
</dependency>
143+
<dependency>
144+
<groupId>io.jooby</groupId>
145+
<artifactId>jooby-weld</artifactId>
146+
<version>${jooby.version}</version>
147+
</dependency>
148+
<dependency>
149+
<groupId>io.jooby</groupId>
150+
<artifactId>jooby-guice</artifactId>
151+
<version>${jooby.version}</version>
152+
</dependency>
124153
<dependency>
125154
<groupId>org.ow2.asm</groupId>
126155
<artifactId>asm</artifactId>
@@ -131,6 +160,21 @@
131160
<artifactId>asm-util</artifactId>
132161
<version>${asm.version}</version>
133162
</dependency>
163+
<dependency>
164+
<groupId>org.jboss.weld.se</groupId>
165+
<artifactId>weld-se-shaded</artifactId>
166+
<version>${weld.version}</version>
167+
</dependency>
168+
<dependency>
169+
<groupId>org.springframework</groupId>
170+
<artifactId>spring-context</artifactId>
171+
<version>${spring.version}</version>
172+
</dependency>
173+
<dependency>
174+
<groupId>com.typesafe</groupId>
175+
<artifactId>config</artifactId>
176+
<version>${config.version}</version>
177+
</dependency>
134178
<dependency>
135179
<groupId>com.fasterxml.jackson.core</groupId>
136180
<artifactId>jackson-core</artifactId>
@@ -326,6 +370,16 @@
326370
<artifactId>kotlinx-coroutines-core</artifactId>
327371
<version>${kotlinx-coroutines-core.version}</version>
328372
</dependency>
373+
<dependency>
374+
<groupId>com.fizzed</groupId>
375+
<artifactId>rocker-runtime</artifactId>
376+
<version>${rocker.version}</version>
377+
</dependency>
378+
<dependency>
379+
<groupId>com.fizzed</groupId>
380+
<artifactId>rocker-compiler</artifactId>
381+
<version>${rocker.version}</version>
382+
</dependency>
329383
<dependency>
330384
<groupId>org.junit.jupiter</groupId>
331385
<artifactId>junit-jupiter-api</artifactId>

‎modules/jooby-freemarker/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>modules</artifactId>
9-
<version>2.0.0.M1</version>
9+
<version>2.0.0.M2</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎modules/jooby-guice/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>modules</artifactId>
9-
<version>2.0.0.M1</version>
9+
<version>2.0.0.M2</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎modules/jooby-handlebars/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>modules</artifactId>
9-
<version>2.0.0.M1</version>
9+
<version>2.0.0.M2</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎modules/jooby-hikari/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>modules</artifactId>
9-
<version>2.0.0.M1</version>
9+
<version>2.0.0.M2</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎modules/jooby-jackson/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.jooby</groupId>
88
<artifactId>modules</artifactId>
9-
<version>2.0.0.M1</version>
9+
<version>2.0.0.M2</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

0 commit comments

Comments
 (0)