From e45e4c755b59b7f1b918c2065b5d7eabbf0feec4 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 17 Sep 2021 11:21:05 +0200
Subject: [PATCH 01/17] Maven setup

Currently not building anything just setting up the build and Github
action
Using the target platform during the Maven build and build the css
plug-in
---
 .github/workflows/maven.yml |  23 ++++++++
 .mvn/extensions.xml         |   8 +++
 pom.xml                     | 106 ++++++++++++++++++++++++++++++++++++
 3 files changed, 137 insertions(+)
 create mode 100644 .github/workflows/maven.yml
 create mode 100644 .mvn/extensions.xml
 create mode 100644 pom.xml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 00000000..0496c948
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,23 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Java CI with Maven
+on: 
+  push:
+    branches-ignore:
+     - documentation
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '11'
+    - name: Build with Maven
+      run: mvn clean verify
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 00000000..cfc4f26b
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+  <extension>
+    <groupId>org.eclipse.tycho.extras</groupId>
+    <artifactId>tycho-pomless</artifactId>
+    <version>2.4.0</version>
+  </extension>
+</extensions>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..de6ff2d9
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,106 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>eclipse.asciidoctor.editor</groupId>
+  <artifactId>releng</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>tycho-snapshots</id>
+      <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <properties>
+    <tycho.version>2.5.0-SNAPSHOT</tycho.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+
+  <build>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-p2-director-plugin</artifactId>
+          <version>${tycho.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-maven-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <extensions>true</extensions>
+      </plugin>
+      <!--Enable the replacement of the SNAPSHOT version in the final product configuration-->
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-packaging-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <id>package-feature</id>
+            <configuration>
+              <finalName>${project.artifactId}_${unqualifiedVersion}.${buildQualifier}</finalName>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+           <target>
+            <file>../asciidoctor-editor-target/asciidoctor-editor.target</file>
+         </target>
+          <resolveWithExecutionEnvironmentConstraints>false</resolveWithExecutionEnvironmentConstraints>
+
+          <environments>
+            <environment>
+              <os>linux</os>
+              <ws>gtk</ws>
+              <arch>x86_64</arch>
+            </environment>
+            <environment>
+              <os>win32</os>
+              <ws>win32</ws>
+              <arch>x86_64</arch>
+            </environment>
+            <environment>
+              <os>macosx</os>
+              <ws>cocoa</ws>
+              <arch>x86_64</arch>
+            </environment>
+          </environments>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+
+  <modules>
+      <module>asciidoctor-editor-css</module>
+    
+      <!--
+  <module>asciidoctor-editor-doc</module>
+      <module>asciidoctor-editor-plugin</module>
+      <module>asciidoctor-converter-plugin</module>
+      <module>asciidoctor-converter-feature</module>
+      <module>asciidoctor-editor-feature</module>
+      <module>asciidoctor-editor-libs</module>
+      <module>asciidoctor-editor-other</module>
+# wxrwxr-x  2 vogella vogella  4096 Sep 17 10:34 asciidoctor-editor-gradle-dep
+drwxrwxr-x  3 vogella vogella  4096 Sep 17 10:34 asciidoctor-editor-updatesite
+drwxrwxr-x  3 vogella vogella  4096 Sep 17 10:34 asciidoctor-testproject-imagedirset
+drwxrwxr-x  3 vogella vogella  4096 Sep 17 10:34 asciidoctor-testproject-noimagedirset
+      -->
+
+  </modules>
+</project>
\ No newline at end of file

From 9d63adef76f86288f9cc1b399fa53ad6caa0112c Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 28 Sep 2021 09:55:04 +0200
Subject: [PATCH 02/17] Updating the releng pom version

No functional impact but suggested by @de-jcup


For #371
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index de6ff2d9..27acf9d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eclipse.asciidoctor.editor</groupId>
   <artifactId>releng</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <pluginRepositories>

From 61d4a57e6361caf372cae9bdb4f2d4c57436cf10 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Tue, 28 Sep 2021 10:13:33 +0200
Subject: [PATCH 03/17] Remove minimum version from asciidoctor-editor-plugin

Search and refactoring were the only plug-ins defining a minimum version
and this version did not fit to the target platform. By removing the
version we enable the plug-in to resolve them with the giving target
platform.
---
 asciidoctor-editor-plugin/META-INF/MANIFEST.MF | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
index a92d272a..9a8ca1f5 100644
--- a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
+++ b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
@@ -19,9 +19,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.console,
  de.jcup.asciidoctoreditor.libs,
  de.jcup.asciidoctoreditor.css,
- org.eclipse.search;bundle-version="3.11.400",
+ org.eclipse.search,
  org.eclipse.ltk.ui.refactoring,
- org.eclipse.ltk.core.refactoring;bundle-version="3.9.200"
+ org.eclipse.ltk.core.refactoring
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.ui,

From ea7c5a83b7a6f63ac54647d64818e6fd4fe5d333 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Thu, 20 Jan 2022 10:26:48 +0100
Subject: [PATCH 04/17] Build with release Tycho version

---
 pom.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 27acf9d1..71992ac8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,19 +5,11 @@
   <version>2.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <pluginRepositories>
-    <pluginRepository>
-      <id>tycho-snapshots</id>
-      <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
-    </pluginRepository>
-  </pluginRepositories>
-
   <properties>
-    <tycho.version>2.5.0-SNAPSHOT</tycho.version>
+    <tycho.version>2.5.0</tycho.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-
   <build>
 
     <pluginManagement>

From a13d8033215799ab24d91b1b869aed1da36b61d8 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 21 Jan 2022 10:07:46 +0100
Subject: [PATCH 05/17] Build against 2021-12 Eclipse release

This should help with solving the strange version range issue.
---
 asciidoctor-editor-target/asciidoctor-editor.target | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/asciidoctor-editor-target/asciidoctor-editor.target b/asciidoctor-editor-target/asciidoctor-editor.target
index eaac4181..bd2c7533 100644
--- a/asciidoctor-editor-target/asciidoctor-editor.target
+++ b/asciidoctor-editor-target/asciidoctor-editor.target
@@ -2,7 +2,7 @@
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/releases/photon/201806271001/"/>
+			<repository location="https://download.eclipse.org/releases/2021-12/"/>
 		</location>
 	</locations>
 </target>
\ No newline at end of file

From 6764ef215641fd8dbe36c85c4372b5be5741d866 Mon Sep 17 00:00:00 2001
From: de-jcup <albert.tregnaghi@gmail.com>
Date: Fri, 4 Feb 2022 22:32:13 +0100
Subject: [PATCH 06/17] Added maven dependencies #371

- added commons-io 2.7 (originally used io 2.6 but had a vulnerability
  so used 2.7 now to too many issues with upgrade at the moment
- added eclipse-commons 1.0.0 dependency
- added asciidoctor j launcher dependency
---
 .../asciidoctor-editor.target                 | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/asciidoctor-editor-target/asciidoctor-editor.target b/asciidoctor-editor-target/asciidoctor-editor.target
index bd2c7533..048a4cfe 100644
--- a/asciidoctor-editor-target/asciidoctor-editor.target
+++ b/asciidoctor-editor-target/asciidoctor-editor.target
@@ -1,8 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="asciidoctor-editor">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="asciidoctor-editor">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/releases/2021-12/"/>
 		</location>
+		
+		<location includeDependencyDepth="infinite" includeDependencyScope="compile" includeSource="true" label="asp launcher" missingManifest="generate" type="Maven">
+			<dependencies>
+				<!-- https://mvnrepository.com/artifact/de.jcup.asp/asp-server-asciidoctorj-launcher -->
+				<dependency>
+					<groupId>de.jcup.asp</groupId>
+					<artifactId>asp-server-asciidoctorj-launcher</artifactId>
+					<version>1.3.1</version>
+				</dependency>
+				<!-- https://mvnrepository.com/artifact/de.jcup.eclipse.commons/eclipse-commons -->
+				<dependency>
+					<groupId>de.jcup.eclipse.commons</groupId>
+					<artifactId>eclipse-commons</artifactId>
+					<version>1.0.0</version>
+				</dependency>
+				<!-- Remark: Original lib depencency was commons-io 2.6.0 which had a vulnerability.
+				     To have at least this fixed and being still compatible 2.7.0 is defined here.
+				     Later there should be the newest library tried out (when all works fine with maven)
+				     -->
+				<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+				<dependency>
+					<groupId>commons-io</groupId>
+					<artifactId>commons-io</artifactId>
+					<version>2.7</version>
+				</dependency>
+
+			</dependencies>
+
+		</location>
 	</locations>
 </target>
\ No newline at end of file

From 8a70eae5750a1c66da4f9ab0411add3ee455ecdc Mon Sep 17 00:00:00 2001
From: de-jcup <albert.tregnaghi@gmail.com>
Date: Fri, 4 Feb 2022 22:37:42 +0100
Subject: [PATCH 07/17] Added target to .gitignore for css plugin #371

---
 asciidoctor-editor-css/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/asciidoctor-editor-css/.gitignore b/asciidoctor-editor-css/.gitignore
index b68da18e..1d12b437 100644
--- a/asciidoctor-editor-css/.gitignore
+++ b/asciidoctor-editor-css/.gitignore
@@ -1,3 +1,4 @@
+target
 !.metadata
 !.classpath
 !.project

From 7853cbfb6baa425e7b39b271ee3395e1cefa9753 Mon Sep 17 00:00:00 2001
From: de-jcup <albert.tregnaghi@gmail.com>
Date: Fri, 4 Feb 2022 23:02:54 +0100
Subject: [PATCH 08/17] Added asp-server-asciidoctorj dependencies + lib
 dependencies #371

- unfortunately the runtime dependencies (asciidoctorj for example)
  seems to be not resolved by asciidoctor-editor-target
---
 asciidoctor-editor-libs/META-INF/MANIFEST.MF  |  1 +
 asciidoctor-editor-plugin/.classpath          |  2 --
 .../META-INF/MANIFEST.MF                      | 12 +++++---
 asciidoctor-editor-plugin/build.properties    |  4 +--
 .../asciidoctor-editor.target                 | 29 ++++++++++---------
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/asciidoctor-editor-libs/META-INF/MANIFEST.MF b/asciidoctor-editor-libs/META-INF/MANIFEST.MF
index 9cf7a2ab..ab439731 100644
--- a/asciidoctor-editor-libs/META-INF/MANIFEST.MF
+++ b/asciidoctor-editor-libs/META-INF/MANIFEST.MF
@@ -6,3 +6,4 @@ Bundle-Version: 2.3.0
 Bundle-Vendor: Albert Tregnaghi
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: de.jcup.asciidoctoreditor.libs
+Require-Bundle: wrapped.de.jcup.asp.asp-server-asciidoctorj;bundle-version="1.3.1"
diff --git a/asciidoctor-editor-plugin/.classpath b/asciidoctor-editor-plugin/.classpath
index 7ec5ff16..aa6b5fd5 100644
--- a/asciidoctor-editor-plugin/.classpath
+++ b/asciidoctor-editor-plugin/.classpath
@@ -6,8 +6,6 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry exported="true" kind="lib" path="lib/asp-server-asciidoctorj-launcher-dist.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.6.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
diff --git a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
index 9a8ca1f5..aa4fa934 100644
--- a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
+++ b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
@@ -21,14 +21,18 @@ Require-Bundle: org.eclipse.ui,
  de.jcup.asciidoctoreditor.css,
  org.eclipse.search,
  org.eclipse.ltk.ui.refactoring,
- org.eclipse.ltk.core.refactoring
+ org.eclipse.ltk.core.refactoring,
+ wrapped.de.jcup.asp.asp-server-asciidoctorj-launcher;bundle-version="1.3.1",
+ eclipse-commons;bundle-version="1.0.0",
+ org.apache.commons.commons-io;bundle-version="2.7.0",
+ wrapped.de.jcup.asp.asp-core;bundle-version="1.3.1",
+ wrapped.de.jcup.asp.asp-client-java;bundle-version="1.3.1",
+ wrapped.de.jcup.asp.asp-api;bundle-version="1.3.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.ui,
  org.eclipse.ui.texteditor.spelling,
  org.eclipse.ui.texteditor.templates
 Bundle-ClassPath: .,
- lib/de-jcup-eclipse-commons.jar,
- lib/commons-io-2.6.jar,
- lib/asp-server-asciidoctorj-launcher-dist.jar
+ lib/de-jcup-eclipse-commons.jar
 Automatic-Module-Name: de.jcup.asciidoctoreditor
diff --git a/asciidoctor-editor-plugin/build.properties b/asciidoctor-editor-plugin/build.properties
index 77a55e73..fb375621 100644
--- a/asciidoctor-editor-plugin/build.properties
+++ b/asciidoctor-editor-plugin/build.properties
@@ -12,9 +12,7 @@ bin.includes = META-INF/,\
                tooltips/,\
                addons/,\
                css/,\
-               lib/de-jcup-eclipse-commons.jar,\
-               lib/commons-io-2.6.jar,\
-               lib/asp-server-asciidoctorj-launcher-dist.jar
+               lib/de-jcup-eclipse-commons.jar
 src.excludes = src/test/java-eclipse/,\
                src/test/java/,\
                src/test/resources/
diff --git a/asciidoctor-editor-target/asciidoctor-editor.target b/asciidoctor-editor-target/asciidoctor-editor.target
index 048a4cfe..47162500 100644
--- a/asciidoctor-editor-target/asciidoctor-editor.target
+++ b/asciidoctor-editor-target/asciidoctor-editor.target
@@ -6,34 +6,37 @@
 			<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/releases/2021-12/"/>
 		</location>
-		
 		<location includeDependencyDepth="infinite" includeDependencyScope="compile" includeSource="true" label="asp launcher" missingManifest="generate" type="Maven">
 			<dependencies>
-				<!-- https://mvnrepository.com/artifact/de.jcup.asp/asp-server-asciidoctorj-launcher -->
+				<dependency>
+					<groupId>commons-io</groupId>
+					<artifactId>commons-io</artifactId>
+					<version>2.7</version>
+					<type>jar</type>
+				</dependency>
 				<dependency>
 					<groupId>de.jcup.asp</groupId>
 					<artifactId>asp-server-asciidoctorj-launcher</artifactId>
 					<version>1.3.1</version>
+					<type>jar</type>
 				</dependency>
-				<!-- https://mvnrepository.com/artifact/de.jcup.eclipse.commons/eclipse-commons -->
 				<dependency>
 					<groupId>de.jcup.eclipse.commons</groupId>
 					<artifactId>eclipse-commons</artifactId>
 					<version>1.0.0</version>
+					<type>jar</type>
 				</dependency>
-				<!-- Remark: Original lib depencency was commons-io 2.6.0 which had a vulnerability.
-				     To have at least this fixed and being still compatible 2.7.0 is defined here.
-				     Later there should be the newest library tried out (when all works fine with maven)
-				     -->
-				<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+			</dependencies>
+		</location>
+		<location includeDependencyDepth="infinite" includeSource="true" missingManifest="generate" type="Maven">
+			<dependencies>
 				<dependency>
-					<groupId>commons-io</groupId>
-					<artifactId>commons-io</artifactId>
-					<version>2.7</version>
+					<groupId>de.jcup.asp</groupId>
+					<artifactId>asp-server-asciidoctorj</artifactId>
+					<version>1.3.1</version>
+					<type>jar</type>
 				</dependency>
-
 			</dependencies>
-
 		</location>
 	</locations>
 </target>
\ No newline at end of file

From 5f109d971fb39278e0febefe97903460b7ce7341 Mon Sep 17 00:00:00 2001
From: de-jcup <albert.tregnaghi@gmail.com>
Date: Fri, 25 Mar 2022 10:46:42 +0100
Subject: [PATCH 09/17] changes on build ... #371

---
 asciidoctor-editor-plugin/.classpath                | 1 -
 asciidoctor-editor-plugin/META-INF/MANIFEST.MF      | 8 +++-----
 asciidoctor-editor-plugin/build.properties          | 3 +--
 asciidoctor-editor-target/asciidoctor-editor.target | 4 ++--
 pom.xml                                             | 1 +
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/asciidoctor-editor-plugin/.classpath b/asciidoctor-editor-plugin/.classpath
index aa6b5fd5..6b2f8275 100644
--- a/asciidoctor-editor-plugin/.classpath
+++ b/asciidoctor-editor-plugin/.classpath
@@ -9,6 +9,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="lib" path="lib/de-jcup-eclipse-commons.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
index aa4fa934..7fa47998 100644
--- a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
+++ b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
@@ -17,22 +17,20 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.core.expressions,
  org.eclipse.ui.console,
- de.jcup.asciidoctoreditor.libs,
  de.jcup.asciidoctoreditor.css,
  org.eclipse.search,
  org.eclipse.ltk.ui.refactoring,
  org.eclipse.ltk.core.refactoring,
- wrapped.de.jcup.asp.asp-server-asciidoctorj-launcher;bundle-version="1.3.1",
  eclipse-commons;bundle-version="1.0.0",
  org.apache.commons.commons-io;bundle-version="2.7.0",
  wrapped.de.jcup.asp.asp-core;bundle-version="1.3.1",
  wrapped.de.jcup.asp.asp-client-java;bundle-version="1.3.1",
- wrapped.de.jcup.asp.asp-api;bundle-version="1.3.1"
+ wrapped.de.jcup.asp.asp-api;bundle-version="1.3.1",
+ wrapped.de.jcup.asp.asp-server-asciidoctorj-launcher;bundle-version="1.4.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.ui,
  org.eclipse.ui.texteditor.spelling,
  org.eclipse.ui.texteditor.templates
-Bundle-ClassPath: .,
- lib/de-jcup-eclipse-commons.jar
+Bundle-ClassPath: .
 Automatic-Module-Name: de.jcup.asciidoctoreditor
diff --git a/asciidoctor-editor-plugin/build.properties b/asciidoctor-editor-plugin/build.properties
index fb375621..7b5847a4 100644
--- a/asciidoctor-editor-plugin/build.properties
+++ b/asciidoctor-editor-plugin/build.properties
@@ -11,8 +11,7 @@ bin.includes = META-INF/,\
                toc.xml,\
                tooltips/,\
                addons/,\
-               css/,\
-               lib/de-jcup-eclipse-commons.jar
+               css/
 src.excludes = src/test/java-eclipse/,\
                src/test/java/,\
                src/test/resources/
diff --git a/asciidoctor-editor-target/asciidoctor-editor.target b/asciidoctor-editor-target/asciidoctor-editor.target
index 47162500..e3ec43fc 100644
--- a/asciidoctor-editor-target/asciidoctor-editor.target
+++ b/asciidoctor-editor-target/asciidoctor-editor.target
@@ -17,7 +17,7 @@
 				<dependency>
 					<groupId>de.jcup.asp</groupId>
 					<artifactId>asp-server-asciidoctorj-launcher</artifactId>
-					<version>1.3.1</version>
+					<version>1.4.0</version>
 					<type>jar</type>
 				</dependency>
 				<dependency>
@@ -33,7 +33,7 @@
 				<dependency>
 					<groupId>de.jcup.asp</groupId>
 					<artifactId>asp-server-asciidoctorj</artifactId>
-					<version>1.3.1</version>
+					<version>1.4.0</version>
 					<type>jar</type>
 				</dependency>
 			</dependencies>
diff --git a/pom.xml b/pom.xml
index 71992ac8..ca0a2602 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
 
   <modules>
       <module>asciidoctor-editor-css</module>
+      <module>asciidoctor-editor-plugin</module>
     
       <!--
   <module>asciidoctor-editor-doc</module>

From 3924891ca20308de0cde44f8a7ad7638e158dd8f Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 25 Mar 2022 10:57:12 +0100
Subject: [PATCH 10/17] Deletes unnecessary libs project

---
 asciidoctor-editor-libs/.classpath            |  6 ----
 asciidoctor-editor-libs/.gitignore            |  6 ----
 asciidoctor-editor-libs/.project              | 28 -------------------
 .../org.eclipse.core.resources.prefs          |  2 --
 .../.settings/org.eclipse.jdt.core.prefs      |  7 -----
 asciidoctor-editor-libs/META-INF/MANIFEST.MF  |  9 ------
 asciidoctor-editor-libs/build.properties      |  3 --
 asciidoctor-editor-libs/libs/.gitignore       |  1 -
 asciidoctor-editor-libs/libs/README.md        |  4 ---
 9 files changed, 66 deletions(-)
 delete mode 100644 asciidoctor-editor-libs/.classpath
 delete mode 100644 asciidoctor-editor-libs/.gitignore
 delete mode 100644 asciidoctor-editor-libs/.project
 delete mode 100644 asciidoctor-editor-libs/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 asciidoctor-editor-libs/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 asciidoctor-editor-libs/META-INF/MANIFEST.MF
 delete mode 100644 asciidoctor-editor-libs/build.properties
 delete mode 100644 asciidoctor-editor-libs/libs/.gitignore
 delete mode 100644 asciidoctor-editor-libs/libs/README.md

diff --git a/asciidoctor-editor-libs/.classpath b/asciidoctor-editor-libs/.classpath
deleted file mode 100644
index 075009d7..00000000
--- a/asciidoctor-editor-libs/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/asciidoctor-editor-libs/.gitignore b/asciidoctor-editor-libs/.gitignore
deleted file mode 100644
index b68da18e..00000000
--- a/asciidoctor-editor-libs/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-!.metadata
-!.classpath
-!.project
-!.settings/
-!*.jar
-!lib/*.jar
diff --git a/asciidoctor-editor-libs/.project b/asciidoctor-editor-libs/.project
deleted file mode 100644
index 2ba8fb98..00000000
--- a/asciidoctor-editor-libs/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>asciidoctor-editor-libs</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/asciidoctor-editor-libs/.settings/org.eclipse.core.resources.prefs b/asciidoctor-editor-libs/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4824b802..00000000
--- a/asciidoctor-editor-libs/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/asciidoctor-editor-libs/.settings/org.eclipse.jdt.core.prefs b/asciidoctor-editor-libs/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61d..00000000
--- a/asciidoctor-editor-libs/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/asciidoctor-editor-libs/META-INF/MANIFEST.MF b/asciidoctor-editor-libs/META-INF/MANIFEST.MF
deleted file mode 100644
index ab439731..00000000
--- a/asciidoctor-editor-libs/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Asciidoctor editor library plugin
-Bundle-SymbolicName: de.jcup.asciidoctoreditor.libs
-Bundle-Version: 2.3.0
-Bundle-Vendor: Albert Tregnaghi
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Automatic-Module-Name: de.jcup.asciidoctoreditor.libs
-Require-Bundle: wrapped.de.jcup.asp.asp-server-asciidoctorj;bundle-version="1.3.1"
diff --git a/asciidoctor-editor-libs/build.properties b/asciidoctor-editor-libs/build.properties
deleted file mode 100644
index 39851a25..00000000
--- a/asciidoctor-editor-libs/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-bin.includes = .,\
-               META-INF/,\
-               libs/asp-server-asciidoctorj-dist.jar
diff --git a/asciidoctor-editor-libs/libs/.gitignore b/asciidoctor-editor-libs/libs/.gitignore
deleted file mode 100644
index f23b9489..00000000
--- a/asciidoctor-editor-libs/libs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
\ No newline at end of file
diff --git a/asciidoctor-editor-libs/libs/README.md b/asciidoctor-editor-libs/libs/README.md
deleted file mode 100644
index 7e229333..00000000
--- a/asciidoctor-editor-libs/libs/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-This folder will be automatically filled by call of `gradlew installLibraries` task.
-
-libs here will most time have no version number - reason: easier to maintain eclipse builds (no changes in build.properties and more...)
-For version info of lib, refer to `META-INF` inside.
\ No newline at end of file

From 6b2e483ac90e79dd1ade0b05f166177b88de588d Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 25 Mar 2022 11:29:03 +0100
Subject: [PATCH 11/17] Update of the target platform

Also removes commented reference to libs project.

For #371

Requires https://github.com/de-jcup/eclipse-commons/pull/39
---
 asciidoctor-editor-target/asciidoctor-editor.target | 12 +++++++++++-
 pom.xml                                             |  1 -
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/asciidoctor-editor-target/asciidoctor-editor.target b/asciidoctor-editor-target/asciidoctor-editor.target
index e3ec43fc..062813db 100644
--- a/asciidoctor-editor-target/asciidoctor-editor.target
+++ b/asciidoctor-editor-target/asciidoctor-editor.target
@@ -3,9 +3,19 @@
 <target name="asciidoctor-editor">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-			<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+			<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+			<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/releases/2021-12/"/>
 		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/releases/latest"/>
+			<unit id="org.junit.jupiter.api" version="0.0.0"/>
+			<unit id="org.junit.jupiter.engine" version="0.0.0"/>
+			<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
+			<unit id="org.junit" version="0.0.0"/>
+			<unit id="org.hamcrest.core" version="0.0.0"/>
+		</location>
 		<location includeDependencyDepth="infinite" includeDependencyScope="compile" includeSource="true" label="asp launcher" missingManifest="generate" type="Maven">
 			<dependencies>
 				<dependency>
diff --git a/pom.xml b/pom.xml
index ca0a2602..d8733322 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,6 @@
       <module>asciidoctor-converter-plugin</module>
       <module>asciidoctor-converter-feature</module>
       <module>asciidoctor-editor-feature</module>
-      <module>asciidoctor-editor-libs</module>
       <module>asciidoctor-editor-other</module>
 # wxrwxr-x  2 vogella vogella  4096 Sep 17 10:34 asciidoctor-editor-gradle-dep
 drwxrwxr-x  3 vogella vogella  4096 Sep 17 10:34 asciidoctor-editor-updatesite

From db961d5d59032ca5eb4d3ad188340ba8aa1d5049 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 25 Mar 2022 12:10:50 +0100
Subject: [PATCH 12/17] Update of commons dependency to 1.1.0

For #371
---
 asciidoctor-editor-target/asciidoctor-editor.target | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/asciidoctor-editor-target/asciidoctor-editor.target b/asciidoctor-editor-target/asciidoctor-editor.target
index 062813db..d3e31ea2 100644
--- a/asciidoctor-editor-target/asciidoctor-editor.target
+++ b/asciidoctor-editor-target/asciidoctor-editor.target
@@ -33,7 +33,7 @@
 				<dependency>
 					<groupId>de.jcup.eclipse.commons</groupId>
 					<artifactId>eclipse-commons</artifactId>
-					<version>1.0.0</version>
+					<version>1.1.0</version>
 					<type>jar</type>
 				</dependency>
 			</dependencies>

From 526e2528090a9c76f86922b41f913a7fd4df66fc Mon Sep 17 00:00:00 2001
From: de-jcup <albert.tregnaghi@gmail.com>
Date: Fri, 25 Mar 2022 18:26:24 +0100
Subject: [PATCH 13/17] Update to eclipse commons 1.1.1 dependency #371

- eclipse commons dependency do now work
- switched also back to asp 1.3.1 because in
  asp 1.4.0 there are breaking changes which must be still
  fixed in master branch and are not necessary to migrate
  from gradle to maven build, so we use here 1.3.1
- added target to .gitignore because we want no build output
  inside git
---
 .gitignore                                          | 1 +
 asciidoctor-editor-plugin/META-INF/MANIFEST.MF      | 2 +-
 asciidoctor-editor-target/asciidoctor-editor.target | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ef2a0751..74b80f22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .metadata
 .lck
 .gradle/
+target/
 .classpath
 .project
 .settings/
diff --git a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
index 7fa47998..8e269c74 100644
--- a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
+++ b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.ui,
  wrapped.de.jcup.asp.asp-core;bundle-version="1.3.1",
  wrapped.de.jcup.asp.asp-client-java;bundle-version="1.3.1",
  wrapped.de.jcup.asp.asp-api;bundle-version="1.3.1",
- wrapped.de.jcup.asp.asp-server-asciidoctorj-launcher;bundle-version="1.4.0"
+ wrapped.de.jcup.asp.asp-server-asciidoctorj-launcher;bundle-version="1.3.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.ui,
diff --git a/asciidoctor-editor-target/asciidoctor-editor.target b/asciidoctor-editor-target/asciidoctor-editor.target
index d3e31ea2..a5750e7d 100644
--- a/asciidoctor-editor-target/asciidoctor-editor.target
+++ b/asciidoctor-editor-target/asciidoctor-editor.target
@@ -27,13 +27,13 @@
 				<dependency>
 					<groupId>de.jcup.asp</groupId>
 					<artifactId>asp-server-asciidoctorj-launcher</artifactId>
-					<version>1.4.0</version>
+					<version>1.3.1</version>
 					<type>jar</type>
 				</dependency>
 				<dependency>
 					<groupId>de.jcup.eclipse.commons</groupId>
 					<artifactId>eclipse-commons</artifactId>
-					<version>1.1.0</version>
+					<version>1.1.1</version>
 					<type>jar</type>
 				</dependency>
 			</dependencies>
@@ -43,7 +43,7 @@
 				<dependency>
 					<groupId>de.jcup.asp</groupId>
 					<artifactId>asp-server-asciidoctorj</artifactId>
-					<version>1.4.0</version>
+					<version>1.3.1</version>
 					<type>jar</type>
 				</dependency>
 			</dependencies>

From 1c25da99c4c674915db4b8ccd8ac8d3dc0b5dd6c Mon Sep 17 00:00:00 2001
From: de-jcup <albert.tregnaghi@gmail.com>
Date: Mon, 4 Apr 2022 00:13:57 +0200
Subject: [PATCH 14/17] Fixing build by using asp 1.3.2 #371

- using now asp 1.3.2 which provides used asciidoctorj api version
  as a compile dependency
- added the asciidoctor api dependency to MANIFEST.MF as well
---
 asciidoctor-editor-plugin/META-INF/MANIFEST.MF      | 9 +++++----
 asciidoctor-editor-target/asciidoctor-editor.target | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
index 8e269c74..31e6286a 100644
--- a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
+++ b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
@@ -23,10 +23,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ltk.core.refactoring,
  eclipse-commons;bundle-version="1.0.0",
  org.apache.commons.commons-io;bundle-version="2.7.0",
- wrapped.de.jcup.asp.asp-core;bundle-version="1.3.1",
- wrapped.de.jcup.asp.asp-client-java;bundle-version="1.3.1",
- wrapped.de.jcup.asp.asp-api;bundle-version="1.3.1",
- wrapped.de.jcup.asp.asp-server-asciidoctorj-launcher;bundle-version="1.3.1"
+ wrapped.de.jcup.asp.asp-core;bundle-version="1.3.2",
+ wrapped.de.jcup.asp.asp-client-java;bundle-version="1.3.2",
+ wrapped.de.jcup.asp.asp-api;bundle-version="1.3.2",
+ wrapped.de.jcup.asp.asp-server-asciidoctorj-launcher;bundle-version="1.3.2",
+ org.asciidoctor.asciidoctorj-api;bundle-version="2.5.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.ui,
diff --git a/asciidoctor-editor-target/asciidoctor-editor.target b/asciidoctor-editor-target/asciidoctor-editor.target
index a5750e7d..69407eb8 100644
--- a/asciidoctor-editor-target/asciidoctor-editor.target
+++ b/asciidoctor-editor-target/asciidoctor-editor.target
@@ -27,7 +27,7 @@
 				<dependency>
 					<groupId>de.jcup.asp</groupId>
 					<artifactId>asp-server-asciidoctorj-launcher</artifactId>
-					<version>1.3.1</version>
+					<version>1.3.2</version>
 					<type>jar</type>
 				</dependency>
 				<dependency>
@@ -43,7 +43,7 @@
 				<dependency>
 					<groupId>de.jcup.asp</groupId>
 					<artifactId>asp-server-asciidoctorj</artifactId>
-					<version>1.3.1</version>
+					<version>1.3.2</version>
 					<type>jar</type>
 				</dependency>
 			</dependencies>

From cf0e7ba67e1c58dd92a366a1f2d0b5cd5bfb5820 Mon Sep 17 00:00:00 2001
From: de-jcup <albert.tregnaghi@gmail.com>
Date: Fri, 6 May 2022 12:05:29 +0200
Subject: [PATCH 15/17] Changed maven tycho build, so lib dependencies are in
 update site #371

- with "mvn clean verify" the update site will be now build
  completely automatically and contains the libraries inside, so
  no longer a need for a big dist jar!
- currently the library jars which do not include a OSGI manifest
  information are handled as "wrapped..." dependencies
---
 asciidoctor-editor-feature/feature.xml        | 10 +---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../asciidoctor-editor.target                 | 47 +++++++++++++++----
 asciidoctor-editor-updatesite/category.xml    | 13 +++++
 asciidoctor-editor-updatesite/site.xml        | 28 -----------
 pom.xml                                       |  9 ++--
 6 files changed, 59 insertions(+), 50 deletions(-)
 create mode 100644 asciidoctor-editor-updatesite/category.xml
 delete mode 100644 asciidoctor-editor-updatesite/site.xml

diff --git a/asciidoctor-editor-feature/feature.xml b/asciidoctor-editor-feature/feature.xml
index 9d08b5df..0d2276f4 100644
--- a/asciidoctor-editor-feature/feature.xml
+++ b/asciidoctor-editor-feature/feature.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="de.jcup.asciidoctoreditor"
+      id="de.jcup.asciidoctoreditor.feature"
       label="Asciidoctor Editor"
-      version="2.5.0"
+      version="2.6.0"
       provider-name="Albert Tregnaghi">
 
    <description url="https://marketplace.eclipse.org/content/asciidoctor-editor">
@@ -240,12 +240,6 @@ and limitations under the License.
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="de.jcup.asciidoctoreditor.libs"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="de.jcup.asciidoctoreditor.css"
          download-size="0"
diff --git a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
index 31e6286a..865490fb 100644
--- a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
+++ b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Asciidoctor Editor
 Bundle-SymbolicName: de.jcup.asciidoctoreditor;singleton:=true
-Bundle-Version: 2.5.0
+Bundle-Version: 2.6.0
 Bundle-Activator: de.jcup.asciidoctoreditor.AsciiDoctorEditorActivator
 Bundle-Vendor: Albert Tregnaghi
 Require-Bundle: org.eclipse.ui,
diff --git a/asciidoctor-editor-target/asciidoctor-editor.target b/asciidoctor-editor-target/asciidoctor-editor.target
index 69407eb8..7a02bbea 100644
--- a/asciidoctor-editor-target/asciidoctor-editor.target
+++ b/asciidoctor-editor-target/asciidoctor-editor.target
@@ -3,20 +3,34 @@
 <target name="asciidoctor-editor">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-			<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-			<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/releases/2021-12/"/>
+			<unit id="org.eclipse.platform.sdk" version="0.0.0" />
+			<unit id="org.eclipse.emf.common.feature.group" version="0.0.0" />
+			<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0" />
+			<repository location="https://download.eclipse.org/releases/2021-12/" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/releases/latest"/>
-			<unit id="org.junit.jupiter.api" version="0.0.0"/>
-			<unit id="org.junit.jupiter.engine" version="0.0.0"/>
-			<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
-			<unit id="org.junit" version="0.0.0"/>
-			<unit id="org.hamcrest.core" version="0.0.0"/>
+			<repository location="https://download.eclipse.org/releases/latest" />
+			<unit id="org.junit.jupiter.api" version="0.0.0" />
+			<unit id="org.junit.jupiter.engine" version="0.0.0" />
+			<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0" />
+			<unit id="org.junit" version="0.0.0" />
+			<unit id="org.hamcrest.core" version="0.0.0" />
 		</location>
 		<location includeDependencyDepth="infinite" includeDependencyScope="compile" includeSource="true" label="asp launcher" missingManifest="generate" type="Maven">
+
+			<feature id="de.jcup.asciidoctoreditor.asplauncher" label="ASP launcher" provider-name="Albert Tregnaghi" version="1.0.0">
+
+
+				<description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+				<copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+				<license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+			</feature>
 			<dependencies>
 				<dependency>
 					<groupId>commons-io</groupId>
@@ -39,6 +53,19 @@
 			</dependencies>
 		</location>
 		<location includeDependencyDepth="infinite" includeSource="true" missingManifest="generate" type="Maven">
+			<feature id="de.jcup.asciidoctoreditor.aspserver" label="ASP server" provider-name="Albert Tregnaghi" version="1.0.0">
+
+
+				<description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+				<copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+				<license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+			</feature>
 			<dependencies>
 				<dependency>
 					<groupId>de.jcup.asp</groupId>
diff --git a/asciidoctor-editor-updatesite/category.xml b/asciidoctor-editor-updatesite/category.xml
new file mode 100644
index 00000000..4fc00bd2
--- /dev/null
+++ b/asciidoctor-editor-updatesite/category.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature id="de.jcup.asciidoctoreditor.feature">
+      <category name="de.jcup.asciidoctoreditor"/>
+   </feature>
+   <feature id="de.jcup.asciidoctoreditor.asplauncher">
+      <category name="de.jcup.asciidoctoreditor"/>
+   </feature>
+   <feature id="de.jcup.asciidoctoreditor.aspserver">
+      <category name="de.jcup.asciidoctoreditor"/>
+   </feature>
+   <category-def name="de.jcup.asciidoctoreditor" label="Asciidoctor Editor"/>
+</site>
diff --git a/asciidoctor-editor-updatesite/site.xml b/asciidoctor-editor-updatesite/site.xml
deleted file mode 100644
index da386f00..00000000
--- a/asciidoctor-editor-updatesite/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <description name="Asciidoctor Editor Update Site" url="https://dl.bintray.com/de-jcup/asciidoctoreditor">
-      This update site contains feature and plugins of Asciidoctor Editor
-   </description>
-   <feature url="features/de.jcup.asciidoctor.converter_1.1.0.jar" id="de.jcup.asciidoctor.converter" version="1.1.0">
-      <category name="category.asciidoctoreditor.stable"/>
-   </feature>
-   <feature url="features/de.jcup.asciidoctoreditor_2.3.0.jar" id="de.jcup.asciidoctoreditor" version="2.3.0">
-      <category name="category.asciidoctoreditor.stable"/>
-   </feature>
-   <feature url="features/de.jcup.asciidoctoreditor_2.4.0.jar" id="de.jcup.asciidoctoreditor" version="2.4.0">
-      <category name="category.asciidoctoreditor.stable"/>
-   </feature>
-   <feature url="features/de.jcup.asciidoctoreditor_2.4.1.jar" id="de.jcup.asciidoctoreditor" version="2.4.1">
-      <category name="category.asciidoctoreditor.stable"/>
-   </feature>
-   <category-def name="category.asciidoctoreditor.stable" label="Stable">
-      <description>
-         Contain stable releases
-      </description>
-   </category-def>
-   <category-def name="category.asciidoctoreditor.unstable" label="Unstable">
-      <description>
-         Unstable marked versions
-      </description>
-   </category-def>
-</site>
diff --git a/pom.xml b/pom.xml
index d8733322..97a0725b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <tycho.version>2.5.0</tycho.version>
+    <tycho.version>2.7.2</tycho.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -79,8 +79,11 @@
 
   <modules>
       <module>asciidoctor-editor-css</module>
+      <module>asciidoctor-converter-plugin</module>
       <module>asciidoctor-editor-plugin</module>
-    
+      <module>asciidoctor-editor-feature</module>
+      <module>asciidoctor-editor-updatesite</module>
+
       <!--
   <module>asciidoctor-editor-doc</module>
       <module>asciidoctor-editor-plugin</module>
@@ -95,4 +98,4 @@ drwxrwxr-x  3 vogella vogella  4096 Sep 17 10:34 asciidoctor-testproject-noimage
       -->
 
   </modules>
-</project>
\ No newline at end of file
+</project>

From 4517ae423128079e68bae6fc116623deb2ebb0eb Mon Sep 17 00:00:00 2001
From: de-jcup <albert.tregnaghi@gmail.com>
Date: Sun, 28 Aug 2022 19:19:38 +0200
Subject: [PATCH 16/17] Using now Tycho 2.7.4 #371

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 97a0725b..ed29db8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <tycho.version>2.7.2</tycho.version>
+    <tycho.version>2.7.4</tycho.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 

From 2460e8608a2c043305b2b3bfe66812febb3e4869 Mon Sep 17 00:00:00 2001
From: de-jcup <albert.tregnaghi@gmail.com>
Date: Sun, 28 Aug 2022 19:20:19 +0200
Subject: [PATCH 17/17] Added missing "." for bin.includes #371

- built main plugin did not contain any classes.
  The reason was the missing entry.
---
 asciidoctor-editor-plugin/build.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/asciidoctor-editor-plugin/build.properties b/asciidoctor-editor-plugin/build.properties
index e55507b6..e8691ee6 100644
--- a/asciidoctor-editor-plugin/build.properties
+++ b/asciidoctor-editor-plugin/build.properties
@@ -3,6 +3,7 @@ source.. = src/main/java-eclipse/,\
            src/main/resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               .,\
                plugin.xml,\
                icons/,\
                about.html,\
@@ -11,7 +12,7 @@ bin.includes = META-INF/,\
                toc.xml,\
                tooltips/,\
                addons/,\
-               css/             
+               css/
 src.excludes = src/test/java-eclipse/,\
                src/test/java/,\
                src/test/resources/