Skip to content

Commit 6599885

Browse files
jknackjknack
committed
v2.0.0
1 parent ed10212 commit 6599885

File tree

28 files changed

+118
-67
lines changed

28 files changed

+118
-67
lines changed

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# ∞ do more, more easily
88

9-
[Jooby](https://jooby.io) is a modern, performant and easy to use web framework for Java and Kotlin built on top of your
9+
[Jooby 2.x](https://jooby.io) is a modern, performant and easy to use web framework for Java and Kotlin built on top of your
1010
favorite web server.
1111

1212
Java:
@@ -40,7 +40,9 @@ fun main(args: Array<String>) {
4040

4141
```
4242

43-
More at website [https://jooby.io](https://jooby.io)
43+
Documentation for current version is available at [https://jooby.io](https://jooby.io)
44+
45+
Documentation for previous version is available at [Jooby 1.x documentation](https://jooby.io/v1)
4446

4547
author
4648
=====

‎docs/asciidoc/index.adoc‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ Style guidelines:
2626
Jooby is a modern, performant and easy to use web framework for Java and Kotlin built on top of your
2727
favorite web server.
2828

29+
[TIP]
30+
====
31+
Looking for previous version? The link:v1[v1 documentation] is still available.
32+
====
33+
2934
.Welcome!!
3035
[source,java,role="primary"]
3136
----
@@ -55,19 +60,6 @@ fun main(args: Array<String>) {
5560
}
5661
----
5762

58-
=== Status
59-
60-
[IMPORTANT]
61-
====
62-
There is no stable release yet for `2.0.0`. API may change between milestone releases without warning.
63-
64-
This is a **work-in-progress** document and contains documentation and examples of what is ready to use. If it is not documented here, it is not implemented.
65-
66-
Not ready yet? Try https://jooby.org[Jooby 1.x]
67-
68-
Thank you {love}
69-
====
70-
7163
=== Key Features
7264

7365
* Fast startup time
@@ -131,11 +123,11 @@ import io.jooby.Jooby;
131123
public class App {
132124
133125
public static void main(String[] args) {
134-
runApp(app -> {
126+
runApp(args, app -> {
135127
136128
app.get("/", ctx -> "Hello Jooby!");
137129
138-
}, args);
130+
});
139131
}
140132
}
141133
----

‎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.RC4-SNAPSHOT</version>
9+
<version>2.0.0</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77

88
import io.jooby.SneakyThrows;
99
import org.apache.commons.io.FileUtils;
10+
import org.apache.commons.io.filefilter.AndFileFilter;
11+
import org.apache.commons.io.filefilter.DirectoryFileFilter;
12+
import org.apache.commons.io.filefilter.IOFileFilter;
13+
import org.apache.commons.io.filefilter.NameFileFilter;
14+
import org.apache.commons.io.filefilter.TrueFileFilter;
1015
import org.asciidoctor.Asciidoctor;
1116
import org.asciidoctor.Attributes;
1217
import org.asciidoctor.Options;
@@ -117,7 +122,9 @@ private static void v1doc(Path basedir, Path output) throws Exception {
117122
String content = FileUtils.readFileToString(index, "UTF-8")
118123
.replace("http://jooby.org", "https://jooby.org")
119124
.replace("href=\"/resources", "href=\"/v1/resources")
120-
.replace("src=\"/resources", "src=\"/v1/resources");
125+
.replace("src=\"/resources", "src=\"/v1/resources")
126+
// remove/replace redirection
127+
.replace("<meta http-equiv=\"refresh\" content=\"0; URL=https://jooby.io\" />", "");
121128
Document doc = Jsoup.parse(content);
122129
doc.select("a").forEach(a -> {
123130
String href = a.attr("href");
@@ -128,6 +135,9 @@ private static void v1doc(Path basedir, Path output) throws Exception {
128135
});
129136
FileUtils.writeStringToFile(index, doc.toString(), "UTF-8");
130137
}
138+
FileUtils.deleteQuietly(v1target.resolve(".git").toFile());
139+
FileUtils.deleteQuietly(v1target.resolve(".gitignore").toFile());
140+
FileUtils.deleteQuietly(v1target.resolve("CNAME").toFile());
131141
}
132142

133143
private static void processModule(Asciidoctor asciidoctor, Path basedir, Path module, Path outdir,

‎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.RC4-SNAPSHOT</version>
9+
<version>2.0.0</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.RC4-SNAPSHOT</version>
9+
<version>2.0.0</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎modules/jooby-bom/pom.xml‎

Lines changed: 72 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.jooby</groupId>
66
<artifactId>modules</artifactId>
7-
<version>2.0.0.RC4-SNAPSHOT</version>
7+
<version>2.0.0</version>
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>
@@ -16,12 +16,11 @@
1616
<!-- THIS FILE IS AUTO GENERATED. DON'T EDIT -->
1717

1818
<properties>
19-
<jooby.version>2.0.0.RC3</jooby.version>
19+
<jooby.version>2.0.0</jooby.version>
2020
<HikariCP.version>3.3.1</HikariCP.version>
2121
<apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
2222
<archetype-packaging.version>2.2</archetype-packaging.version>
2323
<asm.version>7.1</asm.version>
24-
<boringssl.version>2.0.8.Final</boringssl.version>
2524
<build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
2625
<capsule-maven-plugin.version>1.0.4</capsule-maven-plugin.version>
2726
<checkstyle.version>8.19</checkstyle.version>
@@ -34,30 +33,33 @@
3433
<dokka-maven-plugin.version>0.9.13</dokka-maven-plugin.version>
3534
<duplicate-finder-maven-plugin.version>1.2.1</duplicate-finder-maven-plugin.version>
3635
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
36+
<flyway.version>5.2.4</flyway.version>
3737
<freemarker.version>2.3.28</freemarker.version>
3838
<gradle-core.version>2.6</gradle-core.version>
3939
<gradle-plugins.version>0.9-rc-1</gradle-plugins.version>
4040
<gradle-tooling-api.version>2.6</gradle-tooling-api.version>
41-
<guava.version>27.1-jre</guava.version>
41+
<guava.version>28.0-jre</guava.version>
4242
<guice.version>4.2.2</guice.version>
43-
<h2.version>1.4.197</h2.version>
43+
<h2.version>1.4.199</h2.version>
4444
<handlebars.version>4.1.2</handlebars.version>
45-
<jackson.version>2.9.8</jackson.version>
46-
<jacoco-maven-plugin.version>0.8.3</jacoco-maven-plugin.version>
47-
<jacoco.version>0.8.3</jacoco.version>
45+
<hibernate.version>5.4.3.Final</hibernate.version>
46+
<jackson.version>2.9.9</jackson.version>
47+
<jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
48+
<jacoco.version>0.8.4</jacoco.version>
4849
<jakarta.ws.rs-api.version>2.1.5</jakarta.ws.rs-api.version>
4950
<javassist.version>3.25.0-GA</javassist.version>
5051
<javax.inject.version>1</javax.inject.version>
5152
<jboss-modules.version>1.9.1.Final</jboss-modules.version>
52-
<jetty.version>9.4.17.v20190418</jetty.version>
53-
<jooby-maven-plugin.version>2.0.0.RC3</jooby-maven-plugin.version>
54-
<jooby.version>2.0.0.RC3</jooby.version>
53+
<jdbi.version>3.8.2</jdbi.version>
54+
<jetty.version>9.4.19.v20190610</jetty.version>
55+
<jooby-maven-plugin.version>2.0.0</jooby-maven-plugin.version>
56+
<jooby.version>2.0.0</jooby.version>
5557
<jsr305.version>3.0.2</jsr305.version>
56-
<junit.version>5.4.2</junit.version>
57-
<kotlin.version>1.3.30</kotlin.version>
58-
<kotlinx-coroutines-core.version>1.2.0</kotlinx-coroutines-core.version>
58+
<junit.version>5.5.0</junit.version>
59+
<kotlin.version>1.3.40</kotlin.version>
60+
<kotlinx-coroutines-core.version>1.2.2</kotlinx-coroutines-core.version>
5961
<license-maven-plugin.version>3.0</license-maven-plugin.version>
60-
<log4j.version>2.11.2</log4j.version>
62+
<log4j.version>2.12.0</log4j.version>
6163
<log4jdbc.version>1.2</log4jdbc.version>
6264
<logback-classic.version>1.2.3</logback-classic.version>
6365
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
@@ -83,23 +85,23 @@
8385
<maven-site-plugin.version>3.4</maven-site-plugin.version>
8486
<maven-source-plugin.version>2.4</maven-source-plugin.version>
8587
<maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
86-
<mockito.version>2.27.0</mockito.version>
88+
<mockito.version>2.28.2</mockito.version>
8789
<mojo-executor.version>2.3.0</mojo-executor.version>
88-
<mysql-connector-java.version>8.0.15</mysql-connector-java.version>
89-
<netty.version>4.1.35.Final</netty.version>
90+
<mysql-connector-java.version>8.0.16</mysql-connector-java.version>
91+
<netty.version>4.1.37.Final</netty.version>
9092
<nexus-staging-maven-plugin.version>1.6.5</nexus-staging-maven-plugin.version>
91-
<okhttp.version>3.14.1</okhttp.version>
93+
<okhttp.version>4.0.0</okhttp.version>
9294
<plexus-utils.version>3.2.0</plexus-utils.version>
93-
<reactor.version>3.2.8.RELEASE</reactor.version>
94-
<rest-assured.version>3.3.0</rest-assured.version>
95+
<reactor.version>3.2.10.RELEASE</reactor.version>
96+
<rest-assured.version>4.0.0</rest-assured.version>
9597
<rocker.version>1.2.1</rocker.version>
96-
<rxjava.version>2.2.8</rxjava.version>
98+
<rxjava.version>2.2.10</rxjava.version>
9799
<slf4j.version>1.7.26</slf4j.version>
98-
<spring.version>5.1.6.RELEASE</spring.version>
100+
<spring.version>5.1.8.RELEASE</spring.version>
99101
<stork-maven-plugin.version>2.7.0</stork-maven-plugin.version>
100-
<undertow.version>2.0.20.Final</undertow.version>
102+
<undertow.version>2.0.22.Final</undertow.version>
101103
<versions-maven-plugin.version>2.1</versions-maven-plugin.version>
102-
<weld.version>3.1.0.Final</weld.version>
104+
<weld.version>3.1.1.Final</weld.version>
103105
</properties>
104106

105107
<dependencyManagement>
@@ -139,6 +141,21 @@
139141
<artifactId>jooby-hikari</artifactId>
140142
<version>${jooby.version}</version>
141143
</dependency>
144+
<dependency>
145+
<groupId>io.jooby</groupId>
146+
<artifactId>jooby-flyway</artifactId>
147+
<version>${jooby.version}</version>
148+
</dependency>
149+
<dependency>
150+
<groupId>io.jooby</groupId>
151+
<artifactId>jooby-hibernate</artifactId>
152+
<version>${jooby.version}</version>
153+
</dependency>
154+
<dependency>
155+
<groupId>io.jooby</groupId>
156+
<artifactId>jooby-jdbi</artifactId>
157+
<version>${jooby.version}</version>
158+
</dependency>
142159
<dependency>
143160
<groupId>io.jooby</groupId>
144161
<artifactId>jooby-handlebars</artifactId>
@@ -149,6 +166,11 @@
149166
<artifactId>jooby-rocker</artifactId>
150167
<version>${jooby.version}</version>
151168
</dependency>
169+
<dependency>
170+
<groupId>io.jooby</groupId>
171+
<artifactId>jooby-freemarker</artifactId>
172+
<version>${jooby.version}</version>
173+
</dependency>
152174
<dependency>
153175
<groupId>io.jooby</groupId>
154176
<artifactId>jooby-spring</artifactId>
@@ -164,6 +186,16 @@
164186
<artifactId>jooby-guice</artifactId>
165187
<version>${jooby.version}</version>
166188
</dependency>
189+
<dependency>
190+
<groupId>io.jooby</groupId>
191+
<artifactId>jooby-gradle-plugin</artifactId>
192+
<version>${jooby.version}</version>
193+
</dependency>
194+
<dependency>
195+
<groupId>io.jooby</groupId>
196+
<artifactId>jooby-maven-plugin</artifactId>
197+
<version>${jooby-maven-plugin.version}</version>
198+
</dependency>
167199
<dependency>
168200
<groupId>org.ow2.asm</groupId>
169201
<artifactId>asm</artifactId>
@@ -289,11 +321,21 @@
289321
<artifactId>commons-io</artifactId>
290322
<version>${commons-io.version}</version>
291323
</dependency>
324+
<dependency>
325+
<groupId>org.hibernate</groupId>
326+
<artifactId>hibernate-core</artifactId>
327+
<version>${hibernate.version}</version>
328+
</dependency>
292329
<dependency>
293330
<groupId>mysql</groupId>
294331
<artifactId>mysql-connector-java</artifactId>
295332
<version>${mysql-connector-java.version}</version>
296333
</dependency>
334+
<dependency>
335+
<groupId>org.jdbi</groupId>
336+
<artifactId>jdbi3-core</artifactId>
337+
<version>${jdbi.version}</version>
338+
</dependency>
297339
<dependency>
298340
<groupId>com.h2database</groupId>
299341
<artifactId>h2</artifactId>
@@ -304,6 +346,11 @@
304346
<artifactId>javax.inject</artifactId>
305347
<version>${javax.inject.version}</version>
306348
</dependency>
349+
<dependency>
350+
<groupId>org.flywaydb</groupId>
351+
<artifactId>flyway-core</artifactId>
352+
<version>${flyway.version}</version>
353+
</dependency>
307354
<dependency>
308355
<groupId>com.squareup.okhttp3</groupId>
309356
<artifactId>okhttp</artifactId>

‎modules/jooby-flyway/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.RC4-SNAPSHOT</version>
9+
<version>2.0.0</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎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.RC4-SNAPSHOT</version>
9+
<version>2.0.0</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎modules/jooby-gradle-plugin/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.RC4-SNAPSHOT</version>
9+
<version>2.0.0</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

0 commit comments

Comments
 (0)