This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jdeb.
commit 89a9a24b9c12b27c67b8d75a11d2d23d69ad30fa Merge: d8404c2 8a33cbc Author: Emmanuel Bourg <[email protected]> Date: Mon Jan 18 14:21:55 2016 +0100 Merge tag 'upstream/1.4' .gitignore | 3 +- .travis.yml | 2 +- HISTORY.md | 52 +- README.md | 15 +- docs/ant.md | 16 + docs/maven.md | 125 ++++- pom.xml | 135 +++-- src/examples/maven/pom.xml | 8 +- src/it/extension/pom.xml | 23 + src/it/extension/src/deb/control/control | 7 + .../main/java/org/vafer/jdeb/examples/Main.java | 7 + src/it/extension/verify.groovy | 1 + src/it/pom-only/pom.xml | 1 + .../java/org/vafer/jdeb/ChangesFileBuilder.java | 160 +++--- src/main/java/org/vafer/jdeb/Compression.java | 162 +++--- src/main/java/org/vafer/jdeb/Console.java | 11 +- src/main/java/org/vafer/jdeb/ControlBuilder.java | 451 +++++++++------- src/main/java/org/vafer/jdeb/DataBuilder.java | 596 ++++++++++----------- src/main/java/org/vafer/jdeb/DataConsumer.java | 10 +- src/main/java/org/vafer/jdeb/DataProducer.java | 4 +- src/main/java/org/vafer/jdeb/DebMaker.java | 354 ++++++++++-- .../java/org/vafer/jdeb/PackagingException.java | 4 +- src/main/java/org/vafer/jdeb/ant/Data.java | 14 +- src/main/java/org/vafer/jdeb/ant/DebAntTask.java | 10 +- src/main/java/org/vafer/jdeb/ant/Link.java | 215 ++++---- src/main/java/org/vafer/jdeb/ant/Mapper.java | 12 +- src/main/java/org/vafer/jdeb/ant/TaskConsole.java | 17 +- .../java/org/vafer/jdeb/changes/ChangeSet.java | 5 +- .../org/vafer/jdeb/changes/ChangesProvider.java | 2 +- .../jdeb/changes/TextfileChangesProvider.java | 7 +- .../jdeb/debian/BinaryPackageControlFile.java | 20 +- .../java/org/vafer/jdeb/debian/ChangesFile.java | 33 +- .../java/org/vafer/jdeb/debian/ControlField.java | 258 +++++---- .../java/org/vafer/jdeb/debian/ControlFile.java | 109 +++- src/main/java/org/vafer/jdeb/mapping/LsMapper.java | 20 +- src/main/java/org/vafer/jdeb/mapping/Mapper.java | 4 +- .../java/org/vafer/jdeb/mapping/NullMapper.java | 2 +- .../java/org/vafer/jdeb/mapping/PermMapper.java | 38 +- .../org/vafer/jdeb/maven/AbstractPluginMojo.java | 47 -- src/main/java/org/vafer/jdeb/maven/Data.java | 99 ++-- src/main/java/org/vafer/jdeb/maven/DebMojo.java | 479 +++++++++++++---- src/main/java/org/vafer/jdeb/maven/Mapper.java | 47 +- .../vafer/jdeb/maven/MissingSourceBehavior.java | 3 +- .../java/org/vafer/jdeb/maven/MojoConsole.java | 17 +- .../vafer/jdeb/producers/AbstractDataProducer.java | 26 +- .../vafer/jdeb/producers/DataProducerArchive.java | 28 +- .../jdeb/producers/DataProducerDirectory.java | 49 +- .../org/vafer/jdeb/producers/DataProducerFile.java | 19 +- .../vafer/jdeb/producers/DataProducerFileSet.java | 37 +- .../vafer/jdeb/producers/DataProducerFiles.java | 56 ++ .../org/vafer/jdeb/producers/DataProducerLink.java | 18 +- .../jdeb/producers/DataProducerPathTemplate.java | 15 +- .../java/org/vafer/jdeb/producers/Producers.java | 105 ++++ .../java/org/vafer/jdeb/signing/PGPSigner.java | 325 +++++------ .../java/org/vafer/jdeb/utils/FilteredFile.java | 10 +- .../vafer/jdeb/utils/InformationInputStream.java | 2 +- .../vafer/jdeb/utils/InformationOutputStream.java | 4 +- .../org/vafer/jdeb/utils/MapVariableResolver.java | 4 +- .../vafer/jdeb/utils/PGPSignatureOutputStream.java | 54 ++ .../java/org/vafer/jdeb/utils/SymlinkUtils.java | 43 ++ src/main/java/org/vafer/jdeb/utils/Utils.java | 265 +++++++-- .../org/vafer/jdeb/utils/VariableResolver.java | 4 +- src/main/resources/META-INF/plexus/components.xml | 50 ++ src/test/java/org/vafer/jdeb/ArchiveVisitor.java | 60 +-- src/test/java/org/vafer/jdeb/ArchiveWalker.java | 207 +++---- .../java/org/vafer/jdeb/DataBuilderTestCase.java | 165 +++--- src/test/java/org/vafer/jdeb/DebMakerTestCase.java | 10 +- .../java/org/vafer/jdeb/EmptyDataProducer.java | 56 +- src/test/java/org/vafer/jdeb/NullConsole.java | 60 ++- .../org/vafer/jdeb/ant/AntSelectorTestCase.java | 2 +- .../org/vafer/jdeb/ant/DebAntTaskTestCase.java | 35 +- .../changes/TextfileChangesProviderTestCase.java | 2 +- .../org/vafer/jdeb/debian/ChangesFileTestCase.java | 4 +- .../vafer/jdeb/debian/ControlFieldTestCase.java | 84 ++- .../jdeb/debian/PackageControlFileTestCase.java | 53 +- .../org/vafer/jdeb/mapping/LsMapperTestCase.java | 2 +- .../java/org/vafer/jdeb/maven/DataTestCase.java | 2 +- .../jdeb/producers/DataProducerFilesTestCase.java | 114 ++++ .../DataProducerPathTemplateTestCase.java | 7 +- .../org/vafer/jdeb/signing/DebMakerTestCase.java | 113 ++++ .../org/vafer/jdeb/signing/PGPSignerTestCase.java | 24 +- .../org/vafer/jdeb/utils/FilteredFileTestCase.java | 11 +- .../jdeb/utils/InformationInputStreamTestCase.java | 2 +- .../java/org/vafer/jdeb/utils/UtilsTestCase.java | 55 +- src/test/resources/org/vafer/gpg/fingerprint.txt | 5 + src/test/resources/org/vafer/gpg/pubring.gpg | Bin 1182 -> 1567 bytes src/test/resources/org/vafer/gpg/secring.gpg | Bin 1331 -> 2086 bytes .../resources/org/vafer/jdeb/deb/control/control | 1 + src/test/resources/testbuild.xml | 14 + 89 files changed, 3746 insertions(+), 2061 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jdeb.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
