[Git][java-team/carrotsearch-hppc][master] 9 commits: Add a build dependency on assertj

Andrej Shadura gitlab at salsa.debian.org
Thu Dec 27 19:25:06 GMT 2018 

Andrej Shadura pushed to branch master at Debian Java Maintainers / carrotsearch-hppc


Commits:
08923ac6 by Andrej Shadura at 2018-12-27T18:42:43Z
Add a build dependency on assertj

- - - - -
4cf51c3b by Andrej Shadura at 2018-12-27T18:43:17Z
Fix the patch

- - - - -
0b654f9a by Andrej Shadura at 2018-12-27T18:43:39Z
Add debian/maven.publishedRule

- - - - -
d1d8107c by Andrej Shadura at 2018-12-27T19:10:06Z
Refresh maven rules

- - - - -
722e4403 by Andrej Shadura at 2018-12-27T19:10:12Z
Remove unused build-depencdency

- - - - -
5a82bcac by Andrej Shadura at 2018-12-27T19:17:40Z
Install NOTICE.txt which has got renamed upstream

- - - - -
da6ddd8a by Andrej Shadura at 2018-12-27T19:21:48Z
Install other text files too

- - - - -
9ca8e88c by Andrej Shadura at 2018-12-27T19:22:08Z
Install CHANGES.txt as the upstream changelog

- - - - -
16d99ce5 by Andrej Shadura at 2018-12-27T19:23:48Z
Update the changelog

- - - - -


9 changed files:

- debian/changelog
- + debian/libcarrotsearch-hppc-java.docs
- + debian/maven.cleanIgnoreRules
- debian/maven.ignoreRules
- debian/maven.properties
- + debian/maven.publishedRules
- debian/maven.rules
- debian/patches/01-remove-generated-annotation.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,14 @@
-carrotsearch-hppc (0.7.2-1) UNRELEASED; urgency=medium
+carrotsearch-hppc (0.7.2-1) unstable; urgency=medium
 
   * Team upload.
   * New upstream version.
+  * Update the patch to apply to the new version.
+  * Refresh maven rules.
+  * Install NOTICE.txt which has got renamed upstream.
+  * Install other text files too.
+  * Install CHANGES.txt as the upstream changelog.
 
- -- Andrej Shadura <andrewsh at debian.org>  Wed, 26 Dec 2018 21:19:38 +0100
+ -- Andrej Shadura <andrewsh at debian.org>  Thu, 27 Dec 2018 20:23:11 +0100
 
 carrotsearch-hppc (0.6.1-6) unstable; urgency=medium
 


=====================================
debian/libcarrotsearch-hppc-java.docs
=====================================
@@ -0,0 +1,3 @@
+NOTICE.txt
+ALTERNATIVES.txt
+README.txt


=====================================
debian/maven.cleanIgnoreRules
=====================================
@@ -0,0 +1 @@
+


=====================================
debian/maven.ignoreRules
=====================================
@@ -1,9 +1,13 @@
 de.thetaphi forbiddenapis * * * *
 com.carrotsearch hppc-benchmarks jar * * *
 com.carrotsearch hppc-examples jar * * *
+com.carrotsearch hppc-template-processor jar * * *
+com.carrotsearch hppc * * * *
 com.carrotsearch.randomizedtesting junit4-maven-plugin * * * *
 com.carrotsearch.randomizedtesting randomizedtesting-runner * * * *
+it.unimi.dsi fastutil * * * *
 junit junit * * * *
+net.openhft koloboke-impl-jdk6-7 * * * *
 net.sf.retrotranslator retrotranslator-runtime * * * *
 net.sf.retrotranslator retrotranslator-transformer * * * *
 org.apache.ant ant-nodeps * * * *
@@ -12,7 +16,14 @@ org.apache.ant ant-junit * * * *
 org.apache.maven.plugins maven-deploy-plugin * * * *
 org.apache.maven.plugins maven-eclipse-plugin * * * *
 org.apache.maven.plugins maven-enforcer-plugin * * * *
+org.apache.maven.plugins maven-gpg-plugin * * * *
+org.apache.maven.plugins maven-shade-plugin * * * *
 org.apache.maven.plugins maven-site-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
 org.apache.maven.plugins maven-surefire-report-plugin * * * *
+org.assertj assertj-core * * * *
 org.codehaus.mojo findbugs-maven-plugin * * * *
+org.openjdk.jmh jmh-core * * * *
+org.openjdk.jmh jmh-generator-annprocess * * * *
 sun.jdk tools * * * *


=====================================
debian/maven.properties
=====================================
@@ -1,5 +1,3 @@
 # Include here properties to pass to Maven during the build.
-# For example:
-# maven.test.skip=true
 
 maven.test.skip=true


=====================================
debian/maven.publishedRules
=====================================
@@ -0,0 +1,4 @@
+
+com.carrotsearch hppc s/jar/bundle/ s/.*/debian/ * *
+com.carrotsearch s/hppc-templateprocessor/hppc-template-processor/ * s/.*/debian/ * *
+com.carrotsearch hppc* * s/.*/debian/ * *


=====================================
debian/maven.rules
=====================================
@@ -1,3 +1,22 @@
+
+s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * *
+s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * *
+com.carrotsearch hppc-benchmarks jar s/.*/debian/ * *
+com.carrotsearch hppc-examples jar s/.*/debian/ * *
+com.carrotsearch hppc-parent pom s/.*/debian/ * *
+com.carrotsearch hppc bundle s/.*/debian/ * *
+com.google.guava guava bundle s/.*/debian/ * *
+com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
+junit junit jar s/4\..*/4.x/ * *
+org.apache.velocity velocity jar s/.*/debian/ * *
+org.assertj assertj-core bundle s/.*/debian/ * *
+org.assertj assertj-core s/jar/bundle/ s/.*/debian/ * *
 org.apache.felix maven-bundle-plugin * s/.*/debian/ * *
+org.apache.maven.plugins maven-changes-plugin * * * *
+org.apache.maven.plugins maven-jxr-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.shared maven-plugin-testing-harness * * * *
+org.apache.rat apache-rat-plugin * * * *
+org.codehaus.plexus plexus-container-default * * * *
 org.apache.maven * * s/.*/3.x/ * *
-junit junit jar s/4\..*/4.x/ * *
+org.apache.maven maven* * s/.*/3.x/ * *


=====================================
debian/patches/01-remove-generated-annotation.patch
=====================================
@@ -8,9 +8,11 @@ Forwarded: no
    public String getGeneratedAnnotation() {
      return String.format(Locale.ROOT, 
 -        "@javax.annotation.Generated(\n" + 
+-        "    date = \"%s\",\n" +
+-        "    value = \"%s\")",
 +        "//@javax.annotation.Generated(\n" + 
-         "    date = \"%s\",\n" +
-         "    value = \"%s\")",
++        "//    date = \"%s\",\n" +
++        "//    value = \"%s\")",
          getTimeNow(),
          TEMPLATE_FILE_TOKEN);
    }


=====================================
debian/rules
=====================================
@@ -2,3 +2,6 @@
 
 %:
 	dh $@
+
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGES.txt



View it on GitLab: https://salsa.debian.org/java-team/carrotsearch-hppc/compare/ef949aa0610db0ea63eb52bfa071dc8ea02d30e9...16d99ce51fbdf3d9685c29c8d106108114c8578b

-- 
View it on GitLab: https://salsa.debian.org/java-team/carrotsearch-hppc/compare/ef949aa0610db0ea63eb52bfa071dc8ea02d30e9...16d99ce51fbdf3d9685c29c8d106108114c8578b
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/20181227/894be4c3/attachment.html>

More information about the pkg-java-commits mailing list