diff --git a/.github/workflows/asciidoc.yml b/.github/workflows/ci.yml
similarity index 70%
rename from .github/workflows/asciidoc.yml
rename to .github/workflows/ci.yml
index 0d7e141..92ac85c 100644
--- a/.github/workflows/asciidoc.yml
+++ b/.github/workflows/ci.yml
@@ -5,21 +5,22 @@ on:
- master
jobs:
Test:
- name: Build asciidoc
+ name: Deploy docs zip
strategy:
matrix:
os: [ubuntu-latest]
- jdk: [8]
+ jdk: [11]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install JDK
- uses: joschi/setup-jdk@v2
+ uses: actions/setup-java@v2
with:
- java-version: ${{ matrix.jdk }}
- - name: Render asciidoc
- run: mvn package
+ java-version: 11
+ distribution: temurin
+ - name: Render guide
+ run: mvn compile asciidoctor:process-asciidoc
- name: Publish to GitHub Pages
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
diff --git a/pom.xml b/pom.xml
index 09c0edf..0349c00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,17 +6,15 @@
io.vertx
- vertx-parent
- 14
+ vertx5-parent
+ 4
- com.julienviet
advanced-vertx-guide
1.0-SNAPSHOT
- 4.1.2
- ${project.basedir}/src/main/asciidoc
+ 5.0.0-SNAPSHOT
@@ -38,14 +36,13 @@
io.vertx
- vertx-codegen
- provided
+ vertx-codegen-api
+ true
io.vertx
- vertx-docgen
- provided
- 0.9.2
+ vertx-docgen-api
+ true
io.netty
@@ -55,79 +52,41 @@
+
+
+
+ maven-compiler-plugin
+
+
+ default-compile
+
+
+
+ io.vertx
+ vertx-codegen
+ processor
+
+
+ io.vertx
+ vertx-docgen-processor
+ processor
+
+
+
+
+
+
+
+
- maven-compiler-plugin
-
-
- default-compile
-
-
- io.vertx.docgen.JavaDocGenProcessor
-
-
- -Adocgen.output=${project.build.directory}/asciidoc
- -Adocgen.source=${asciidoc.dir}
-
-
-
-
-
-
- maven-resources-plugin
- 3.1.0
-
-
- copy-resources
- process-classes
-
- copy-resources
-
-
- ${project.build.directory}/asciidoc
-
-
- ${asciidoc.dir}
- false
-
- **/*.adoc
-
-
-
-
-
-
-
-
- org.asciidoctor
- asciidoctor-maven-plugin
- 1.5.7.1
+ maven-assembly-plugin
+ package-docs
- process-asciidoc
+ single
-
- ${project.build.directory}/asciidoc
- ${project.build.directory}/docs/${project.artifactId}
- highlightjs
- true
- index.adoc
- true
- html5
- book
-
- center
- font
- -
- true
- iconic.css
- ${project.basedir}/src/main/stylesheets
-
- tomorrow-night-eighties
-
-
- prepare-package
diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
index d38b652..0ed32c4 100644
--- a/src/main/asciidoc/index.adoc
+++ b/src/main/asciidoc/index.adoc
@@ -1,7 +1,7 @@
= Advanced Vert.x Guide
Julien Viet
-This guide document advanced/internal stuff about Vert.x.
+This guide document advanced/internal stuff about Vert.x (5.0).
It aims to explain and discuss the following
diff --git a/src/main/java/org/vietj/vertx/internals/Internals.java b/src/main/java/org/vietj/vertx/internals/Internals.java
index ffe7ac2..66523a0 100644
--- a/src/main/java/org/vietj/vertx/internals/Internals.java
+++ b/src/main/java/org/vietj/vertx/internals/Internals.java
@@ -15,8 +15,8 @@
import io.vertx.core.Handler;
import io.vertx.core.Promise;
import io.vertx.core.Vertx;
-import io.vertx.core.impl.ContextInternal;
-import io.vertx.core.impl.VertxInternal;
+import io.vertx.core.internal.ContextInternal;
+import io.vertx.core.internal.VertxInternal;
import io.vertx.docgen.Source;
import java.net.SocketAddress;
diff --git a/src/main/java/org/vietj/vertx/memcached/impl/MemcachedClientImpl.java b/src/main/java/org/vietj/vertx/memcached/impl/MemcachedClientImpl.java
index b96188a..79b893b 100644
--- a/src/main/java/org/vietj/vertx/memcached/impl/MemcachedClientImpl.java
+++ b/src/main/java/org/vietj/vertx/memcached/impl/MemcachedClientImpl.java
@@ -5,17 +5,14 @@
import io.netty.channel.ChannelPipeline;
import io.netty.handler.codec.memcache.binary.*;
import io.vertx.codegen.annotations.Nullable;
-import io.vertx.core.AsyncResult;
import io.vertx.core.Future;
-import io.vertx.core.Handler;
import io.vertx.core.Promise;
import io.vertx.core.Vertx;
-import io.vertx.core.impl.ContextInternal;
-import io.vertx.core.impl.VertxInternal;
+import io.vertx.core.internal.VertxInternal;
import io.vertx.core.net.NetClient;
import io.vertx.core.net.NetClientOptions;
import io.vertx.core.net.NetSocket;
-import io.vertx.core.net.impl.NetSocketInternal;
+import io.vertx.core.internal.net.NetSocketInternal;
import org.vietj.vertx.memcached.MemcachedClient;
import org.vietj.vertx.memcached.MemcachedError;
diff --git a/src/main/java/org/vietj/vertx/nettyclient/impl/TimeClientImpl.java b/src/main/java/org/vietj/vertx/nettyclient/impl/TimeClientImpl.java
index d48fd84..f534acc 100644
--- a/src/main/java/org/vietj/vertx/nettyclient/impl/TimeClientImpl.java
+++ b/src/main/java/org/vietj/vertx/nettyclient/impl/TimeClientImpl.java
@@ -12,7 +12,7 @@
import io.vertx.core.Future;
import io.vertx.core.Promise;
import io.vertx.core.Vertx;
-import io.vertx.core.impl.ContextInternal;
+import io.vertx.core.internal.ContextInternal;
import org.vietj.vertx.nettyclient.TimeClient;
public class TimeClientImpl implements TimeClient {
diff --git a/src/main/java/org/vietj/vertx/nettyserver/impl/TimeServerHandler.java b/src/main/java/org/vietj/vertx/nettyserver/impl/TimeServerHandler.java
index 1d3e341..31f4244 100644
--- a/src/main/java/org/vietj/vertx/nettyserver/impl/TimeServerHandler.java
+++ b/src/main/java/org/vietj/vertx/nettyserver/impl/TimeServerHandler.java
@@ -5,10 +5,9 @@
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.vertx.core.Future;
import io.vertx.core.Handler;
import io.vertx.core.Promise;
-import io.vertx.core.impl.ContextInternal;
+import io.vertx.core.internal.ContextInternal;
/**
* @author Julien Viet
diff --git a/src/main/java/org/vietj/vertx/nettyserver/impl/TimeServerImpl.java b/src/main/java/org/vietj/vertx/nettyserver/impl/TimeServerImpl.java
index b59fb6e..4da0d47 100644
--- a/src/main/java/org/vietj/vertx/nettyserver/impl/TimeServerImpl.java
+++ b/src/main/java/org/vietj/vertx/nettyserver/impl/TimeServerImpl.java
@@ -9,13 +9,12 @@
import io.netty.channel.EventLoop;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.vertx.core.AsyncResult;
import io.vertx.core.Future;
import io.vertx.core.Handler;
import io.vertx.core.Promise;
import io.vertx.core.Vertx;
-import io.vertx.core.impl.ContextInternal;
-import io.vertx.core.impl.VertxInternal;
+import io.vertx.core.internal.ContextInternal;
+import io.vertx.core.internal.VertxInternal;
import org.vietj.vertx.nettyserver.TimeServer;
public class TimeServerImpl implements TimeServer {