From 24bcc11095a234cd5c97fba2f3a81c18107612ef Mon Sep 17 00:00:00 2001 From: fei wong reed Date: Wed, 29 Jul 2015 15:22:13 +0100 Subject: [PATCH] Correct OSGi manifests in source jars Related: #3886 Motivation: We were including OSGi manifests in sources/javadoc JARs, and OSGi container treats them as correct dependencies when resolving from OBR repository, which is incorrect. Runtime fails with non-descriptive ClassNotFoundException as a result. Modifications: - Do not include the OSGi manifests in sources/javadoc JARs - Include Eclipse-related manifest entries in sources/javadoc JARs Result: Better OSGi compatibility --- pom.xml | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 7f524971cc..7d164c490e 100644 --- a/pom.xml +++ b/pom.xml @@ -1122,16 +1122,40 @@ + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + parse-version + + parse-version + + + + + maven-source-plugin 2.2.1 + - - true + + + 2 + ${name} + ${groupId}.${artifactId}.source + ${organization.name} + ${parsedVersion.osgiVersion} + ${groupId}.${artifactId};version="${parsedVersion.osgiVersion}";roots:="." + + +