[maven-debian-helper] branch topic-maven3 updated (7651530 -> e168cdc)

Jakub Adam xhaakon-guest at moszumanska.debian.org
Sun Jun 8 17:14:29 UTC 2014


This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a change to branch topic-maven3
in repository maven-debian-helper.

  discards  7651530   Split java wrappers for Maven 2 and Maven 3
  discards  dce3446   Debhelper maven3 buildsystem
  discards  279021c   Add support for maven3 buildsystem
      adds  fb4effb   Updated the Maven dependency on maven-repo-helper (1.8.4)
      adds  201fc34   Added com.github.github:site-maven-plugin to the ignored plugins
      adds  f1065a3   Added org.codehaus.mojo:ianal-maven-plugin to the ignored plugins
      adds  c2dd1bb   Javadoc for GetPackageResult
      adds  42c62c4   Changed PackageScanner.addDocDependencies() to return a List instead of an ArrayList
      adds  93950e4   Added a test case for PackageScanner
      adds  b2883b5   Changed PackageScanner.searchPkg(File) to return null instead of throwing an exception when no package is found (broken since commit a16544f)
      adds  53d473f   Updated the poms for the next release (1.6.6)
      adds  e7ff0fe   Improved the detection of the documentation packages
      adds  25ad3a7   Removed PackageScanner.makeExecutable() and use File.setExecutable() instead
      adds  2543bb6   Changelog update
      adds  9884dbe   Fixing --- line length in README.source
      adds  fc88c69   Eliminated terminal blank for URL in debian/control
      adds  5262a3b   Added wagon-gitsite to the ignored extensions
      adds  9aa0892   Added com.mycila.maven-license-plugin:maven-license-plugin to the ignored plugins
      adds  507aa02   Added Steffen's changes to debian/changelog
      adds  25b2d9e   Added a header to orig-tar.svn.vm
      adds  17d65c4   Use the new methods in org.debian.maven.repo.Dependency to check the type of the artifacts (requires maven-repo-helper 1.8.5)
      adds  d8015cd   The version rule selected by default is now the symbolic 'debian' version The choices for the version rule are no longer reordered but the previous choice is still selected by default
      adds  15529a8   Made the print methods of UserInteraction private
      adds  4baee0d   Refactored the UserInteraction class Ask the question again if the response is not valid
      adds  d4717ce   Replaced LineNumberReader with BufferedReader
      adds  f3717ab   Minor simplification to org.debian.maven.Wrapper
      adds  0cc15ab   Fixed a typo in DependenciesSolver
      adds  73ca2ba   Ignore the dependencies provided by the JRE (JAF, JMX, JAXB, StAX)
      adds  a0eefa4   Changelog update
      adds  ff308b6   Made the static check methods package private in DebianDependency
      adds  a18f864   Simplifed equals() and hashCode() in DebianDependency since the fields are not null
      adds  5768846   Added more tests for DebianDependency
      adds  9dc97ae   Simplified DebianDependency and added some documentation
      adds  96ced93   Updated the format of the y/n questions in mh_make
      adds  e915020   The generated packages now depend on debhelper 9
      adds  032c579   Use XZ compression for the upstream tarball in the generated orig-tar.sh
      adds  389ffb3   Flush the output when asking a question
      adds  5b2b9de   The generated control file now specifies Standards-Version: 3.9.5 Standards-Version updated to 3.9.5 (no changes)
      adds  784d067   Minor style changes
      adds  144c30f   add libasm3-java to build-dep; closes #729771
      adds  04323d8   update changelog
      adds  bbf7ca5   Revert "add libasm3-java to build-dep; closes #729771"
      adds  3507ac3   Revert "update changelog"
      adds  f8e5365   freshen changelog date to prevent standards warp; prepare for upload
      adds  50f70b0   Turned POMOptions into a top level class
      adds  6503785   Fixed 3 NullPointerExceptions in InstallMojoTest
      adds  4728422   Improved the execution failure message in SysInstallMojo
      adds  0103700   Adapted the debian-maven-plugin tests to run on Windows
      adds  af3deb8   Mark the optional dependencies as suggested
      adds  4263826   Generate Vcs-* fields for Git
      adds  09a2ee1   Depend on maven-repo-helper >= 1.8.6
      adds  a18b280   Move to version 1.6.7
      adds  1a37ebf   Added com.googlecode.maven-gcu-plugin:maven-gcu-plugin to the ignored plugins
      adds  8c6ac35   Default value for the simple questions
      adds  c6f275b   Improved the package description (Closes: #704091)
      adds  6c82ed3   Do not add optional test dependencies to ${maven:OptionalDepends}
      adds  2512eb0   Minor fix for mh_make
      adds  b7ab331   Fixed mvn-debian when more than one binary package is defined
      adds  cf2b5ac   Upload to unstable
      adds  dde50bf   Use the --download-current-version uscan option in the generated debian/rules files
      adds  0634df1   Added com.google.code.maven-license-plugin:maven-license-plugin to the ignored plugins
       new  7d2d9b6   Add support for maven3 buildsystem
       new  35ebaa2   Debhelper maven3 buildsystem
       new  e168cdc   Split java wrappers for Maven 2 and Maven 3

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (7651530)
            \
             N -- N -- N   refs/heads/topic-maven3 (e168cdc)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/mh_make                                        |  14 +-
 bin/mvn-debian                                     |   2 +-
 debian-maven-plugin/pom.xml                        |   2 +-
 .../org/debian/maven/plugin/SysInstallMojo.java    |  36 +++--
 .../org/debian/maven/plugin/InstallMojoTest.java   |  37 +++--
 debian/changelog                                   |  58 +++++++
 debian/compat                                      |   2 +-
 debian/control                                     |  52 +++----
 maven-build-nodocs/pom.xml                         |   2 +-
 maven-debian-helper/pom.xml                        |   2 +-
 .../main/java/org/debian/maven/WrapperBase.java    |   5 +-
 maven-packager-utils/pom.xml                       |   2 +-
 .../debian/maven/packager/DebianDependencies.java  |   6 +-
 .../debian/maven/packager/DebianDependency.java    | 114 +++++++++-----
 .../debian/maven/packager/DependenciesSolver.java  | 158 +++++++++++++------
 .../maven/packager/GenerateDebianFilesMojo.java    |  42 +++--
 .../maven/packager/interaction/ChoiceQuestion.java |  77 ++++++++++
 .../packager/interaction/MultilineQuestion.java    |  52 +++++++
 .../maven/packager/interaction/Question.java       |  71 +++++++++
 .../maven/packager/interaction/SimpleQuestion.java |  48 ++++++
 .../maven/packager/interaction/YesNoQuestion.java  |  60 ++++++++
 .../maven/packager/util/GetPackageResult.java      |   9 ++
 .../org/debian/maven/packager/util/IOUtil.java     |   3 +-
 .../packager/util/IgnoreDependencyQuestions.java   |  64 ++++++--
 .../maven/packager/util/LicensesScanner.java       |  17 +--
 .../maven/packager/util/NoOutputHandler.java       |  26 ----
 .../debian/maven/packager/util/PackageScanner.java |  60 +++++---
 .../maven/packager/util/UserInteraction.java       | 169 ---------------------
 .../src/main/resources/README.source.vm            |   5 +-
 maven-packager-utils/src/main/resources/compat.vm  |   2 +-
 .../src/main/resources/control.ant.vm              |  10 +-
 maven-packager-utils/src/main/resources/control.vm |  16 +-
 .../src/main/resources/orig-tar.svn.vm             |   8 +-
 .../src/main/resources/rules.ant.vm                |   2 +-
 maven-packager-utils/src/main/resources/rules.vm   |   2 +-
 .../maven/packager/DebianDependencyTest.java       | 104 ++++++++++---
 .../maven/packager/DependenciesSolverTest.java     |   6 +-
 .../packager/interaction/ChoiceQuestionTest.java   | 133 ++++++++++++++++
 .../interaction/MultilineQuestionTest.java         |  49 ++++++
 .../packager/interaction/SimpleQuestionTest.java   |  42 +++++
 .../packager/interaction/YesNoQuestionTest.java    |  82 ++++++++++
 .../maven/packager/util/PackageScannerTest.java    |  46 ++++++
 pom.xml                                            |   4 +-
 43 files changed, 1232 insertions(+), 469 deletions(-)
 create mode 100644 maven-packager-utils/src/main/java/org/debian/maven/packager/interaction/ChoiceQuestion.java
 create mode 100644 maven-packager-utils/src/main/java/org/debian/maven/packager/interaction/MultilineQuestion.java
 create mode 100644 maven-packager-utils/src/main/java/org/debian/maven/packager/interaction/Question.java
 create mode 100644 maven-packager-utils/src/main/java/org/debian/maven/packager/interaction/SimpleQuestion.java
 create mode 100644 maven-packager-utils/src/main/java/org/debian/maven/packager/interaction/YesNoQuestion.java
 delete mode 100644 maven-packager-utils/src/main/java/org/debian/maven/packager/util/NoOutputHandler.java
 delete mode 100644 maven-packager-utils/src/main/java/org/debian/maven/packager/util/UserInteraction.java
 create mode 100644 maven-packager-utils/src/test/java/org/debian/maven/packager/interaction/ChoiceQuestionTest.java
 create mode 100644 maven-packager-utils/src/test/java/org/debian/maven/packager/interaction/MultilineQuestionTest.java
 create mode 100644 maven-packager-utils/src/test/java/org/debian/maven/packager/interaction/SimpleQuestionTest.java
 create mode 100644 maven-packager-utils/src/test/java/org/debian/maven/packager/interaction/YesNoQuestionTest.java
 create mode 100644 maven-packager-utils/src/test/java/org/debian/maven/packager/util/PackageScannerTest.java

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git



More information about the pkg-java-commits mailing list