[Git][java-team/sisu-inject][master] 6 commits: Sort the classes by name in META-INF/sisu/javax.inject.Named to make the output reproducible

Wed Jan 20 10:17:26 GMT 2021


Emmanuel Bourg pushed to branch master at Debian Java Maintainers / sisu-inject


Commits:
22b9e2c3 by Emmanuel Bourg at 2021-01-20T10:41:19+01:00
Sort the classes by name in META-INF/sisu/javax.inject.Named to make the output reproducible

- - - - -
afcb3021 by Emmanuel Bourg at 2021-01-20T11:02:27+01:00
Removed the runtime dependency on libguice-java (provided by Maven)

- - - - -
f2cfe24d by Emmanuel Bourg at 2021-01-20T11:08:41+01:00
Removed debian/orig-tar.sh

- - - - -
a675cd59 by Emmanuel Bourg at 2021-01-20T11:11:20+01:00
Removed the unused Maven rules

- - - - -
fecacb77 by Emmanuel Bourg at 2021-01-20T11:16:40+01:00
Build depend on libservlet-api-java instead of libservlet3.1-java

- - - - -
c5748465 by Emmanuel Bourg at 2021-01-20T11:17:10+01:00
Upload to unstable

- - - - -


11 changed files:

- debian/changelog
- debian/control
- debian/copyright
- − debian/maven.cleanIgnoreRules
- − debian/maven.publishedRules
- debian/maven.rules
- − debian/orig-tar.sh
- − debian/patches/05-guice-dependency.patch
- + debian/patches/07-reproducible-index.patch
- debian/patches/series
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+sisu-inject (0.3.4-2) unstable; urgency=medium
+
+  * Sort the classes by name in META-INF/sisu/javax.inject.Named to make
+    the output reproducible
+  * Removed the runtime dependency on libguice-java (provided by Maven)
+  * Build depend on libservlet-api-java instead of libservlet3.1-java
+  * Removed debian/orig-tar.sh
+  * Removed the unused Maven rules
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 20 Jan 2021 11:17:05 +0100
+
 sisu-inject (0.3.4-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends:
  libguice-java,
  liblogback-java,
  libosgi-core-java (>= 6.0),
- libservlet3.1-java,
+ libservlet-api-java,
  libslf4j-java,
  maven-debian-helper (>= 1.5),
  testng


=====================================
debian/copyright
=====================================
@@ -1,6 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Sisu Inject
 Source: http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git
+Files-Excluded: */doclava/*
+                */leftovers/*
+                */bin/*
 
 Files: *
 Copyright: 2010-2013 Sonatype, Inc.


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


=====================================
debian/maven.publishedRules deleted
=====================================
@@ -1 +0,0 @@
-


=====================================
debian/maven.rules
=====================================
@@ -1,10 +1,5 @@
 
-javax.servlet javax.servlet-api * * * *
 junit junit jar s/4\..*/4.x/ * *
-org.eclipse.sisu org.eclipse.sisu.inject eclipse-plugin s/.*/debian/ * *
-org.eclipse.sisu org.eclipse.sisu.inject.extender eclipse-plugin s/.*/debian/ * *
-org.eclipse.sisu org.eclipse.sisu.inject.tests jar s/.*/debian/ * *
-org.eclipse.sisu sisu-inject pom s/.*/debian/ * *
 org.testng testng jar s/6\..*/6.x/ * *
 s/javax.annotation/org.apache.geronimo.specs/ s/javax.annotation-api/geronimo-annotation_1.3_spec/  jar s/.*/debian/ * *
 s/org.apache.felix/org.osgi/ org.osgi.core * * * *


=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,11 +0,0 @@
-#!/bin/sh
-VERSION=$2
-TAR=../sisu-inject_$VERSION.orig.tar.xz
-DIR=sisu-inject-$VERSION.orig
-
-mkdir $DIR
-tar -xf $3 --strip 2 -C $DIR
-rm $3
-
-XZ_OPT=--best tar -cJvf $TAR --exclude '.gitignore' --exclude 'doclava' --exclude 'leftovers' --exclude 'bin' $DIR
-rm -Rf $DIR


=====================================
debian/patches/05-guice-dependency.patch deleted
=====================================
@@ -1,13 +0,0 @@
-Description: Change the scope of the guice dependency (provided->compile as in sisu-inject 0.0.0.M5) to be able to compile Maven 3.1.x
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/org.eclipse.sisu.inject/pom.xml
-+++ b/org.eclipse.sisu.inject/pom.xml
-@@ -34,7 +34,6 @@
-       <groupId>com.google.inject</groupId>
-       <artifactId>guice</artifactId>
-       <version>3.0</version>
--      <scope>provided</scope>
-     </dependency>
-     <dependency>
-       <groupId>com.google.inject.extensions</groupId>


=====================================
debian/patches/07-reproducible-index.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Sort the classes by name in META-INF/sisu/javax.inject.Named to make the output reproducible
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/AbstractSisuIndex.java
++++ b/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/AbstractSisuIndex.java
+@@ -158,7 +158,7 @@
+             final BufferedWriter writer = new BufferedWriter( getWriter( INDEX_FOLDER + name ) );
+             try
+             {
+-                for ( final String line : table )
++                for ( final String line : new java.util.TreeSet<String>( table ) )
+                 {
+                     writer.write( line );
+                     writer.newLine();


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,4 @@
 02-change-packaging-type.patch
 03-add-missing-dependencies.patch
-05-guice-dependency.patch
 06-include-resources.patch
+07-reproducible-index.patch


=====================================
debian/watch
=====================================
@@ -1,2 +1,3 @@
-version=3
-http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/refs/ .*releases/(.*).tar.gz debian debian/orig-tar.sh
+version=4
+opts="repack,compression=xz" \
+http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/refs/ .*releases/(.*).tar.gz



View it on GitLab: https://salsa.debian.org/java-team/sisu-inject/-/compare/d1d24081463b845eece4e56c49c8e317a8a03409...c5748465748d93a5ee20446636f5988a86052b9d

-- 
View it on GitLab: https://salsa.debian.org/java-team/sisu-inject/-/compare/d1d24081463b845eece4e56c49c8e317a8a03409...c5748465748d93a5ee20446636f5988a86052b9d
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/20210120/0f68754f/attachment.html>
