diff --git a/_config.yml b/_config.yml index 9e1618c..c7dbd9e 100644 --- a/_config.yml +++ b/_config.yml @@ -2,12 +2,35 @@ javalinThreeVersion: 3.13.13 javalinFourVersion: 4.6.7 javalinFiveVersion: 5.6.4 javalinSixVersion: 6.7.0 -javalinversion: 6.7.0 +javalinversion: 7.0.0 slf4jversion: 2.0.17 repourl: https://github.com/javalin/website description: Javalin - A lightweight Java and Kotlin web framework. Create REST APIs in Java or Kotlin easily. +url: "https://javalin.io" baseurl: "" # the subpath of your site, e.g. /blog +defaults: + - scope: + path: "_posts/news/pre-3.0" + values: + noindex: true + sitemap: false + - scope: + path: "_posts/news/pre-4.0" + values: + noindex: true + sitemap: false + - scope: + path: "_posts/news/pre-5.0" + values: + noindex: true + sitemap: false + - scope: + path: "_posts/news/pre-6.0" + values: + noindex: true + sitemap: false + # Build settings markdown: kramdown sass: diff --git a/_includes/jsonld.html b/_includes/jsonld.html new file mode 100644 index 0000000..2f6e96c --- /dev/null +++ b/_includes/jsonld.html @@ -0,0 +1,91 @@ +{% if page.splash %} + +{% elsif page.title %} +{% capture page_description %}{% if page.description %}{{ page.description }}{% elsif page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}{% endcapture %} +{% capture canonical_url %}{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}{% endcapture %} +{% if page.layout == 'blogpost' or page.layout == 'news' or page.layout == 'tutorial' %} + +{% else %} + +{% endif %} +{% endif %} + + diff --git a/_includes/landing.css b/_includes/landing.css index 87fe993..9833f4d 100644 --- a/_includes/landing.css +++ b/_includes/landing.css @@ -72,7 +72,7 @@ header.top-nav-header nav ul.top-nav li a:hover { } .bluepart.blackpart .multitab-code { - max-width: 590px; + max-width: 640px; } .bluepart .multitab-code { diff --git a/_includes/landing/section-4-server-and-api.html b/_includes/landing/section-4-server-and-api.html index 06f9a1b..2687198 100644 --- a/_includes/landing/section-4-server-and-api.html +++ b/_includes/landing/section-4-server-and-api.html @@ -10,7 +10,7 @@ config.http.asyncTimeout = 10_000L; config.staticFiles.add("/public"); config.staticFiles.enableWebjars(); - config.router.apiBuilder(() -> { + config.routes.apiBuilder(() -> { path("/users", () -> { get(UserController::getAll); post(UserController::create); @@ -35,7 +35,7 @@ config.http.asyncTimeout = 10_000L config.staticFiles.add("/public") config.staticFiles.enableWebjars() - config.router.apiBuilder { + config.routes.apiBuilder { path("/users") { get(UserController::getAll) post(UserController::create) diff --git a/_includes/landing/section-5-community.html b/_includes/landing/section-5-community.html index fc0869d..3193c07 100644 --- a/_includes/landing/section-5-community.html +++ b/_includes/landing/section-5-community.html @@ -5,7 +5,7 @@
-As of November 2025
+As of February 2026
diff --git a/_includes/macros/gettingStarted.md b/_includes/macros/gettingStarted.md index b81d035..1d55d02 100644 --- a/_includes/macros/gettingStarted.md +++ b/_includes/macros/gettingStarted.md @@ -2,9 +2,9 @@ import io.javalin.Javalin; void main() { - var app = Javalin.create(/*config*/) - .get("/", ctx -> ctx.result("Hello World")) - .start(7070); + var app = Javalin.create(config -> { + config.routes.get("/", ctx -> ctx.result("Hello World")); + }).start(7070); } {% endcapture %} @@ -12,9 +12,9 @@ void main() { import io.javalin.Javalin fun main() { - val app = Javalin.create(/*config*/) - .get("/") { ctx -> ctx.result("Hello World") } - .start(7070) + val app = Javalin.create { config -> + config.routes.get("/") { ctx -> ctx.result("Hello World") } + }.start(7070) } {% endcapture %} {% include macros/docsSnippet.html java=java kotlin=kotlin %} diff --git a/_includes/macros/gettingStarted6.md b/_includes/macros/gettingStarted6.md new file mode 100644 index 0000000..14267a1 --- /dev/null +++ b/_includes/macros/gettingStarted6.md @@ -0,0 +1,19 @@ +{% capture java %} +import io.javalin.Javalin; + +public static void main(String[] args) { + var app = Javalin.create().start(7070); + app.get("/", ctx -> ctx.result("Hello World")); +} +{% endcapture %} + +{% capture kotlin %} +import io.javalin.Javalin + +fun main() { + val app = Javalin.create().start(7070) + app.get("/") { ctx -> ctx.result("Hello World") } +} +{% endcapture %} +{% include macros/docsSnippet.html java=java kotlin=kotlin %} + diff --git a/_includes/macros/gettingStarted7.md b/_includes/macros/gettingStarted7.md deleted file mode 100644 index fdcdf07..0000000 --- a/_includes/macros/gettingStarted7.md +++ /dev/null @@ -1,21 +0,0 @@ -{% capture java %} -import io.javalin.Javalin; - -void main() { - var app = Javalin.create(config -> { - config.routes.get("/", ctx -> ctx.result("Hello World")); - }).start(7070); -} -{% endcapture %} - -{% capture kotlin %} -import io.javalin.Javalin - -fun main() { - val app = Javalin.create { config -> - config.routes.get("/") { ctx -> ctx.result("Hello World") } - }.start(7070) -} -{% endcapture %} -{% include macros/docsSnippet.html java=java kotlin=kotlin %} - diff --git a/_includes/notificationBanner.html b/_includes/notificationBanner.html index 015da31..6fe6fad 100644 --- a/_includes/notificationBanner.html +++ b/_includes/notificationBanner.html @@ -1,24 +1,26 @@ diff --git a/_layouts/default.html b/_layouts/default.html index 772a2bc..11a4b59 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -5,20 +5,28 @@ - - + + + + + + + + {% if page.noindex %}{% endif %}