From bfaefa53a92231afd7f920d5ec3eca7915187d99 Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Fri, 10 Nov 2017 16:03:29 +0200 Subject: [PATCH 1/2] Use maven-resources-plugin 2.4 to make m2e happy. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c3f84e9..cd031c2 100644 --- a/pom.xml +++ b/pom.xml @@ -216,7 +216,7 @@ software, even if advised of the possibility of such damage. maven-resources-plugin - 2.2 + 2.4 UTF-8 From 6af7aa1a6626625605b03e0ef22b9f508ee4d5c0 Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Fri, 10 Nov 2017 16:08:19 +0200 Subject: [PATCH 2/2] Configure the core project to generate OSGi headers The org.markdownj package is marked as exported with version 1.0.0, to mark the initial version with OSGi compatibility. The changes introduce no now requirements outside of OSGi environments. --- core/bnd.bnd | 1 + core/pom.xml | 30 +++++++++++++++++++ .../main/java/org/markdownj/package-info.java | 1 + 3 files changed, 32 insertions(+) create mode 100644 core/bnd.bnd diff --git a/core/bnd.bnd b/core/bnd.bnd new file mode 100644 index 0000000..f38120c --- /dev/null +++ b/core/bnd.bnd @@ -0,0 +1 @@ +Export-Package: org.markdownj \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml index 16c8615..d5267c9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -63,9 +63,39 @@ software, even if advised of the possibility of such damage. + + biz.aQute.bnd + bnd-maven-plugin + 3.5.0 + + + + bnd-process + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + org.osgi + osgi.annotation + 6.0.1 + provided + + + diff --git a/core/src/main/java/org/markdownj/package-info.java b/core/src/main/java/org/markdownj/package-info.java index e319e1e..d6d2a8a 100644 --- a/core/src/main/java/org/markdownj/package-info.java +++ b/core/src/main/java/org/markdownj/package-info.java @@ -1 +1,2 @@ +@org.osgi.annotation.versioning.Version("1.0.0") package org.markdownj; \ No newline at end of file