Skip to content

Commit

Permalink
Added asp-server-asciidoctorj dependencies + lib dependencies #371
Browse files Browse the repository at this point in the history
- unfortunately the runtime dependencies (asciidoctorj for example)
  seems to be not resolved by asciidoctor-editor-target
  • Loading branch information
de-jcup committed Feb 4, 2022
1 parent 8a70eae commit 7853cbf
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 22 deletions.
1 change: 1 addition & 0 deletions asciidoctor-editor-libs/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 0 additions & 2 deletions asciidoctor-editor-plugin/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
12 changes: 8 additions & 4 deletions asciidoctor-editor-plugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions asciidoctor-editor-plugin/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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/
29 changes: 16 additions & 13 deletions asciidoctor-editor-target/asciidoctor-editor.target
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit 7853cbf

Please sign in to comment.