From 428c66acba47e5eeb89d95e0a3b3dd52768bb10a Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 24 Feb 2016 16:21:31 +0000
Subject: [PATCH] OPENDJ-2689 Code cleanup
---
opendj-sdk/opendj-rest2ldap/pom.xml | 3 +--
opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java | 27 +++++++++++++--------------
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java b/opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
index 336b2ce..19adfc0 100644
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
+++ b/opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
@@ -125,20 +125,6 @@
}
- private String getLocalScmRootPath(final File basedir) throws ScmException {
- final Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(basedir, "rev-parse");
- cl.addArguments(new String[] { "--show-toplevel" });
-
- final StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
- final StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
- final ScmLogger dummyLogger = new ScmLogDispatcher();
-
- final int exitCode = GitCommandLineUtils.execute(cl, stdout, stderr, dummyLogger);
- return exitCode == 0 ? stdout.getOutput().trim().replace(" ", "%20")
- : basedir.getPath();
- }
-
-
/** The string representation of the current year. */
Integer currentYear = Calendar.getInstance().get(Calendar.YEAR);
@@ -224,6 +210,19 @@
}
}
+ private String getLocalScmRootPath(final File basedir) throws ScmException {
+ final Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(basedir, "rev-parse");
+ cl.addArguments(new String[] { "--show-toplevel" });
+
+ final StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
+ final StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
+ final ScmLogger dummyLogger = new ScmLogDispatcher();
+
+ final int exitCode = GitCommandLineUtils.execute(cl, stdout, stderr, dummyLogger);
+ return exitCode == 0 ? stdout.getOutput().trim().replace(" ", "%20")
+ : basedir.getPath();
+ }
+
private void ensureCommandSuccess(final ScmResult result, final String cmd) throws MojoFailureException {
if (!result.isSuccess()) {
final String message = "Impossible to perform scm " + cmd + " command because " + result.getCommandOutput();
diff --git a/opendj-sdk/opendj-rest2ldap/pom.xml b/opendj-sdk/opendj-rest2ldap/pom.xml
index 85262a3..43490d9 100644
--- a/opendj-sdk/opendj-rest2ldap/pom.xml
+++ b/opendj-sdk/opendj-rest2ldap/pom.xml
@@ -12,7 +12,7 @@
Header, with the fields enclosed by brackets [] replaced by your own identifying
information: "Portions Copyright [year] [name of copyright owner]".
- Copyright 2012-2015 ForgeRock AS.
+ Copyright 2012-2016 ForgeRock AS.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,6 @@
<packaging>bundle</packaging>
<properties>
- <checkstyleHeaderLocation>org/forgerock/checkstyle/default-java-header</checkstyleHeaderLocation>
<opendj.osgi.import.additional>
org.forgerock.opendj.*;provide:=true,
org.forgerock.json.*;provide:=true
--
Gitblit v1.10.0