[Git][java-team/cdk][master] 4 commits: No longer ignore legacy/pom.xml during build

[Tony Mancill]

Tony Mancill pushed to branch master at Debian Java Maintainers / cdk


Commits:
c6490a18 by tony mancill at 2020-07-28T16:48:12-07:00
No longer ignore legacy/pom.xml during build

- - - - -
7673ad1e by tony mancill at 2020-07-28T20:34:11-07:00
Add javacc plugin to build-deps

- - - - -
e414d904 by tony mancill at 2020-07-29T06:57:12-07:00
Add versioned dependency on libjgrapht0.6-java

- - - - -
6be3d63b by tony mancill at 2020-07-29T06:57:48-07:00
update changelog for upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/libcdk-java.poms
- debian/maven.ignoreRules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+cdk (1:2.3.134.g1bb9a64587-2) unstable; urgency=medium
+
+  * Team upload.
+  * Enable legacy pom.
+  * Add javacc plugin to build-deps
+  * Add versioned dependency on libjgrapht0.6-java
+
+ -- tony mancill <tmancill at debian.org>  Wed, 29 Jul 2020 06:57:20 -0700
+
 cdk (1:2.3.134.g1bb9a64587-1) unstable; urgency=medium
 
   * New upstream version 2.3.134.g1bb9a64587 (Closes: #963435)


=====================================
debian/control
=====================================
@@ -20,7 +20,8 @@ Build-Depends:
  libfreehep-graphicsio-tests-java (>= 2.4),
  libhamcrest-java,
  libjama-java,
- libjgrapht0.6-java,
+ libjavacc-maven-plugin-java,
+ libjgrapht0.6-java (>= 0.6.0-12),
  libjni-inchi-java,
  liblog4j2-java,
  libmaven-install-plugin-java,


=====================================
debian/libcdk-java.poms
=====================================
@@ -87,8 +87,8 @@ tool/structgen/pom.xml --has-package-version
 tool/tautomer/pom.xml --has-package-version
 tool/model/pom.xml --has-package-version
 
-# legacy requires jgrapht, which is in Debian, but lacks Maven layout
-legacy/pom.xml --has-package-version --ignore
+# legacy will soon be deprecated by upstream
+legacy/pom.xml --has-package-version
 
 # iordf is not built due to missing Java packages in Debian:
 #     package com.hp.hpl.jena.rdf.model does not exist


=====================================
debian/maven.ignoreRules
=====================================
@@ -3,7 +3,6 @@ org.apache.jena jena-core * * * *
 org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.maven.plugins maven-pmd-plugin * * * *
 org.codehaus.mojo findbugs-maven-plugin * * * *
-org.codehaus.mojo javacc-maven-plugin * * * *
 org.jacoco jacoco-maven-plugin * * * *
 org.mockito mockito-all * * * *
 org.openscience.cdk cdk-test* * * * *



View it on GitLab: https://salsa.debian.org/java-team/cdk/-/compare/4166097b2ad4e582d125e8a8bb3ae347e7fec112...6be3d63b16b8a014691473ccb125ad1087146e67

-- 
View it on GitLab: https://salsa.debian.org/java-team/cdk/-/compare/4166097b2ad4e582d125e8a8bb3ae347e7fec112...6be3d63b16b8a014691473ccb125ad1087146e67
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/20200729/fb663f27/attachment.html>