fix deprecated warnings

scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SimpleLocalizable.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2014, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.cli;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.kohsuke.args4j.Localizable;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.Locale;
+
+/**
+ * TODO create real implementation
+ *
+ * @author Sebastian Sdorra
+ */
+public class SimpleLocalizable implements Localizable
+{
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param message
+   */
+  public SimpleLocalizable(String message)
+  {
+    this.message = message;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param args
+   *
+   * @return
+   */
+  @Override
+  public String format(Object... args)
+  {
+    return message;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param locale
+   * @param args
+   *
+   * @return
+   */
+  @Override
+  public String formatWithLocale(Locale locale, Object... args)
+  {
+    return message;
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  private final String message;
+}

scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java

@@ -37,11 +37,15 @@ package sonia.scm.cli.cmd;
 
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
+import org.kohsuke.args4j.Localizable;
 import org.kohsuke.args4j.OptionDef;
+import org.kohsuke.args4j.spi.Messages;
 import org.kohsuke.args4j.spi.OptionHandler;
 import org.kohsuke.args4j.spi.Parameters;
 import org.kohsuke.args4j.spi.Setter;
 
+import sonia.scm.cli.SimpleLocalizable;
+
 /**
  *
  * @author Sebastian Sdorra
@@ -90,8 +94,9 @@ public class SubCommandOptionHandler extends OptionHandler<SubCommand>
     }
     else
     {
-      throw new CmdLineException(owner,
+      String msg = "command ".concat(name).concat(" not found");
-                                 "command ".concat(name).concat(" not found"));
+
+      throw new CmdLineException(owner, new SimpleLocalizable(msg));
     }
 
     return 1;

scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/TemplateSubCommand.java

@@ -120,7 +120,7 @@ public abstract class TemplateSubCommand extends SubCommand
    */
   protected void renderTemplate(Map<String, Object> env, String defaultTemplate)
   {
-    Configuration configuration = new Configuration();
+    Configuration configuration = new Configuration(Configuration.VERSION_2_3_20);
     Reader reader = null;
 
     try
@@ -143,11 +143,7 @@ public abstract class TemplateSubCommand extends SubCommand
 
       tpl.process(env, output);
     }
-    catch (TemplateException ex)
+    catch (TemplateException | IOException ex)
-    {
-      throw new ConfigurationException("could not render template", ex);
-    }
-    catch (IOException ex)
     {
       throw new ConfigurationException("could not render template", ex);
     }

scm-core/src/main/java/sonia/scm/repository/api/BundleCommandBuilder.java

@@ -36,9 +36,7 @@ package sonia.scm.repository.api;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.common.io.ByteSink;
-import com.google.common.io.ByteStreams;
 import com.google.common.io.Files;
-import com.google.common.io.OutputSupplier;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -164,15 +162,15 @@ public final class BundleCommandBuilder
    */
   private ByteSink asByteSink(final OutputStream outputStream)
   {
-    return ByteStreams.asByteSink(new OutputSupplier<OutputStream>()
+    return new ByteSink()
     {
 
       @Override
-      public OutputStream getOutput() throws IOException
+      public OutputStream openStream() throws IOException
       {
         return outputStream;
       }
-    });
+    };
   }
 
   //~--- fields ---------------------------------------------------------------

scm-core/src/main/java/sonia/scm/repository/api/UnbundleCommandBuilder.java

@@ -36,9 +36,7 @@ package sonia.scm.repository.api;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.common.io.ByteSource;
-import com.google.common.io.ByteStreams;
 import com.google.common.io.Files;
-import com.google.common.io.InputSupplier;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -184,15 +182,15 @@ public final class UnbundleCommandBuilder
    */
   private ByteSource asByteSource(final InputStream inputStream)
   {
-    return ByteStreams.asByteSource(new InputSupplier<InputStream>()
+    return new ByteSource()
     {
 
       @Override
-      public InputStream getInput() throws IOException
+      public InputStream openStream() throws IOException
       {
         return inputStream;
       }
-    });
+    };
   }
 
   /**