You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ge...@apache.org on 2018/05/24 18:00:47 UTC
oozie git commit: OOZIE-3178 ./bin/mkdistro.sh -Papache-release fails
due to javadoc errors (dbist13 via gezapeti)
Repository: oozie
Updated Branches:
refs/heads/master f9f6a87f8 -> 2805ab66f
OOZIE-3178 ./bin/mkdistro.sh -Papache-release fails due to javadoc errors (dbist13 via gezapeti)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/2805ab66
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/2805ab66
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/2805ab66
Branch: refs/heads/master
Commit: 2805ab66fb28114c7d3de892c0f6f317626cb65c
Parents: f9f6a87
Author: Gezapeti Cseh <ge...@apache.org>
Authored: Thu May 24 20:00:34 2018 +0200
Committer: Gezapeti Cseh <ge...@apache.org>
Committed: Thu May 24 20:00:34 2018 +0200
----------------------------------------------------------------------
bin/test-patch-09-javadoc | 24 +++++++++++++++++++-
.../apache/oozie/compression/CodecFactory.java | 2 +-
pom.xml | 2 +-
release-log.txt | 1 +
.../apache/oozie/tools/OozieDBExportCLI.java | 4 +---
.../apache/oozie/tools/OozieDBImportCLI.java | 4 +---
6 files changed, 28 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/2805ab66/bin/test-patch-09-javadoc
----------------------------------------------------------------------
diff --git a/bin/test-patch-09-javadoc b/bin/test-patch-09-javadoc
index 01ec9a4..2a16b0c 100755
--- a/bin/test-patch-09-javadoc
+++ b/bin/test-patch-09-javadoc
@@ -81,7 +81,7 @@ checkForWarnings() {
patchWarns=`grep '\[WARNING\]' ${REPORTDIR}/${TASKNAME}-patch.txt | awk '/Javadoc Warnings/,EOF' | grep warning | awk 'BEGIN {total = 0} {total += 1} END {print total}'`
newWarns=`expr $patchWarns - $cleanWarns`
if [[ $newWarns -le 0 ]] ; then
- REPORT+=("{color:green}+1{color} the patch does not seem to introduce new Javadoc warnings")
+ REPORT+=("{color:green}+1{color} the patch does not seem to introduce new Javadoc warning(s)")
newWarns=0
else
REPORT+=("{color:red}-1{color} the patch seems to introduce $newWarns new Javadoc warning(s)")
@@ -92,6 +92,22 @@ checkForWarnings() {
fi
}
###############################################################################
+checkForErrors() {
+ cleanErrs=`grep '\[ERROR\]' ${REPORTDIR}/${TASKNAME}-clean.txt | grep error | awk 'BEGIN {total = 0} {total += 1} END {print total}'`
+ patchErrs=`grep '\[ERROR\]' ${REPORTDIR}/${TASKNAME}-patch.txt | grep error | awk 'BEGIN {total = 0} {total += 1} END {print total}'`
+ newErrs=`expr $patchErrs - $cleanErrs`
+ if [[ $newErrs -le 0 ]] ; then
+ REPORT+=("{color:green}+1{color} the patch does not seem to introduce new Javadoc error(s)")
+ newErrs=0
+ else
+ REPORT+=("{color:red}-1{color} the patch seems to introduce $newErrs new Javadoc error(s)")
+ newErrs=1
+ fi
+ if [[ $cleanErrs != 0 ]] ; then
+ REPORT+=("{color:red}ERROR{color}: the current HEAD has $cleanErrs Javadoc error(s)")
+ fi
+}
+###############################################################################
parseArgs "$@"
@@ -109,6 +125,12 @@ case $OP in
else
echo "{color:red}-1 ${TASKNAME}{color}" >> $SUMMARYFILE
fi
+ checkForErrors
+ if [[ $newErrs == 0 ]] ; then
+ echo "{color:green}+1 ${TASKNAME}{color}" >> $SUMMARYFILE
+ else
+ echo "{color:red}-1 ${TASKNAME}{color}" >> $SUMMARYFILE
+ fi
for line in "${REPORT[@]}" ; do
echo ". ${line}" >> $SUMMARYFILE
done
http://git-wip-us.apache.org/repos/asf/oozie/blob/2805ab66/core/src/main/java/org/apache/oozie/compression/CodecFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/compression/CodecFactory.java b/core/src/main/java/org/apache/oozie/compression/CodecFactory.java
index c0f906e..ef9fb04 100644
--- a/core/src/main/java/org/apache/oozie/compression/CodecFactory.java
+++ b/core/src/main/java/org/apache/oozie/compression/CodecFactory.java
@@ -43,7 +43,7 @@ public class CodecFactory {
public static final String COMPRESSION_KEY_HEADER = "codec";
public static final String UTF_8_ENCODING = "UTF-8";
private static boolean isEnabled;
- private static XLog LOG = XLog.getLog(CodecFactory.class);;
+ private static XLog LOG = XLog.getLog(CodecFactory.class);
private static byte[] headerBytes;
/**
http://git-wip-us.apache.org/repos/asf/oozie/blob/2805ab66/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 87de3f1..0208047 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1633,7 +1633,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>3.0.0</version>
<configuration>
<additionalparam>${maven.javadoc.opts}</additionalparam>
</configuration>
http://git-wip-us.apache.org/repos/asf/oozie/blob/2805ab66/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index ce3f3cc..e142560 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.1.0 release (trunk - unreleased)
+OOZIE-3178 ./bin/mkdistro.sh -Papache-release fails due to javadoc errors (dbist13 via gezapeti)
OOZIE-2967 TestStatusTransitService.testBundleStatusCoordSubmitFails fails intermittently in Apache Oozie Core 5.0.0-SNAPSHOT (pbacsko)
OOZIE-3238 Flaky test TestStatusTransitService#testBundleStatusTransitWithLock (pbacsko via gezapeti, andras.piros)
OOZIE-3185 Upgrade org.apache.derby to 10.11.1.1 (PandaMonkey via andras.piros)
http://git-wip-us.apache.org/repos/asf/oozie/blob/2805ab66/tools/src/main/java/org/apache/oozie/tools/OozieDBExportCLI.java
----------------------------------------------------------------------
diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieDBExportCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieDBExportCLI.java
index ba74ef1..ac315f8 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieDBExportCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBExportCLI.java
@@ -41,12 +41,10 @@ import java.util.zip.ZipOutputStream;
/**
* This class provides the following functionality:
- * <p/>
* <ul>
* <li>Exports the data from the Oozie database to a specified target zip file</li>
* <li>This class uses the current oozie configuration in oozie-site.xml</li>
* </ul>
- * <p/>
*/
public class OozieDBExportCLI {
@@ -197,4 +195,4 @@ public class OozieDBExportCLI {
zipOutputStream.closeEntry();
return exported;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/oozie/blob/2805ab66/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
----------------------------------------------------------------------
diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
index f21fd3b..784782d 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
@@ -79,13 +79,11 @@ import static org.apache.oozie.tools.OozieDBExportCLI.OOZIEDB_WF_JSON;
/**
* This class provides the following functionality:
- * <p/>
* <ul>
* <li>imports the data from json files created by {@link OozieDBExportCLI} the specified target zip file</li>
* <li>this class uses the current Oozie configuration in {oozie-site.xml}</li>
* <li></li>
* </ul>
- * <p/>
*/
public class OozieDBImportCLI {
private static final String[] HELP_INFO = {
@@ -585,4 +583,4 @@ public class OozieDBImportCLI {
}
}
}
-}
\ No newline at end of file
+}