[Git][java-team/equinox-framework][master] 3 commits: Added the missing dependencies in the Maven poms

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / equinox-framework


Commits:
8f6771ca by Emmanuel Bourg at 2018-10-01T10:45:57Z
Added the missing dependencies in the Maven poms

- - - - -
5edf61f3 by Emmanuel Bourg at 2018-10-01T11:03:02Z
Added the Class-Path attribute in the manifest of the jar files

- - - - -
7f8a18f1 by Emmanuel Bourg at 2018-10-01T11:03:14Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/01-add-maven-dependencies.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+equinox-framework (4.7.3-4) unstable; urgency=medium
+
+  * Added the missing dependencies in the Maven poms
+  * Added the Class-Path attribute in the manifest of the jar files
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 01 Oct 2018 13:03:07 +0200
+
 equinox-framework (4.7.3-3) unstable; urgency=medium
 
   * Mark the libeclipse-osgi-java, libeclipse-osgi-services-java and


=====================================
debian/control
=====================================
@@ -6,6 +6,7 @@ Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  debhelper (>= 11~),
  default-jdk,
+ javahelper,
  libosgi-annotation-java,
  libservlet3.1-java,
  eclipse-debian-helper


=====================================
debian/patches/01-add-maven-dependencies.patch
=====================================
@@ -0,0 +1,87 @@
+Description: Adds the missing dependencies in the Maven poms
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/bundles/org.eclipse.osgi/pom.xml
++++ b/bundles/org.eclipse.osgi/pom.xml
+@@ -37,4 +37,12 @@
+     </plugins>
+   </build>
+ 
++  <dependencies>
++    <dependency>
++      <artifactId>org.osgi</artifactId>
++      <groupId>org.osgi.annotation</groupId>
++      <version>debian</version>
++    </dependency>
++  </dependencies>
++
+ </project>
+--- a/bundles/org.eclipse.osgi.util/pom.xml
++++ b/bundles/org.eclipse.osgi.util/pom.xml
+@@ -35,4 +35,13 @@
+       </plugin>
+     </plugins>
+   </build>
++
++  <dependencies>
++    <dependency>
++      <artifactId>org.eclipse.osgi</artifactId>
++      <groupId>org.eclipse.osgi</groupId>
++      <version>debian</version>
++    </dependency>
++  </dependencies>
++
+ </project>
+--- a/bundles/org.eclipse.osgi.services/pom.xml
++++ b/bundles/org.eclipse.osgi.services/pom.xml
+@@ -35,4 +35,18 @@
+       </plugin>
+     </plugins>
+   </build>
++
++  <dependencies>
++    <dependency>
++      <artifactId>org.eclipse.osgi</artifactId>
++      <groupId>org.eclipse.osgi</groupId>
++      <version>debian</version>
++    </dependency>
++    <dependency>
++      <artifactId>org.eclipse.osgi</artifactId>
++      <groupId>org.eclipse.osgi.util</groupId>
++      <version>debian</version>
++    </dependency>
++  </dependencies>
++
+ </project>
+--- a/bundles/org.eclipse.osgi.compatibility.plugins/pom.xml
++++ b/bundles/org.eclipse.osgi.compatibility.plugins/pom.xml
+@@ -21,4 +21,13 @@
+   <artifactId>org.eclipse.osgi.compatibility.plugins</artifactId>
+   <version>1.1.0-SNAPSHOT</version>
+   <packaging>eclipse-plugin</packaging>
++
++  <dependencies>
++    <dependency>
++      <artifactId>org.eclipse.osgi</artifactId>
++      <groupId>org.eclipse.osgi</groupId>
++      <version>debian</version>
++    </dependency>
++  </dependencies>
++
+ </project>
+--- a/bundles/org.eclipse.osgi.compatibility.state/pom.xml
++++ b/bundles/org.eclipse.osgi.compatibility.state/pom.xml
+@@ -21,4 +21,13 @@
+   <artifactId>org.eclipse.osgi.compatibility.state</artifactId>
+   <version>1.1.0-SNAPSHOT</version>
+   <packaging>eclipse-plugin</packaging>
++
++  <dependencies>
++    <dependency>
++      <artifactId>org.eclipse.osgi</artifactId>
++      <groupId>org.eclipse.osgi</groupId>
++      <version>debian</version>
++    </dependency>
++  </dependencies>
++
+ </project>


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+01-add-maven-dependencies.patch


=====================================
debian/rules
=====================================
@@ -3,8 +3,15 @@
 include /usr/share/dpkg/pkg-info.mk
 
 %:
-	dh $@ --buildsystem=eclipse_bundles
+	dh $@ --buildsystem=eclipse_bundles --with javahelper
 
 override_dh_gencontrol:
 	# Use the bundle versions as package versions
 	awk 'system("dh_gencontrol -p"$$4" -- -v"$$2"+eclipse$(DEB_VERSION)")' debian/bundles.properties
+
+override_jh_classpath:
+	jh_classpath -plibeclipse-osgi-java          --classpath=/usr/share/java/osgi.annotation.jar   usr/share/java/eclipse-osgi.jar
+	jh_classpath -plibeclipse-osgi-util-java     --classpath=/usr/share/java/eclipse-osgi.jar      usr/share/java/eclipse-osgi-util.jar
+	jh_classpath -plibeclipse-osgi-services-java --classpath=/usr/share/java/eclipse-osgi-util.jar usr/share/java/eclipse-osgi-services.jar
+	jh_classpath -plibeclipse-osgi-compatibility-plugins-java --classpath=/usr/share/java/eclipse-osgi.jar usr/share/java/eclipse-osgi-compatibility-plugins.jar
+	jh_classpath -plibeclipse-osgi-compatibility-state-java   --classpath=/usr/share/java/eclipse-osgi.jar usr/share/java/eclipse-osgi-compatibility-state.jar



View it on GitLab: https://salsa.debian.org/java-team/equinox-framework/compare/fd9c08384dc50c1c604ed649ceeee20bd34106eb...7f8a18f1ba571cf98d34ebc64d1673dc3300a8ea

-- 
View it on GitLab: https://salsa.debian.org/java-team/equinox-framework/compare/fd9c08384dc50c1c604ed649ceeee20bd34106eb...7f8a18f1ba571cf98d34ebc64d1673dc3300a8ea
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181001/c84afcc5/attachment.html>