From 53397a4db36939857f363d6ab7ccf698da564895 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 22 Aug 2011 07:59:41 +0200 Subject: [PATCH] fix scmp:run classloading problem --- maven/pom.xml | 10 ---- .../sonia/scm/maven/AbstractBaseScmMojo.java | 2 - .../src/main/java/sonia/scm/maven/Util.java | 55 +++++++++++++++++++ 3 files changed, 55 insertions(+), 12 deletions(-) create mode 100644 maven/scm-maven-plugin/src/main/java/sonia/scm/maven/Util.java diff --git a/maven/pom.xml b/maven/pom.xml index 7a6de39124..84a30c92af 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -19,15 +19,5 @@ scm-plugin-archetype scm-maven-plugin - - - - - sonia.scm - scm-core - 1.7-SNAPSHOT - - - \ No newline at end of file diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java index d7a036a03d..b52f25eb22 100644 --- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java +++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java @@ -47,8 +47,6 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; -import sonia.scm.util.Util; - //~--- JDK imports ------------------------------------------------------------ import java.io.File; diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/Util.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/Util.java new file mode 100644 index 0000000000..ec2fa27087 --- /dev/null +++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/Util.java @@ -0,0 +1,55 @@ +/** + * Copyright (c) 2010, 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.maven; + +/** + * + * @author Sebastian Sdorra + */ +public class Util +{ + + /** + * Method description + * + * + * @param value + * + * @return + */ + public static boolean isEmpty(String value) + { + return (value == null) || (value.trim().length() == 0); + } +}