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/.gitignore b/.gitignore index 482a528e..3dd7d5cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .metadata .lck .gradle/ +target/ .classpath .project .settings/ 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 @@ + + + + org.eclipse.tycho.extras + tycho-pomless + 2.4.0 + + \ No newline at end of file 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 diff --git a/asciidoctor-editor-doc/src/doc/asciidoc/shared/build-mechanism.adoc b/asciidoctor-editor-doc/src/doc/asciidoc/shared/build-mechanism.adoc index 52b85f02..af144d5f 100644 --- a/asciidoctor-editor-doc/src/doc/asciidoc/shared/build-mechanism.adoc +++ b/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[] diff --git a/asciidoctor-editor-feature/feature.xml b/asciidoctor-editor-feature/feature.xml index a1c45ea3..e8165262 100644 --- a/asciidoctor-editor-feature/feature.xml +++ b/asciidoctor-editor-feature/feature.xml @@ -1,8 +1,8 @@ @@ -240,12 +240,6 @@ and limitations under the License. version="0.0.0" unpack="false"/> - - - - - - - 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 @@ - - - asciidoctor-editor-libs - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - 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/=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/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 diff --git a/asciidoctor-editor-other/testscripts/diagrams/subfolder/child-from-empty-subfolder/again-empty-subfolder/contentfolder/test.adoc b/asciidoctor-editor-other/testscripts/diagrams/subfolder/child-from-empty-subfolder/again-empty-subfolder/contentfolder/test.adoc new file mode 100644 index 00000000..4dc6a759 --- /dev/null +++ b/asciidoctor-editor-other/testscripts/diagrams/subfolder/child-from-empty-subfolder/again-empty-subfolder/contentfolder/test.adoc @@ -0,0 +1,4 @@ +== Test + + +plantuml::../../../../diagram1.plantuml[] \ No newline at end of file diff --git a/asciidoctor-editor-other/testscripts/diagrams/subfolder/child-from-empty-subfolder/again-empty-subfolder/contentfolder2/test.adoc b/asciidoctor-editor-other/testscripts/diagrams/subfolder/child-from-empty-subfolder/again-empty-subfolder/contentfolder2/test.adoc new file mode 100644 index 00000000..c39656fe --- /dev/null +++ b/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[] + diff --git a/asciidoctor-editor-other/testscripts/diagrams/subfolder/child-from-empty-subfolder/again-empty-subfolder/contentfolder2/test2.adoc b/asciidoctor-editor-other/testscripts/diagrams/subfolder/child-from-empty-subfolder/again-empty-subfolder/contentfolder2/test2.adoc new file mode 100644 index 00000000..07d44cd7 --- /dev/null +++ b/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/ + diff --git a/asciidoctor-editor-plugin/.classpath b/asciidoctor-editor-plugin/.classpath index 7ec5ff16..6b2f8275 100644 --- a/asciidoctor-editor-plugin/.classpath +++ b/asciidoctor-editor-plugin/.classpath @@ -6,11 +6,8 @@ - - - diff --git a/asciidoctor-editor-plugin/META-INF/MANIFEST.MF b/asciidoctor-editor-plugin/META-INF/MANIFEST.MF index 0ca9beaa..df14cf49 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.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 diff --git a/asciidoctor-editor-plugin/build.properties b/asciidoctor-editor-plugin/build.properties index 2b71da54..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,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/ diff --git a/asciidoctor-editor-plugin/src/main/java-eclipse/de/jcup/asciidoctoreditor/asciidoc/AspAsciidoctorAdapter.java b/asciidoctor-editor-plugin/src/main/java-eclipse/de/jcup/asciidoctoreditor/asciidoc/AspAsciidoctorAdapter.java index 82461943..84707d5a 100644 --- a/asciidoctor-editor-plugin/src/main/java-eclipse/de/jcup/asciidoctoreditor/asciidoc/AspAsciidoctorAdapter.java +++ b/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 { diff --git a/asciidoctor-editor-target/asciidoctor-editor.target b/asciidoctor-editor-target/asciidoctor-editor.target index eaac4181..efd19e06 100644 --- a/asciidoctor-editor-target/asciidoctor-editor.target +++ b/asciidoctor-editor-target/asciidoctor-editor.target @@ -1,8 +1,79 @@ - + + + - - + + + + + + + + + + + + + + + + + + + + [Enter Feature Description here.] + + + [Enter Copyright Description here.] + + + [Enter License Description here.] + + + + + commons-io + commons-io + 2.7 + jar + + + de.jcup.asp + asp-server-asciidoctorj-launcher + 1.4.1 + jar + + + de.jcup.eclipse.commons + eclipse-commons + 1.1.1 + jar + + + + + + + + + [Enter Feature Description here.] + + + [Enter Copyright Description here.] + + + [Enter License Description here.] + + + + + de.jcup.asp + asp-server-asciidoctorj + 1.4.1 + jar + + \ No newline at end of file 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 @@ + + + + + + + + + + + + + diff --git a/asciidoctor-editor-updatesite/site.xml b/asciidoctor-editor-updatesite/site.xml index 3a8884d2..6c3f93af 100644 --- a/asciidoctor-editor-updatesite/site.xml +++ b/asciidoctor-editor-updatesite/site.xml @@ -1,6 +1,6 @@ - + This update site contains feature and plugins of Asciidoctor Editor diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..ed29db8d --- /dev/null +++ b/pom.xml @@ -0,0 +1,101 @@ + + 4.0.0 + eclipse.asciidoctor.editor + releng + 2.5.0-SNAPSHOT + pom + + + 2.7.4 + UTF-8 + + + + + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho.version} + + + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + package + package-feature + + ${project.artifactId}_${unqualifiedVersion}.${buildQualifier} + + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + ../asciidoctor-editor-target/asciidoctor-editor.target + + false + + + + linux + gtk + x86_64 + + + win32 + win32 + x86_64 + + + macosx + cocoa + x86_64 + + + + + + + + + + asciidoctor-editor-css + asciidoctor-converter-plugin + asciidoctor-editor-plugin + asciidoctor-editor-feature + asciidoctor-editor-updatesite + + + + +