[maven] 02/02: Upgrade to 3.5.2

Stephen Kitt skitt at moszumanska.debian.org
Thu Feb 22 17:52:28 UTC 2018


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 <skitt at 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 <nomadium at debian.org>  Sat, 11 Nov 2017 20:33:17 +0000
+  [ Stephen Kitt ]
+  * New upstream release.
+
+ -- Stephen Kitt <skitt at 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
        <groupId>org.apache.maven.shared</groupId>
        <artifactId>maven-shared-utils</artifactId>
      </dependency>
-@@ -49,68 +54,36 @@
+@@ -49,52 +54,35 @@
  
    <build>
      <plugins>
@@ -34,16 +34,14 @@ Bug: https://github.com/apache/maven/pull/118
 -              <overWrite>false</overWrite>
 -              <outputDirectory>${project.build.directory}/generated-sources/slf4j-simple</outputDirectory>
 -              <includes>org/slf4j/impl/*.java</includes>
+-              <excludes>org/slf4j/impl/StaticLoggerBinder*</excludes>
 -            </artifactItem>
 -          </artifactItems>
 -        </configuration>
-+        <artifactId>maven-shade-plugin</artifactId>
-+        <version>3.0.0</version>
-         <executions>
-           <execution>
+-        <executions>
+-          <execution>
 -            <id>unzip-slf4j-simple</id>
-+            <phase>package</phase>
-             <goals>
+-            <goals>
 -              <goal>unpack</goal>
 -            </goals>
 -          </execution>
@@ -53,11 +51,14 @@ Bug: https://github.com/apache/maven/pull/118
 -        <groupId>org.codehaus.mojo</groupId>
 -        <artifactId>build-helper-maven-plugin</artifactId>
 -        <version>1.12</version>
--        <executions>
--          <execution>
++        <artifactId>maven-shade-plugin</artifactId>
++        <version>3.0.0</version>
+         <executions>
+           <execution>
 -            <id>add-slf4j-simple</id>
 -            <phase>generate-sources</phase>
--            <goals>
++            <phase>package</phase>
+             <goals>
 -              <goal>add-source</goal>
 +              <goal>shade</goal>
              </goals>
@@ -65,23 +66,6 @@ Bug: https://github.com/apache/maven/pull/118
 -              <sources>
 -                <source>${project.build.directory}/generated-sources/slf4j-simple</source>
 -              </sources>
--            </configuration>
--          </execution>
--        </executions>
--      </plugin>
--      <plugin>
--        <groupId>org.codehaus.gmaven</groupId>
--        <artifactId>groovy-maven-plugin</artifactId>
--        <version>2.0</version>
--        <executions>
--          <execution>
--            <id>patch-slf4j-simple</id>
--            <phase>process-sources</phase>
--            <goals>
--              <goal>execute</goal>
--            </goals>
--            <configuration>
--              <source>${project.basedir}/src/main/script/patch-slf4j-simple.groovy</source>
 +              <artifactSet>
 +                <includes>
 +                  <include>org.slf4j:slf4j-simple</include>
@@ -103,118 +87,10 @@ Bug: https://github.com/apache/maven/pull/118
    </build>
 -</project>
 \ No newline at end of file
-+
 +</project>
---- 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/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing,
-+ * software distributed under the License is distributed on an
-+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-+ * KIND, either express or implied.  See the License for the
-+ * specific language governing permissions and limitations
-+ * under the License.
-+ */
-+
-+import org.slf4j.ILoggerFactory;
-+import org.slf4j.spi.LoggerFactoryBinder;
-+
-+/**
-+ * SLF4J LoggerFactoryBinder implementation using MavenSimpleLogger.
-+ * This class is part of the required classes used to specify an
-+ * SLF4J logger provider implementation.
-+ *
-+ * @since 3.5.0
-+ */
-+public final class StaticLoggerBinder implements LoggerFactoryBinder
-+{
-+    /**
-+     * Declare the version of the SLF4J API this implementation is compiled
-+     * against. The value of this field is usually modified with each release.
-+     */
-+    // to avoid constant folding by the compiler, this field must *not* be final
-+    public static String REQUESTED_API_VERSION = "1.7.25"; // !final
-+
-+    private static final String LOGGER_FACTORY_CLASS_STR = MavenSimpleLoggerFactory.class.getName();
-+
-+    /**
-+     * The unique instance of this class.
-+     */
-+    private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
-+
-+    /**
-+     * The ILoggerFactory instance returned by the {@link #getLoggerFactory}
-+     * method should always be the same object
-+     */
-+    private final ILoggerFactory loggerFactory;
-+
-+    /**
-+     * Private constructor to prevent instantiation
-+     */
-+    private StaticLoggerBinder()
-+    {
-+        loggerFactory = new MavenSimpleLoggerFactory();
-+    }
-+
-+    /**
-+     * Returns the singleton of this class.
-+     */
-+    public static StaticLoggerBinder getSingleton()
-+    {
-+        return SINGLETON;
-+    }
-+
-+    /**
-+     * Returns the factory.
-+     */
-+    @Override
-+    public ILoggerFactory getLoggerFactory()
-+    {
-+        return loggerFactory;
-+    }
-+
-+    /**
-+     * Returns the class name.
-+     */
-+    @Override
-+    public String getLoggerFactoryClassStr()
-+    {
-+        return LOGGER_FACTORY_CLASS_STR;
-+    }
-+}
 --- a/pom.xml
 +++ b/pom.xml
-@@ -593,6 +593,7 @@
+@@ -605,6 +605,7 @@
              <exclude>.maven/spy.log</exclude> <!-- hudson maven3 integration log -->
              <exclude>.java-version</exclude>
              <exclude>README.md</exclude>

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



More information about the pkg-java-commits mailing list