Bug#680468: netbeans: Please support building with mingw-w64 instead of mingw32

2012-07-05 Thread Stephen Kitt 
Package: netbeans
Version: 7.0.1+dfsg1-5
Severity: wishlist
Tags: patch

Dear Maintainer,

We're working on moving from mingw32 to mingw-w64 (see #648306). I
noticed recent versions of netbeans build-depend on mingw32; the
attached patch allows building with mingw-w64 instead. The changes
compared to mingw32 are three-fold:
* use i686-w64-mingw32 rather than i586-mingw32msvc;
* drop the -mno-cygwin flag which is no longer recognised;
* add a couple of missing #include stdio.h statements.

It would also be possible to drop the -m32 and -fPIC flags. In
addition, Win64 binaries could be built using g++-mingw-w64-x86-64 but
I haven't looked into that for netbeans.

mingw32 will still be in wheezy so there's no particular hurry.

Regards,

Stephen


-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable'), (200, 'unstable'), (1, 
'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-2-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -urN netbeans-7.0.1+dfsg1.orig/debian/control netbeans-7.0.1+dfsg1/debian/control
--- netbeans-7.0.1+dfsg1.orig/debian/control	2012-02-19 23:17:16.0 +0100
+++ netbeans-7.0.1+dfsg1/debian/control	2012-07-05 00:44:17.0 +0200
@@ -5,7 +5,7 @@
 Uploaders: Yulia Novozhilova yulia.novozhil...@sun.com,
  Andres Mejia mcita...@gmail.com, Andrew Ross ubu...@rossfamily.co.uk
 Build-Depends: debhelper (= 7.0.50~), javahelper, ant (= 1.7.0),
- ant-optional (= 1.7.0), default-jdk, mingw32, maven-repo-helper,
+ ant-optional (= 1.7.0), default-jdk, g++-mingw-w64-i686, maven-repo-helper,
  w3c-dtd-xhtml, javacc,
  libjemmy2-java, javahelp2, libbindex-java,
  libswing-layout-java (= 1.0.3), libjna-java (= 3.2.7-2~),
diff -urN netbeans-7.0.1+dfsg1.orig/debian/patches/netbeans-platform~windowslauncher.patch netbeans-7.0.1+dfsg1/debian/patches/netbeans-platform~windowslauncher.patch
--- netbeans-7.0.1+dfsg1.orig/debian/patches/netbeans-platform~windowslauncher.patch	2012-02-19 23:17:16.0 +0100
+++ netbeans-7.0.1+dfsg1/debian/patches/netbeans-platform~windowslauncher.patch	2012-07-05 22:51:19.0 +0200
@@ -1,16 +1,14 @@
-Use mingw32 to build the windows launchers. These are useful if the Netbeans platform is used to build 
+Use mingw-w64 to build the windows launchers. These are useful if the Netbeans platform is used to build 
 another application on Debian which you want to be able to run on a Windows system.
 
-Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/Makefile
-===
 libnb-platform-java-7.0+dfsg1.orig/o.n.bootstrap/launcher/windows/Makefile	2011-06-13 21:39:36.107758898 +0100
-+++ libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/Makefile	2011-06-14 23:46:57.388989761 +0100
+--- netbeans-7.0.1+dfsg1.orig/o.n.bootstrap/launcher/windows/Makefile
 netbeans-7.0.1+dfsg1/o.n.bootstrap/launcher/windows/Makefile
 @@ -34,7 +34,7 @@
  MKDIR=mkdir
  CP=cp
  CCADMIN=CCadmin
 -RANLIB=ranlib
-+RANLIB=i586-mingw32msvc-ranlib
++RANLIB=i686-w64-mingw32-ranlib
  
  # build
  build: .build-post
@@ -20,15 +18,13 @@
  nbexec.exe: nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
 -	windres.exe -Ocoff nbexec_exe.rc nbexec_exe.res
 -	g++ -s -mno-cygwin nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
-+	i586-mingw32msvc-windres -Ocoff nbexec_exe.rc nbexec_exe.res
-+	i586-mingw32msvc-g++ -s -mno-cygwin nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
++	i686-w64-mingw32-windres -Ocoff nbexec_exe.rc nbexec_exe.res
++	i686-w64-mingw32-g++ -s nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
  
  # clean
  clean: .clean-post
-Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
-===
 libnb-platform-java-7.0+dfsg1.orig/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk	2011-06-13 21:39:36.137760501 +0100
-+++ libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk	2011-06-14 23:47:19.998990498 +0100
+--- netbeans-7.0.1+dfsg1.orig/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
 netbeans-7.0.1+dfsg1/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
 @@ -11,12 +11,12 @@
  MKDIR=mkdir
  CP=cp
@@ -37,17 +33,34 @@
 -CC=gcc
 -CCC=g++
 -CXX=g++
-+RANLIB=i586-mingw32msvc-ranlib
-+CC=i586-mingw32msvc-gcc
-+CCC=i586-mingw32msvc-g++
-+CXX=i586-mingw32msvc-g++
++RANLIB=i686-w64-mingw32-ranlib
++CC=i686-w64-mingw32-gcc
++CCC=i686-w64-mingw32-g++
++CXX=i686-w64-mingw32-g++
  FC=
 -AS=as
-+AS=i586-mingw32msvc-as
++AS=i686-w64-mingw32-as
  
  # Macros
  CND_PLATFORM=Cygwin-Windows
-@@ -65,22 +65,22 @@
+@@ -41,8 +41,8 @@
+ CFLAGS=-m32
+ 
+ # CC Compiler Flags
+-CCFLAGS=-m32 -s -mno-cygwin
+-CXXFLAGS=-m32 -s -mno-cygwin
++CCFLAGS=-m32 -s

Bug#680468: netbeans still build-depends on mingw32

2014-05-26 Thread Stephen Kitt 
Control: reopen -1

Hi,

Thanks for fixing this in libnb-platform18-java. Given that this is part of a
tracking bug for mingw32's removal, I'm reopening the bug since netbeans
itself still build-depends on mingw32; from my perspective as long as that
remains the case the bug is still an issue.

Regards,

Stephen


signature.asc
Description: PGP signature
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#823509: maven-debian-helper: no longer finds apt-file with current version of maven

2016-05-05 Thread Stephen Kitt 
Package: maven-debian-helper
Version: 2.0.6
Severity: normal
Tags: patch

Dear maintainer,

mh_make looks for /usr/bin/mvnDebug, but the maven package no longer
contains that directly, at least not in a way apt-file understands.
The attached patch makes mh_make look for bin/mvnDebug instead.

Regards,

Stephen
diff -Nru maven-debian-helper-2.0.6/bin/mh_make maven-debian-helper-2.0.6+nmu1/bin/mh_make
--- maven-debian-helper-2.0.6/bin/mh_make	2015-11-12 16:08:43.0 +0100
+++ maven-debian-helper-2.0.6+nmu1/bin/mh_make	2016-05-05 15:26:57.0 +0200
@@ -134,7 +134,7 @@
 exit 1
 else
 res="ok"
-apt-file search /usr/bin/mvnDebug | grep maven > /dev/null || res="failed"
+apt-file search bin/mvnDebug | grep maven > /dev/null || res="failed"
 if [ $? != 0 ] || [ "$res" == "failed" ]; then
 echo "Warning: apt-file doesn't seem to be configured"
 apt-file update
diff -Nru maven-debian-helper-2.0.6/debian/changelog maven-debian-helper-2.0.6+nmu1/debian/changelog
--- maven-debian-helper-2.0.6/debian/changelog	2016-02-29 14:43:33.0 +0100
+++ maven-debian-helper-2.0.6+nmu1/debian/changelog	2016-05-05 15:27:34.0 +0200
@@ -1,3 +1,10 @@
+maven-debian-helper (2.0.6+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Support newer maven packages in the check for apt-file.
+
+ -- Stephen Kitt <sk...@debian.org>  Thu, 05 May 2016 15:27:09 +0200
+
 maven-debian-helper (2.0.6) unstable; urgency=medium
 
   * Team upload.
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[maven] 01/03: New upstream version 3.5.2

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch maven-3.5.2
in repository maven.

commit 136f2c158edddb85389dc3112a8403c0d0d3cfd8
Author: Stephen Kitt <sk...@debian.org>
Date:   Fri Feb 9 20:57:58 2018 +0100

New upstream version 3.5.2
---
 apache-maven/pom.xml   |   2 +-
 apache-maven/src/bin/mvn   |   8 ++
 .../src/conf/logging/simplelogger.properties   |   1 +
 maven-artifact/pom.xml |   2 +-
 maven-builder-support/pom.xml  |   2 +-
 maven-compat/pom.xml   |   2 +-
 maven-core/pom.xml |   2 +-
 .../maven/classrealm/DefaultClassRealmManager.java |   2 +-
 .../maven/plugin/DefaultBuildPluginManager.java|   5 +-
 .../classrealm/DefaultClassRealmManagerTest.java   | 101 -
 maven-embedder/pom.xml |   2 +-
 maven-model-builder/pom.xml|   2 +-
 maven-model/pom.xml|   2 +-
 maven-plugin-api/pom.xml   |   2 +-
 maven-repository-metadata/pom.xml  |   2 +-
 maven-resolver-provider/pom.xml|   2 +-
 maven-settings-builder/pom.xml |   2 +-
 maven-settings/pom.xml |   2 +-
 maven-slf4j-provider/pom.xml   |  22 +
 .../java/org/slf4j/impl/MavenSimpleLogger.java |   6 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java|  89 ++
 .../src/main/script/patch-slf4j-simple.groovy  |  53 ---
 pom.xml|   6 +-
 23 files changed, 124 insertions(+), 195 deletions(-)

diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index eb97543..ba28fa2 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.1
+3.5.2
   
 
   apache-maven
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index fa6164b..e3a5848 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -188,6 +188,14 @@ export MAVEN_PROJECTBASEDIR
 MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
 export MAVEN_CMD_LINE_ARGS
 
+# detect cygwin or mingw pseudo-terminal for Jansi
+# workaround for https://github.com/fusesource/jansi-native/issues/11
+if $cygwin || $mingw; then
+  if [ -t 1 ]; then
+MAVEN_OPTS="-Djansi.passthrough=true $MAVEN_OPTS"
+  fi
+fi
+
 exec "$JAVACMD" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \
diff --git a/apache-maven/src/conf/logging/simplelogger.properties 
b/apache-maven/src/conf/logging/simplelogger.properties
index 8dea717..64b331b 100644
--- a/apache-maven/src/conf/logging/simplelogger.properties
+++ b/apache-maven/src/conf/logging/simplelogger.properties
@@ -20,6 +20,7 @@ org.slf4j.simpleLogger.showDateTime=false
 org.slf4j.simpleLogger.showThreadName=false
 org.slf4j.simpleLogger.showLogName=false
 org.slf4j.simpleLogger.logFile=System.out
+org.slf4j.simpleLogger.cacheOutputStream=true
 org.slf4j.simpleLogger.levelInBrackets=true
 org.slf4j.simpleLogger.log.Sisu=info
 org.slf4j.simpleLogger.warnLevelString=WARNING
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 8a978a8..3772dd9 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.1
+3.5.2
   
 
   maven-artifact
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 02682ab..0b6328e 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.1
+3.5.2
   
 
   maven-builder-support
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 9d3542e..1935ebf 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.1
+3.5.2
   
 
   maven-compat
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 78a7dc6..8ab5bcc 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.1
+3.5.2
   
 
   maven-core
diff --git 
a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
 
b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index 013ab23..6ce1925 100644
--- 
a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ 
b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -120,7 +120,7 @@ public class DefaultClassRealmManager
 {
 try
 {
-ClassRealm classRealm = world.newRealm( realmId, 
PARENT_CLASSLOADE

[maven] 03/03: Upgrade to 3.5.2

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch maven-3.5.2
in repository maven.

commit 92eabd52aed3e582a77f3eae814cf85efbb74f05
Author: Stephen Kitt <sk...@debian.org>
Date:   Thu Feb 22 13:46:38 2018 +0100

Upgrade to 3.5.2
---
 debian/changelog |   7 +-
 debian/control   |   1 +
 debian/patches/slf4j-compatibility.patch | 148 +++
 3 files changed, 18 insertions(+), 138 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fb762f1..510b913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-maven (3.5.0-9) UNRELEASED; urgency=medium
+maven (3.5.2-1) UNRELEASED; urgency=medium
 
   * Team upload.
 
@@ -9,7 +9,10 @@ maven (3.5.0-9) UNRELEASED; urgency=medium
   * Use the 'debian' version of plexus-component-annotations
   * Removed the unused Maven rule for plexus-container-default
 
- -- Miguel Landaeta <nomad...@debian.org>  Sat, 11 Nov 2017 20:33:17 +
+  [ Stephen Kitt ]
+  * New upstream release.
+
+ -- Stephen Kitt <sk...@debian.org>  Thu, 22 Feb 2018 13:14:44 +0100
 
 maven (3.5.0-8) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 346a6f9..9b8c36f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends-Indep: junit4,
  libcommons-lang3-java (>= 3.4-2~),
  libcommons-logging-java,
  libeasymock-java,
+ libgeronimo-annotation-1.3-spec-java,
  libguice-java (>= 4.0),
  liblogback-java,
  libmaven-parent-java (>= 27),
diff --git a/debian/patches/slf4j-compatibility.patch 
b/debian/patches/slf4j-compatibility.patch
index 2615a59..da8d6dd 100644
--- a/debian/patches/slf4j-compatibility.patch
+++ b/debian/patches/slf4j-compatibility.patch
@@ -15,7 +15,7 @@ Bug: https://github.com/apache/maven/pull/118
org.apache.maven.shared
maven-shared-utils
  
-@@ -49,68 +54,36 @@
+@@ -49,52 +54,35 @@
  

  
@@ -34,16 +34,14 @@ Bug: https://github.com/apache/maven/pull/118
 -  false
 -  
${project.build.directory}/generated-sources/slf4j-simple
 -  org/slf4j/impl/*.java
+-  org/slf4j/impl/StaticLoggerBinder*
 -
 -  
 -
-+maven-shade-plugin
-+3.0.0
- 
-   
+-
+-  
 -unzip-slf4j-simple
-+package
- 
+-
 -  unpack
 -
 -  
@@ -53,11 +51,14 @@ Bug: https://github.com/apache/maven/pull/118
 -org.codehaus.mojo
 -build-helper-maven-plugin
 -1.12
--
--  
++maven-shade-plugin
++3.0.0
+ 
+   
 -add-slf4j-simple
 -generate-sources
--
++package
+ 
 -  add-source
 +  shade
  
@@ -65,23 +66,6 @@ Bug: https://github.com/apache/maven/pull/118
 -  
 -
${project.build.directory}/generated-sources/slf4j-simple
 -  
--
--  
--
--  
--  
--org.codehaus.gmaven
--groovy-maven-plugin
--2.0
--
--  
--patch-slf4j-simple
--process-sources
--
--  execute
--
--
--  
${project.basedir}/src/main/script/patch-slf4j-simple.groovy
 +  
 +
 +  org.slf4j:slf4j-simple
@@ -103,118 +87,10 @@ Bug: https://github.com/apache/maven/pull/118

 -
 \ No newline at end of file
-+
 +
 a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
-+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
-@@ -56,8 +56,13 @@
- }
- 
- @Override
--protected void renderThrowable( Throwable t, PrintStream stream )
-+protected void writeThrowable( Throwable t, PrintStream stream )
- {
-+if ( t == null )
-+{
-+return;
-+}
-+
- stream.print( buffer().failure( t.getClass().getName() ) );
- if ( t.getMessage() != null )
- {
 /dev/null
-+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
-@@ -0,0 +1,87 @@
-+package org.slf4j.impl;
-+
-+/*
-+ * Licensed to the Apache Software Foundation (ASF) under one
-+ * or more contributor license agreements.  See the NOTICE file
-+ * distributed with this work for additional information
-+ * regarding copyright ownership.  The ASF licenses this file
-+ * to you under the Apache License, Version 2.0 (the
-+ * "License"); you may not use this file except in compliance
-+ * with the License.  You may obtain a copy of the License at
-+ *
-+ *   http://www.apache.org/

[maven] 02/03: Merge tag 'upstream/3.5.2'

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch maven-3.5.2
in repository maven.

commit 96d257cf062fcadaf0bb042e8a9df55d5ad97a6a
Merge: 26e3963 136f2c1
Author: Stephen Kitt <sk...@debian.org>
Date:   Fri Feb 9 20:58:01 2018 +0100

Merge tag 'upstream/3.5.2'

Upstream version 3.5.2

 Jenkinsfile|   2 +-
 apache-maven/pom.xml   |   2 +-
 apache-maven/src/bin/mvn   |  16 +-
 apache-maven/src/bin/mvn.cmd   |   7 +-
 .../src/conf/logging/simplelogger.properties   |   5 +-
 doap_Maven.rdf |  11 +
 maven-artifact/pom.xml |   2 +-
 .../artifact/versioning/ComparableVersion.java |  15 +-
 maven-builder-support/pom.xml  |   6 +-
 maven-compat/pom.xml   |  12 +-
 .../metadata/MetadataResolutionResult.java |   2 +-
 maven-core/pom.xml |  26 +-
 .../java/org/apache/maven/RepositoryUtils.java |   7 +-
 .../internal/DefaultLifecyclePluginAnalyzer.java   |  10 +-
 .../internal/LifecycleDependencyResolver.java  |  34 +-
 .../maven/plugin/DefaultProjectArtifactsCache.java | 256 
 .../apache/maven/plugin/ProjectArtifactsCache.java |  90 +++
 .../DefaultProjectDependenciesResolver.java|   5 +
 .../main/resources/META-INF/maven/extension.xml|   8 +
 maven-embedder/pom.xml |  41 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   | 113 +---
 .../transfer/AbstractMavenTransferListener.java|  31 +-
 .../cli/transfer/Slf4jMavenTransferListener.java   |  31 +-
 maven-embedder/src/site/apt/index.apt.vm   |   3 +-
 .../java/org/apache/maven/cli/MavenCliTest.java|  86 ++-
 maven-model-builder/pom.xml|   3 +-
 .../model/validation/DefaultModelValidator.java|  72 ++-
 .../validation/DefaultModelValidatorTest.java  |  61 +-
 ...-dependency-metaversions-latest-and-release.xml |  38 ++
 .../poms/validation/raw-model/self-referencing.xml |  47 +-
 maven-model/pom.xml|   4 +-
 maven-model/src/main/mdo/maven.mdo | 667 -
 maven-plugin-api/pom.xml   |  12 +-
 maven-repository-metadata/pom.xml  |   2 +-
 maven-resolver-provider/pom.xml|  16 +-
 .../internal/ArtifactDescriptorReaderDelegate.java |   6 +-
 .../internal/DefaultArtifactDescriptorReader.java  |  13 +-
 .../internal/DefaultVersionRangeResolver.java  |   9 +-
 .../internal/DefaultVersionResolver.java   |   9 +-
 .../internal/SnapshotMetadataGeneratorFactory.java |   7 +-
 .../internal/VersionsMetadataGeneratorFactory.java |   7 +-
 maven-settings-builder/pom.xml |   2 +-
 maven-settings/pom.xml |   2 +-
 maven-slf4j-provider/pom.xml   |  22 +-
 .../java/org/slf4j/impl/MavenSimpleLogger.java |   6 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java|  89 +++
 .../src/main/script/patch-slf4j-simple.groovy  |  53 --
 pom.xml|  34 +-
 48 files changed, 1024 insertions(+), 978 deletions(-)

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven] branch maven-3.5.2 created (now 92eabd5)

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a change to branch maven-3.5.2
in repository maven.

at  92eabd5   Upgrade to 3.5.2

This branch includes the following new commits:

   new  136f2c1   New upstream version 3.5.2
   new  96d257c   Merge tag 'upstream/3.5.2'
   new  92eabd5   Upgrade to 3.5.2

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.


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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven] branch maven-3.5.2 created (now 8f9e43e)

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a change to branch maven-3.5.2
in repository maven.

at  8f9e43e   Upgrade to 3.5.2

This branch includes the following new commits:

   new  96d257c   Merge tag 'upstream/3.5.2'
   new  8f9e43e   Upgrade to 3.5.2

The 2 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.


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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven] 02/02: Upgrade to 3.5.2

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch maven-3.5.2
in repository maven.

commit 8f9e43eb1234d122e3eb7ebaa10720977b2f1ff8
Author: Stephen Kitt <sk...@debian.org>
Date:   Thu Feb 22 13:46:38 2018 +0100

Upgrade to 3.5.2

This involves adding libgeronimo-annotation-1.3-spec-java to provide
jsr250-api.jar.
---
 debian/changelog |   7 +-
 debian/control   |   1 +
 debian/maven.links   |   1 +
 debian/patches/slf4j-compatibility.patch | 148 +++
 4 files changed, 19 insertions(+), 138 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fb762f1..510b913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-maven (3.5.0-9) UNRELEASED; urgency=medium
+maven (3.5.2-1) UNRELEASED; urgency=medium
 
   * Team upload.
 
@@ -9,7 +9,10 @@ maven (3.5.0-9) UNRELEASED; urgency=medium
   * Use the 'debian' version of plexus-component-annotations
   * Removed the unused Maven rule for plexus-container-default
 
- -- Miguel Landaeta <nomad...@debian.org>  Sat, 11 Nov 2017 20:33:17 +
+  [ Stephen Kitt ]
+  * New upstream release.
+
+ -- Stephen Kitt <sk...@debian.org>  Thu, 22 Feb 2018 13:14:44 +0100
 
 maven (3.5.0-8) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 346a6f9..9b8c36f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends-Indep: junit4,
  libcommons-lang3-java (>= 3.4-2~),
  libcommons-logging-java,
  libeasymock-java,
+ libgeronimo-annotation-1.3-spec-java,
  libguice-java (>= 4.0),
  liblogback-java,
  libmaven-parent-java (>= 27),
diff --git a/debian/maven.links b/debian/maven.links
index 3c52552..233434e 100644
--- a/debian/maven.links
+++ b/debian/maven.links
@@ -12,6 +12,7 @@
 /usr/share/java/jansi.jar
/usr/share/maven/lib/jansi.jar
 /usr/share/java/atinject-jsr330-api-1.0.jar  
/usr/share/maven/lib/javax.inject.jar
 /usr/share/java/jcl-over-slf4j.jar   
/usr/share/maven/lib/jcl-over-slf4j.jar
+/usr/share/java/geronimo-annotation-1.3-spec.jar 
/usr/share/maven/lib/jsr250-api.jar
 /usr/share/java/maven-resolver-api.jar   
/usr/share/maven/lib/maven-resolver-api.jar
 /usr/share/java/maven-resolver-connector-basic.jar   
/usr/share/maven/lib/maven-resolver-connector-basic.jar
 /usr/share/java/maven-resolver-impl.jar  
/usr/share/maven/lib/maven-resolver-impl.jar
diff --git a/debian/patches/slf4j-compatibility.patch 
b/debian/patches/slf4j-compatibility.patch
index 2615a59..da8d6dd 100644
--- a/debian/patches/slf4j-compatibility.patch
+++ b/debian/patches/slf4j-compatibility.patch
@@ -15,7 +15,7 @@ Bug: https://github.com/apache/maven/pull/118
org.apache.maven.shared
maven-shared-utils
  
-@@ -49,68 +54,36 @@
+@@ -49,52 +54,35 @@
  

  
@@ -34,16 +34,14 @@ Bug: https://github.com/apache/maven/pull/118
 -  false
 -  
${project.build.directory}/generated-sources/slf4j-simple
 -  org/slf4j/impl/*.java
+-  org/slf4j/impl/StaticLoggerBinder*
 -
 -  
 -
-+maven-shade-plugin
-+3.0.0
- 
-   
+-
+-  
 -unzip-slf4j-simple
-+package
- 
+-
 -  unpack
 -
 -  
@@ -53,11 +51,14 @@ Bug: https://github.com/apache/maven/pull/118
 -org.codehaus.mojo
 -build-helper-maven-plugin
 -1.12
--
--  
++maven-shade-plugin
++3.0.0
+ 
+   
 -add-slf4j-simple
 -generate-sources
--
++package
+ 
 -  add-source
 +  shade
  
@@ -65,23 +66,6 @@ Bug: https://github.com/apache/maven/pull/118
 -  
 -
${project.build.directory}/generated-sources/slf4j-simple
 -  
--
--  
--
--  
--  
--org.codehaus.gmaven
--groovy-maven-plugin
--2.0
--
--  
--patch-slf4j-simple
--process-sources
--
--  execute
--
--
--  
${project.basedir}/src/main/script/patch-slf4j-simple.groovy
 +  
 +
 +  org.slf4j:slf4j-simple
@@ -103,118 +87,10 @@ Bug: https://github.com/apache/maven/pull/118

 -
 \ No newline at end of file
-+
 +
 a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
-+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
-@@ -56,8 +56,13 @@
- }
- 
- @Ov

[maven] 01/02: Merge tag 'upstream/3.5.2'

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch maven-3.5.2
in repository maven.

commit 96d257cf062fcadaf0bb042e8a9df55d5ad97a6a
Merge: 26e3963 136f2c1
Author: Stephen Kitt <sk...@debian.org>
Date:   Fri Feb 9 20:58:01 2018 +0100

Merge tag 'upstream/3.5.2'

Upstream version 3.5.2

 Jenkinsfile|   2 +-
 apache-maven/pom.xml   |   2 +-
 apache-maven/src/bin/mvn   |  16 +-
 apache-maven/src/bin/mvn.cmd   |   7 +-
 .../src/conf/logging/simplelogger.properties   |   5 +-
 doap_Maven.rdf |  11 +
 maven-artifact/pom.xml |   2 +-
 .../artifact/versioning/ComparableVersion.java |  15 +-
 maven-builder-support/pom.xml  |   6 +-
 maven-compat/pom.xml   |  12 +-
 .../metadata/MetadataResolutionResult.java |   2 +-
 maven-core/pom.xml |  26 +-
 .../java/org/apache/maven/RepositoryUtils.java |   7 +-
 .../internal/DefaultLifecyclePluginAnalyzer.java   |  10 +-
 .../internal/LifecycleDependencyResolver.java  |  34 +-
 .../maven/plugin/DefaultProjectArtifactsCache.java | 256 
 .../apache/maven/plugin/ProjectArtifactsCache.java |  90 +++
 .../DefaultProjectDependenciesResolver.java|   5 +
 .../main/resources/META-INF/maven/extension.xml|   8 +
 maven-embedder/pom.xml |  41 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   | 113 +---
 .../transfer/AbstractMavenTransferListener.java|  31 +-
 .../cli/transfer/Slf4jMavenTransferListener.java   |  31 +-
 maven-embedder/src/site/apt/index.apt.vm   |   3 +-
 .../java/org/apache/maven/cli/MavenCliTest.java|  86 ++-
 maven-model-builder/pom.xml|   3 +-
 .../model/validation/DefaultModelValidator.java|  72 ++-
 .../validation/DefaultModelValidatorTest.java  |  61 +-
 ...-dependency-metaversions-latest-and-release.xml |  38 ++
 .../poms/validation/raw-model/self-referencing.xml |  47 +-
 maven-model/pom.xml|   4 +-
 maven-model/src/main/mdo/maven.mdo | 667 -
 maven-plugin-api/pom.xml   |  12 +-
 maven-repository-metadata/pom.xml  |   2 +-
 maven-resolver-provider/pom.xml|  16 +-
 .../internal/ArtifactDescriptorReaderDelegate.java |   6 +-
 .../internal/DefaultArtifactDescriptorReader.java  |  13 +-
 .../internal/DefaultVersionRangeResolver.java  |   9 +-
 .../internal/DefaultVersionResolver.java   |   9 +-
 .../internal/SnapshotMetadataGeneratorFactory.java |   7 +-
 .../internal/VersionsMetadataGeneratorFactory.java |   7 +-
 maven-settings-builder/pom.xml |   2 +-
 maven-settings/pom.xml |   2 +-
 maven-slf4j-provider/pom.xml   |  22 +-
 .../java/org/slf4j/impl/MavenSimpleLogger.java |   6 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java|  89 +++
 .../src/main/script/patch-slf4j-simple.groovy  |  53 --
 pom.xml|  34 +-
 48 files changed, 1024 insertions(+), 978 deletions(-)

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven] branch maven-3.5.2 deleted (was 92eabd5)

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a change to branch maven-3.5.2
in repository maven.

   was  92eabd5   Upgrade to 3.5.2

This change permanently discards the following revisions:

  discards  92eabd5   Upgrade to 3.5.2
  discards  96d257c   Merge tag 'upstream/3.5.2'

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Re: [maven] 03/03: Upgrade to 3.5.2

2018-02-22 Thread Stephen Kitt 
On Thu, 22 Feb 2018 15:46:34 +0100, Emmanuel Bourg <ebo...@apache.org> wrote:
> Le 22/02/2018 à 14:54, Stephen Kitt a écrit :
> > diff --git a/debian/control b/debian/control
> > index 346a6f9..9b8c36f 100644
> > --- a/debian/control
> > +++ b/debian/control
> > @@ -10,6 +10,7 @@ Build-Depends-Indep: junit4,
> >   libcommons-lang3-java (>= 3.4-2~),
> >   libcommons-logging-java,
> >   libeasymock-java,
> > + libgeronimo-annotation-1.3-spec-java,
> >   libguice-java (>= 4.0),
> >   liblogback-java,
> >   libmaven-parent-java (>= 27),  
> 
> You also need a symlink for this dependency in debian/maven.links.
> When I attempted the Maven 3.5.1 upgrade I added this:
[...]

Done, thanks! If you think this is ready to go, I can take care of uploading
the package...

Regards,

Stephen


pgp5go829dESV.pgp
Description: OpenPGP digital signature
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[maven] branch maven-3.5.2 updated (8f9e43e -> 16468f7)

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a change to branch maven-3.5.2
in repository maven.

  from  8f9e43e   Upgrade to 3.5.2
   new  1fc27d7   Install NOTICE in the binary packages
   new  16468f7   Release

The 2 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:
 debian/changelog| 5 +++--
 debian/libmaven3-core-java.docs | 1 +
 debian/maven.docs   | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 debian/libmaven3-core-java.docs
 create mode 100644 debian/maven.docs

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven] 01/01: pristine-tar data for maven_3.5.2.orig.tar.gz

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch pristine-tar
in repository maven.

commit 31b10e4a673329c0bec6a0f59f49a1e220f763a4
Author: Stephen Kitt <sk...@debian.org>
Date:   Fri Feb 9 20:58:01 2018 +0100

pristine-tar data for maven_3.5.2.orig.tar.gz
---
 maven_3.5.2.orig.tar.gz.delta | Bin 0 -> 1023396 bytes
 maven_3.5.2.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/maven_3.5.2.orig.tar.gz.delta b/maven_3.5.2.orig.tar.gz.delta
new file mode 100644
index 000..4d27134
Binary files /dev/null and b/maven_3.5.2.orig.tar.gz.delta differ
diff --git a/maven_3.5.2.orig.tar.gz.id b/maven_3.5.2.orig.tar.gz.id
new file mode 100644
index 000..ce5e30f
--- /dev/null
+++ b/maven_3.5.2.orig.tar.gz.id
@@ -0,0 +1 @@
+066f7460b58b7d3de968ba6e9fa34828cef7904a

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven] 02/02: Release

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository maven.

commit 16468f7380d64504d65db34f32b1589137ed60d5
Author: Stephen Kitt <sk...@debian.org>
Date:   Thu Feb 22 23:21:25 2018 +0100

Release
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d8fbf2..6ed678e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-maven (3.5.2-1) UNRELEASED; urgency=medium
+maven (3.5.2-1) unstable; urgency=medium
 
   * Team upload.
 
@@ -13,7 +13,7 @@ maven (3.5.2-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Install NOTICE in the binary packages.
 
- -- Stephen Kitt <sk...@debian.org>  Thu, 22 Feb 2018 13:14:44 +0100
+ -- Stephen Kitt <sk...@debian.org>  Thu, 22 Feb 2018 23:21:17 +0100
 
 maven (3.5.0-8) unstable; urgency=medium
 

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Accepted maven 3.5.2-1 (source) into unstable

2018-02-22 Thread Stephen Kitt 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Thu, 22 Feb 2018 23:21:17 +0100
Source: maven
Binary: libmaven3-core-java maven
Architecture: source
Version: 3.5.2-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
Changed-By: Stephen Kitt <sk...@debian.org>
Description:
 libmaven3-core-java - Core libraries for Maven 3
 maven  - Java software project management and comprehension tool
Changes:
 maven (3.5.2-1) unstable; urgency=medium
 .
   * Team upload.
 .
   [ Miguel Landaeta ]
   * Remove B-D on libplexus-classworlds2-java, it's not necessary anymore.
 .
   [ Emmanuel Bourg ]
   * Use the 'debian' version of plexus-component-annotations
   * Removed the unused Maven rule for plexus-container-default
 .
   [ Stephen Kitt ]
   * New upstream release.
   * Install NOTICE in the binary packages.
Checksums-Sha1:
 af49d1b6cc83f21efe7e563680e2bd6228381ab3 2880 maven_3.5.2-1.dsc
 3ba8ea777400dfdfde0da5ea2746b8bdc6e68551 1075422 maven_3.5.2.orig.tar.gz
 578ce6409ef035f3e171127cffe525dc75019f7d 15392 maven_3.5.2-1.debian.tar.xz
 dfb2103f096d15c693230fdd384e6faf713f92b9 15276 maven_3.5.2-1_source.buildinfo
Checksums-Sha256:
 f0f4373b39928b06fec0e0316a0b861735c055e017d2400ab54eab54b1bef129 2880 
maven_3.5.2-1.dsc
 e206591b765b421a2ef585b961c3beafe1f441bc4b2d683cceec241cb1304e66 1075422 
maven_3.5.2.orig.tar.gz
 1c863f3a7efe3bbbf9a6161d25636964ad768721b175ad0e310559a8f753b985 15392 
maven_3.5.2-1.debian.tar.xz
 36bfbc3bceb4a25ce92638953e73177d369404a1bd82f547ef711808e02fc829 15276 
maven_3.5.2-1_source.buildinfo
Files:
 ed2e99906862ffaced2d1a5a6a1a981a 2880 java optional maven_3.5.2-1.dsc
 2dbef4f5d98be7c7ed0bec45e661cbfd 1075422 java optional maven_3.5.2.orig.tar.gz
 9784a1c0aec3d9540ff0fd968a812a87 15392 java optional 
maven_3.5.2-1.debian.tar.xz
 3e3e857a9569b9c33a509184ec6efd73 15276 java optional 
maven_3.5.2-1_source.buildinfo

-BEGIN PGP SIGNATURE-

iQIzBAEBCgAdFiEEnPVX/hPLkMoq7x0ggNMC9Yhtg5wFAlqPQqMACgkQgNMC9Yht
g5wq6Q//ed8hXv1/k2g7/Uxm7bW0hHdtpXsc7DTsm+HuvFVorVGzb0ImNeLblzGN
AOkB9lvsgxK54lddw79KIjmn9WBFjAWL+BtDguzuwGJkjfSjXNtaYgknZmB7x5Uz
GkThn2YHSDYtg0pzFNINhLpo6rEzicYf/jYR7yg3inB+zyUGDcSVIG09pZL4GWYh
mTTbHTVSfC8n4siwHJtVC284zb5C9FNg/OhiI7Xpsu73RCAGOWaljRF7ciiNT+9q
jj4tRcI+DTrUVkNOmjXO2j1i0hAATsQDm9HYTFk85MemBBtqaDRYczNv+d8oECGw
nbDCanHd9ZabG95w/dOTNyHZs4+W78OKwIp7dLBGgcB/eFVYt09vi4c/q6fAwQCe
GAzXs25g4OzTt2e9PTJBBVfJ9n9vf3mzzTlkp9/uzVpLO9mEe2pYXtHKs2w+pZ+e
eClidb6qODShWNvP4FwIqidBTUA3FfBZO7fhuYef6zliMdlOcnC/FECFwI96VCmX
6ZGvMccqhtoSlBnl+a2EQwtkiBrqSQHGujwG0Luhi7dQ0IhM3f5Klg5F2zkjOVoQ
bt1LpjTpbKfvgCgqwANpZHial8WWNi2c3fEZwPQlGiJThA66ZEIweUv///ZwVi90
tbHBpWbVNri4P0TF2X23OACFigAuukfw+sizt6kCebiNZ8s88oU=
=hnS7
-END PGP SIGNATURE-


__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Re: [maven] 03/03: Upgrade to 3.5.2

2018-02-22 Thread Stephen Kitt 
On Thu, 22 Feb 2018 22:49:21 +0100, Emmanuel Bourg <ebo...@apache.org> wrote:
> Le 22/02/2018 à 18:53, Stephen Kitt a écrit :
> > Done, thanks! If you think this is ready to go, I can take care of
> > uploading the package...  
> 
> I tested quickly, the package builds fine and can rebuild itself
> afterward. This update doesn't seem to break Gradle this time, so it
> looks good to me. Enjoy your first Maven upload :)

Uploaded, thanks ;-). I changed the package to install NOTICE too, to
appease Lintian — I’m not convinced it’s necessary in this instance, but
I reckoned it wasn’t especially onerous and the safest long-term option.

Regards,

Stephen


pgpD2oHiEWIsx.pgp
Description: OpenPGP digital signature
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

[maven] 01/02: Install NOTICE in the binary packages

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository maven.

commit 1fc27d7945f3fbdd732d70c3a0dc8891457452bd
Author: Stephen Kitt <sk...@debian.org>
Date:   Thu Feb 22 23:21:05 2018 +0100

Install NOTICE in the binary packages
---
 debian/changelog| 1 +
 debian/libmaven3-core-java.docs | 1 +
 debian/maven.docs   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 510b913..8d8fbf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ maven (3.5.2-1) UNRELEASED; urgency=medium
 
   [ Stephen Kitt ]
   * New upstream release.
+  * Install NOTICE in the binary packages.
 
  -- Stephen Kitt <sk...@debian.org>  Thu, 22 Feb 2018 13:14:44 +0100
 
diff --git a/debian/libmaven3-core-java.docs b/debian/libmaven3-core-java.docs
new file mode 100644
index 000..6d5ee1d
--- /dev/null
+++ b/debian/libmaven3-core-java.docs
@@ -0,0 +1 @@
+NOTICE
diff --git a/debian/maven.docs b/debian/maven.docs
new file mode 100644
index 000..6d5ee1d
--- /dev/null
+++ b/debian/maven.docs
@@ -0,0 +1 @@
+NOTICE

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven] branch master updated (26e3963 -> 16468f7)

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a change to branch master
in repository maven.

  from  26e3963   Removed the unused Maven rule for plexus-container-default
  adds  4fb8a49   New upstream version 3.5.1
  adds  136f2c1   New upstream version 3.5.2
  adds  96d257c   Merge tag 'upstream/3.5.2'
  adds  8f9e43e   Upgrade to 3.5.2
   new  1fc27d7   Install NOTICE in the binary packages
   new  16468f7   Release

The 2 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:
 Jenkinsfile|   2 +-
 apache-maven/pom.xml   |   2 +-
 apache-maven/src/bin/mvn   |  16 +-
 apache-maven/src/bin/mvn.cmd   |   7 +-
 .../src/conf/logging/simplelogger.properties   |   5 +-
 debian/changelog   |   8 +-
 debian/control |   1 +
 debian/libmaven3-core-java.docs|   1 +
 debian/maven.docs  |   1 +
 debian/maven.links |   1 +
 debian/patches/slf4j-compatibility.patch   | 148 +
 doap_Maven.rdf |  11 +
 maven-artifact/pom.xml |   2 +-
 .../artifact/versioning/ComparableVersion.java |  15 +-
 maven-builder-support/pom.xml  |   6 +-
 maven-compat/pom.xml   |  12 +-
 .../metadata/MetadataResolutionResult.java |   2 +-
 maven-core/pom.xml |  26 +-
 .../java/org/apache/maven/RepositoryUtils.java |   7 +-
 .../internal/DefaultLifecyclePluginAnalyzer.java   |  10 +-
 .../internal/LifecycleDependencyResolver.java  |  34 +-
 ...ache.java => DefaultProjectArtifactsCache.java} |  95 ++-
 ...ifactsCache.java => ProjectArtifactsCache.java} |  31 +-
 .../DefaultProjectDependenciesResolver.java|   5 +
 .../main/resources/META-INF/maven/extension.xml|   8 +
 maven-embedder/pom.xml |  41 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   | 113 +---
 .../transfer/AbstractMavenTransferListener.java|  31 +-
 .../cli/transfer/Slf4jMavenTransferListener.java   |  31 +-
 maven-embedder/src/site/apt/index.apt.vm   |   3 +-
 .../java/org/apache/maven/cli/MavenCliTest.java|  86 ++-
 maven-model-builder/pom.xml|   3 +-
 .../model/validation/DefaultModelValidator.java|  72 ++-
 .../validation/DefaultModelValidatorTest.java  |  61 +-
 ...dependency-metaversions-latest-and-release.xml} |  13 +-
 .../poms/validation/raw-model/self-referencing.xml |  37 +-
 maven-model/pom.xml|   4 +-
 maven-model/src/main/mdo/maven.mdo | 667 -
 maven-plugin-api/pom.xml   |  12 +-
 maven-repository-metadata/pom.xml  |   2 +-
 maven-resolver-provider/pom.xml|  16 +-
 .../internal/ArtifactDescriptorReaderDelegate.java |   6 +-
 .../internal/DefaultArtifactDescriptorReader.java  |  13 +-
 .../internal/DefaultVersionRangeResolver.java  |   9 +-
 .../internal/DefaultVersionResolver.java   |   9 +-
 .../internal/SnapshotMetadataGeneratorFactory.java |   7 +-
 .../internal/VersionsMetadataGeneratorFactory.java |   7 +-
 maven-settings-builder/pom.xml |   2 +-
 maven-settings/pom.xml |   2 +-
 maven-slf4j-provider/pom.xml   |  22 +-
 .../java/org/slf4j/impl/MavenSimpleLogger.java |   6 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java|  89 +++
 .../src/main/script/patch-slf4j-simple.groovy  |  53 --
 pom.xml|  34 +-
 54 files changed, 752 insertions(+), 1155 deletions(-)
 create mode 100644 debian/libmaven3-core-java.docs
 create mode 100644 debian/maven.docs
 copy 
maven-core/src/main/java/org/apache/maven/plugin/{DefaultPluginArtifactsCache.java
 => DefaultProjectArtifactsCache.java} (57%)
 copy 
maven-core/src/main/java/org/apache/maven/plugin/{PluginArtifactsCache.java => 
ProjectArtifactsCache.java} (70%)
 copy 
maven-model-builder/src/test/resources/poms/validation/{bad-import-scope-type.xml
 => deprecated-dependency-metaversions-latest-and-release.xml} (85%)
 copy maven-embedder/src/examples/simple-project/pom.xml => 
maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml
 (58%)
 create mode 100644 
maven-slf4j-provider/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
 delete mode 100644 
maven-slf4j-provider/src/main/script/patch-slf4j-simple.groovy

-- 
Alioth's /usr/local/bin/git-commit-notice on

[maven] annotated tag debian/3.5.2-1 created (now 4a6bf0e)

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a change to annotated tag debian/3.5.2-1
in repository maven.

at  4a6bf0e   (tag)
   tagging  16468f7380d64504d65db34f32b1589137ed60d5 (commit)
  replaces  debian/3.5.0-8
 tagged by  Stephen Kitt
on  Thu Feb 22 23:21:47 2018 +0100

- Log -
maven Debian release 3.5.2-1
-BEGIN PGP SIGNATURE-

iQIzBAABCgAdFiEEnPVX/hPLkMoq7x0ggNMC9Yhtg5wFAlqPQnsACgkQgNMC9Yht
g5zQsg/9H7tFZkY4FZH0fhAnR2mFBQkISgi8VsEEVeHUUcbetkCh8fefcGGMmbUG
GX4pG9pxKmUfw57WCSYlGpeMOX+Z3xNrRriQx228npvoOcKjG0wrCNRgpeQFIpBD
jdGcM8njTE+RwQN1eQmiTbsQUqrfuB2b23cbvL1poOUSBj58RdKt8KHsnDyirx8k
eDjnoL74GB59/SVJxWCkmSvUzQX+dehOaH1TD+3qgNjCPpZFlUyECA8ApXW9OUF3
8Zl5pApRnxT2NKGCQBIZK74F2zKlEoy/LZ1pAteHWuyCzfJrsuGMvv5FJUrPrIr2
V1DX3v761wlyfuCoN/2/qimNuH0riGhgNU/rUZ0W4lCHXhmCKFIo5jXq8p9sPpML
KZ67ZZIgeCZdu8KyQu3GnQZKNcBjy7nO2NboijkcugjIbq8UVtUubr6uVQZ45+/4
DHHY1sQ32aKLW5Isd3g7xSHOZkyrgMpa2cAHm5W4+9enSXOz5lVRrduZDJ4tWdun
A7zIR2el4GDTDN+JuYgXV03g8I71NSEx+kd0pc/kKEuOi21U+kt/hY/oGH6zGx1z
Wt83FIEllMWCyZ1DYH/J1YQ1fdz5WaqjsWz7ynG0dino8ShhsZJxbe5c3y6xEdKp
Y3g7LMpy5HpuLIBuyvMcH2n6QC4CW/Xuu2YeKwkAAR6yg3x+FsU=
=1h56
-END PGP SIGNATURE-

Emmanuel Bourg (3):
  New upstream version 3.5.1
  Use the 'debian' version of plexus-component-annotations
  Removed the unused Maven rule for plexus-container-default

Miguel Landaeta (1):
  Remove B-D on libplexus-classworlds2-java

Stephen Kitt (5):
  New upstream version 3.5.2
  Merge tag 'upstream/3.5.2'
  Upgrade to 3.5.2
  Install NOTICE in the binary packages
  Release

---

No new revisions were added by this update.

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven] branch pristine-tar updated (91fe38b -> 31b10e4)

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a change to branch pristine-tar
in repository maven.

  from  91fe38b   pristine-tar data for maven_3.5.1.orig.tar.xz
   new  31b10e4   pristine-tar data for maven_3.5.2.orig.tar.gz

The 1 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:
 maven_3.5.2.orig.tar.gz.delta | Bin 0 -> 1023396 bytes
 maven_3.5.2.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 maven_3.5.2.orig.tar.gz.delta
 create mode 100644 maven_3.5.2.orig.tar.gz.id

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven] branch maven-3.5.2 deleted (was 16468f7)

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a change to branch maven-3.5.2
in repository maven.

   was  16468f7   Release

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven] annotated tag upstream/3.5.2 created (now 38ac653)

2018-02-22 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a change to annotated tag upstream/3.5.2
in repository maven.

at  38ac653   (tag)
   tagging  136f2c158edddb85389dc3112a8403c0d0d3cfd8 (commit)
  replaces  upstream/3.5.1
 tagged by  Stephen Kitt
on  Fri Feb 9 20:58:01 2018 +0100

- Log -
Upstream version 3.5.2

Stephen Kitt (1):
  New upstream version 3.5.2

---

No new revisions were added by this update.

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven-parent] 01/01: Pull from GitHub

2018-03-04 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository maven-parent.

commit 0b935bfe87a87fde5e2a8bdc4d5ab52a101c62f5
Author: Stephen Kitt <sk...@debian.org>
Date:   Sun Mar 4 19:33:20 2018 +0100

Pull from GitHub

Signed-off-by: Stephen Kitt <sk...@debian.org>
---
 debian/changelog   |  7 +++
 debian/orig-tar.sh | 10 --
 debian/watch   |  3 +--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8e9a09..d09f9d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-parent (27-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Update debian/watch to pull from GitHub.
+
+ -- Stephen Kitt <sk...@debian.org>  Sun, 04 Mar 2018 19:31:55 +0100
+
 maven-parent (27-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index af9816d..000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../maven-parent_$VERSION.orig.tar.gz
-DIR=maven-parent-$VERSION
-TAG=$(echo "maven-parent-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export http://svn.apache.org/repos/asf/maven/pom/tags/${TAG}/ $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
diff --git a/debian/watch b/debian/watch
index cdcd423..cc9d10d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
 opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
-  http://svn.apache.org/repos/asf/maven/pom/tags/ \
-  maven-parent-(\d.*)/ debian debian/orig-tar.sh
+  https://github.com/apache/maven-parent/releases 
.*/maven-parent-([\d\.]+).tar.gz

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven-parent] branch master updated (9fa6929 -> 0b935bf)

2018-03-04 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a change to branch master
in repository maven-parent.

  from  9fa6929   Exclude plexus-maven-plugin and plexus-component-metadata 
from the pom
   new  0b935bf   Pull from GitHub

The 1 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:
 debian/changelog   |  7 +++
 debian/orig-tar.sh | 10 --
 debian/watch   |  3 +--
 3 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100755 debian/orig-tar.sh

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven] 01/01: Update uploaders (closes: #889396)

2018-03-04 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository maven.

commit c05e4f4a584fe32980c7963cd8f28fe77e5ee84a
Author: Stephen Kitt <sk...@debian.org>
Date:   Sun Mar 4 18:30:53 2018 +0100

Update uploaders (closes: #889396)

Signed-off-by: Stephen Kitt <sk...@debian.org>
---
 debian/changelog | 8 
 debian/control   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b0431ce..65266d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maven (3.5.2-3) UNRELEASED; urgency=medium
+
+  * Remove Damien from the uploaders list; thanks for all the work over
+the years! (Closes: #889396.)
+  * Add myself to the uploaders.
+
+ -- Stephen Kitt <sk...@debian.org>  Sun, 04 Mar 2018 18:29:30 +0100
+
 maven (3.5.2-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index e72a323..8226caa 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: maven
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <draz...@debian.org>, Emmanuel Bourg 
<ebo...@apache.org>
+Uploaders: Emmanuel Bourg <ebo...@apache.org>, Stephen Kitt <sk...@debian.org>
 Build-Depends: debhelper (>= 11), default-jdk, maven-debian-helper
 Build-Depends-Indep: junit4,
  libcommons-cli-java (>= 1.4),

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[maven] branch master updated (4842f1f -> c05e4f4)

2018-03-04 Thread Stephen Kitt 
This is an automated email from the git hooks/post-receive script.

skitt pushed a change to branch master
in repository maven.

  from  4842f1f   Upload to unstable
   new  c05e4f4   Update uploaders (closes: #889396)

The 1 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:
 debian/changelog | 8 
 debian/control   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits