[Git][java-team/libexternalsortinginjava-java][master] 10 commits: New upstream version 0.2.5
Andreas Tille
gitlab at salsa.debian.org
Sat Jan 12 08:21:43 GMT 2019
Andreas Tille pushed to branch master at Debian Java Maintainers / libexternalsortinginjava-java
Commits:
73d6d6fc by Andreas Tille at 2019-01-12T07:58:55Z
New upstream version 0.2.5
- - - - -
1acab6e4 by Andreas Tille at 2019-01-12T07:58:56Z
Update upstream source from tag 'upstream/0.2.5'
Update to upstream version '0.2.5'
with Debian dir 0723cd6d90c44a50c82cbdd5381265a262eb3088
- - - - -
f20b38d9 by Andreas Tille at 2019-01-12T07:58:56Z
New upstream version
- - - - -
8c1f43dd by Andreas Tille at 2019-01-12T07:58:56Z
debhelper 12
- - - - -
5a0c5963 by Andreas Tille at 2019-01-12T07:59:12Z
Standards-Version: 4.3.0
- - - - -
04eeebe4 by Andreas Tille at 2019-01-12T07:59:13Z
Secure URI in copyright format
- - - - -
981704a7 by Andreas Tille at 2019-01-12T07:59:13Z
Drop useless get-orig-source target
- - - - -
31ce4523 by Andreas Tille at 2019-01-12T07:59:13Z
Remove trailing whitespace in debian/changelog
- - - - -
db3c88cb by Andreas Tille at 2019-01-12T08:11:42Z
Cleanup changelog
- - - - -
21c2b2ca by Andreas Tille at 2019-01-12T08:20:58Z
Upload to unstable
- - - - -
8 changed files:
- .travis.yml
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/rules
- pom.xml
- src/main/java/com/google/code/externalsorting/ExternalSort.java
Changes:
=====================================
.travis.yml
=====================================
@@ -1,6 +1,7 @@
language: java
jdk:
+ - oraclejdk9
- oraclejdk8
install: true
=====================================
debian/changelog
=====================================
@@ -1,16 +1,14 @@
-libexternalsortinginjava-java (0.2.4-1) UNRELEASED; urgency=medium
+libexternalsortinginjava-java (0.2.5-1) unstable; urgency=medium
* New upstream version
- * Standards-Version: 4.1.4
* Point Vcs-fields to Salsa
- * debhelper 11
- TODO: build fails
- [ERROR] Failed to execute goal org.apache.maven.plugins:maven-javadoc-plugin:3.0.0:jar (default-cli) on project externalsortinginjava: Execution default-cli of goal org.apache.maven.plugins:maven-javadoc-plugin:3.0.0:jar failed.: NullPointerException -> [Help 1]
- [ERROR]
- [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
- [ERROR] Re-run Maven using the -X switch to enable full debug logging.
+ * debhelper 12
+ * Standards-Version: 4.3.0
+ * Secure URI in copyright format
+ * Drop useless get-orig-source target
+ * Remove trailing whitespace in debian/changelog
- -- Andreas Tille <tille at debian.org> Wed, 02 May 2018 08:03:42 +0200
+ -- Andreas Tille <tille at debian.org> Sat, 12 Jan 2019 09:11:55 +0100
libexternalsortinginjava-java (0.2.3-1) unstable; urgency=medium
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-11
+12
=====================================
debian/control
=====================================
@@ -3,14 +3,14 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Andreas Tille <tille at debian.org>
Section: java
Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper (>= 12~),
default-jdk,
maven-debian-helper (>= 2.1)
Build-Depends-Indep: libmaven-dependency-plugin-java,
junit4,
default-jdk-doc,
libmaven-javadoc-plugin-java
-Standards-Version: 4.1.4
+Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/java-team/libexternalsortinginjava-java
Vcs-Git: https://salsa.debian.org/java-team/libexternalsortinginjava-java.git
HHomepage: http://github.com/lemire/externalsortinginjava/
=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: externalsortinginjava
Source: http://github.com/lemire/externalsortinginjava/
=====================================
debian/rules
=====================================
@@ -3,5 +3,3 @@
%:
dh $@
-get-orig-source:
- uscan --download-current-version --force-download --no-symlink
=====================================
pom.xml
=====================================
@@ -3,7 +3,7 @@
<groupId>com.google.code.externalsortinginjava</groupId>
<artifactId>externalsortinginjava</artifactId>
<packaging>jar</packaging>
- <version>0.2.4</version>
+ <version>0.2.5</version>
<name>externalsortinginjava</name>
<url>http://github.com/lemire/externalsortinginjava/</url>
<description>Sometimes, you want to sort large file without first loading them into memory. The solution is to use External Sorting. You divide the files into small blocks, sort each block in RAM, and then merge the result.
@@ -198,6 +198,6 @@
<connection>scm:git:git at github.com:lemire/externalsortinginjava.git</connection>
<url>scm:git:git at github.com:lemire/externalsortinginjava.git</url>
<developerConnection>scm:git:git at github.com:lemire/externalsortinginjava.git</developerConnection>
- <tag>externalsortinginjava-0.2.4</tag>
+ <tag>externalsortinginjava-0.2.5</tag>
</scm>
</project>
=====================================
src/main/java/com/google/code/externalsorting/ExternalSort.java
=====================================
@@ -434,6 +434,23 @@ public class ExternalSort {
output);
}
+ /**
+ * This sorts a file (input) to an output file (output) using customized comparator
+ *
+ * @param input source file
+ *
+ * @param output output file
+ *
+ * @param cmp The {@link Comparator} to use to compare
+ * {@link String}s.
+ * @throws IOException generic IO exception
+ */
+ public static void sort(final File input, final File output, final Comparator<String> cmp)
+ throws IOException {
+ ExternalSort.mergeSortedFiles(ExternalSort.sortInBatch(input),
+ output, cmp);
+ }
+
/**
* Sort a list and save it to a temporary file
*
View it on GitLab: https://salsa.debian.org/java-team/libexternalsortinginjava-java/compare/0817d910119deebc648c54236df719344d6f98ee...21c2b2ca981046d0784b55d66a59e64969eb029b
--
View it on GitLab: https://salsa.debian.org/java-team/libexternalsortinginjava-java/compare/0817d910119deebc648c54236df719344d6f98ee...21c2b2ca981046d0784b55d66a59e64969eb029b
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/20190112/96d76eac/attachment.html>
More information about the pkg-java-commits
mailing list