Feature 371 maven build setup

.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

.gitignore

@@ -1,6 +1,7 @@
 .metadata
 .lck
 .gradle/
+target/
 .classpath
 .project
 .settings/

.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>

asciidoctor-editor-css/.gitignore

@@ -1,3 +1,4 @@
+target
 !.metadata
 !.classpath
 !.project

asciidoctor-editor-doc/src/doc/asciidoc/shared/build-mechanism.adoc

@@ -37,20 +37,4 @@ There exists a gradle task `installLibraries` which copied libraries from `ascii
 So we were able to define library dependencies inside `build.gradle` and to install the into the plugins. 
 
 
-=== Maven Tycho build
-The new build mechanism will be done with `Maven Tycho`.
-see https://github.com/de-jcup/eclipse-asciidoctor-editor/issues/371
-
-It will have many benefits:
-
-- no binary artifacts inside git repository (lib folder) +
-  _(This will be possible by using an eclipse target project, which now can handle maven dependencies to "normal"
-   libraries from maven-central as well!)_
-- no longer a separation of Eclipse and common parts necessary
-- release builds can be full automated
-- ci builds will test eclipse unit tests as well 
-
-[CAUTION]
-====
-Currently the `Maven` build is still under development and not 100% final. See former mentioned GitHub issue for current situation.
-====
+include::build/maven-build.adoc[]

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.7.0"
+      version="2.9.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"

asciidoctor-editor-other/testscripts/diagrams/subfolder/child-from-empty-subfolder/again-empty-subfolder/contentfolder/test.adoc

@@ -0,0 +1,4 @@
+== Test
+
+
+plantuml::../../../../diagram1.plantuml[]

asciidoctor-editor-other/testscripts/diagrams/subfolder/child-from-empty-subfolder/again-empty-subfolder/contentfolder2/test.adoc

@@ -0,0 +1,11 @@
+== Test
+
+
+plantuml::../../../../diagram1.plantuml[]
+
+
+include::../../../child-from-empty-subfolder/again-empty-subfolder/contentfolder/
+
+
+include::../contentfolder/test.adoc[]
+

asciidoctor-editor-other/testscripts/diagrams/subfolder/child-from-empty-subfolder/again-empty-subfolder/contentfolder2/test2.adoc

@@ -0,0 +1,8 @@
+== Test
+
+
+plantuml::../../../../diagram1.plantuml[]
+
+
+include::../../../child-from-empty-subfolder/again-empty-subfolder/contentfolder/
+

asciidoctor-editor-plugin/.classpath

@@ -6,11 +6,8 @@
 	<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"/>
-	<classpathentry kind="lib" path="lib/de-jcup-eclipse-commons.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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.7.0
+Bundle-Version: 2.9.0
 Bundle-Activator: de.jcup.asciidoctoreditor.AsciiDoctorEditorActivator
 Bundle-Vendor: Albert Tregnaghi
 Require-Bundle: org.eclipse.ui,
@@ -17,20 +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;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,
+ 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.4.1",
+ wrapped.de.jcup.asp.asp-client-java;bundle-version="1.4.1",
+ wrapped.de.jcup.asp.asp-api;bundle-version="1.4.1",
+ wrapped.de.jcup.asp.asp-server-asciidoctorj-launcher;bundle-version="1.4.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.ui,
  org.eclipse.ui.texteditor.spelling,
  org.eclipse.ui.texteditor.templates
-Export-Package: de.jcup.asciidoctoreditor,
- de.jcup.asciidoctoreditor.outline
-Bundle-ClassPath: .,
- lib/de-jcup-eclipse-commons.jar,
- lib/commons-io-2.6.jar,
- lib/asp-server-asciidoctorj-launcher-dist.jar
+Bundle-ClassPath: .
 Automatic-Module-Name: de.jcup.asciidoctoreditor

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,11 +12,7 @@ bin.includes = META-INF/,\
                toc.xml,\
                tooltips/,\
                addons/,\
-               css/,\
-               lib/de-jcup-eclipse-commons.jar,\
-               lib/commons-io-2.6.jar,\
-               lib/asp-server-asciidoctorj-launcher-dist.jar,\
-               examples/
+               css/
 src.excludes = src/test/java-eclipse/,\
                src/test/java/,\
                src/test/resources/

asciidoctor-editor-plugin/src/main/java-eclipse/de/jcup/asciidoctoreditor/asciidoc/AspAsciidoctorAdapter.java

@@ -40,7 +40,7 @@
 import de.jcup.eclipse.commons.EclipseResourceHelper;
 
 public class AspAsciidoctorAdapter implements AsciidoctorAdapter {
-
+	
     @Override
     public void convertFile(File editorFileOrNull, File asciiDocFile, AsciidocOptions options, AsciidocAttributes attributes, AspClientProgressMonitor monitor) {
         try {

asciidoctor-editor-target/asciidoctor-editor.target

@@ -1,8 +1,79 @@
-<?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/photon/201806271001/"/>
+			<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">
+
+			<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>
+					<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.4.1</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>de.jcup.eclipse.commons</groupId>
+					<artifactId>eclipse-commons</artifactId>
+					<version>1.1.1</version>
+					<type>jar</type>
+				</dependency>
+			</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>
+					<artifactId>asp-server-asciidoctorj</artifactId>
+					<version>1.4.1</version>
+					<type>jar</type>
+				</dependency>
+			</dependencies>
 		</location>
 	</locations>
 </target>

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>

asciidoctor-editor-updatesite/site.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <description name="Asciidoctor Editor Update Site" url="https://dl.bintray.com/de-jcup/asciidoctoreditor">
+  <description name="Asciidoctor Editor Update Site" url="https://de-jcup.github.io/update-site-eclipse-asciidoctor-editor/update-site/">
       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">