You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by di...@apache.org on 2021/02/08 09:32:24 UTC

[oozie] branch branch-5.2 updated (936b150 -> 879c8ce)

This is an automated email from the ASF dual-hosted git repository.

dionusos pushed a change to branch branch-5.2
in repository https://gitbox.apache.org/repos/asf/oozie.git.


    from 936b150  Fix hardwired version numbers in markdown files
     new b001220  Changed version to 5.2.1
     new c93c05e  OOZIE-3549 Add back support for truststore passwords (matijhs via asalamon74)
     new 95c4e62  OOZIE-3601 Upgrade quartz to 2.3.2 (dengliming via matijhs)
     new 879c8ce  Tmp folder fix (asasvari via gezapeti)

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 client/pom.xml                                        |  4 ++--
 core/pom.xml                                          |  4 ++--
 core/src/main/resources/oozie-default.xml             |  8 ++++++++
 distro/pom.xml                                        |  4 ++--
 docs/pom.xml                                          |  4 ++--
 docs/src/site/markdown/AG_Install.md                  |  3 ++-
 examples/pom.xml                                      |  4 ++--
 fluent-job/fluent-job-api/pom.xml                     |  4 ++--
 fluent-job/fluent-job-client/pom.xml                  |  4 ++--
 fluent-job/pom.xml                                    |  2 +-
 minitest/pom.xml                                      |  4 ++--
 pom.xml                                               |  4 ++--
 release-log.txt                                       |  5 +++++
 server/pom.xml                                        |  4 ++--
 .../org/apache/oozie/server/EmbeddedOozieServer.java  | 18 ++++++++++++++++++
 .../oozie/server/SSLServerConnectorFactory.java       |  2 +-
 .../apache/oozie/server/TestEmbeddedOozieServer.java  | 19 ++++++++++++++++++-
 .../oozie/server/TestSSLServerConnectorFactory.java   |  2 +-
 sharelib/distcp/pom.xml                               |  4 ++--
 sharelib/git/pom.xml                                  |  4 ++--
 sharelib/hcatalog/pom.xml                             |  4 ++--
 sharelib/hive/pom.xml                                 |  4 ++--
 sharelib/hive2/pom.xml                                |  4 ++--
 sharelib/oozie/pom.xml                                |  4 ++--
 sharelib/pig/pom.xml                                  |  4 ++--
 sharelib/pom.xml                                      |  4 ++--
 sharelib/spark/pom.xml                                |  4 ++--
 sharelib/sqoop/pom.xml                                |  4 ++--
 sharelib/streaming/pom.xml                            |  4 ++--
 tools/pom.xml                                         |  4 ++--
 .../java/org/apache/oozie/tools/OozieSharelibCLI.java |  4 +---
 webapp/pom.xml                                        |  4 ++--
 zookeeper-security-tests/pom.xml                      |  4 ++--
 33 files changed, 103 insertions(+), 56 deletions(-)


[oozie] 04/04: Tmp folder fix (asasvari via gezapeti)

Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dionusos pushed a commit to branch branch-5.2
in repository https://gitbox.apache.org/repos/asf/oozie.git

commit 879c8ce55779c4bd76fb84ff49e193db6bbd87db
Author: Gezapeti Cseh <ge...@apache.org>
AuthorDate: Tue Jan 19 21:51:21 2021 +0100

    Tmp folder fix (asasvari via gezapeti)
---
 tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java
index b49f4a7..eb2a5f9 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java
@@ -179,9 +179,7 @@ public class OozieSharelibCLI {
                 extraLibs = getExtraLibs(param);
             }
 
-            File temp = File.createTempFile("oozie", ".dir");
-            temp.delete();
-            temp.mkdir();
+            File temp = Files.createTempDirectory("oozie").toFile();
             temp.deleteOnExit();
 
             //Check whether the lib is a tar file or folder


[oozie] 03/04: OOZIE-3601 Upgrade quartz to 2.3.2 (dengliming via matijhs)

Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dionusos pushed a commit to branch branch-5.2
in repository https://gitbox.apache.org/repos/asf/oozie.git

commit 95c4e62eaf7a4562ff8676feb975832b1d730f18
Author: Mate Juhasz <ma...@apache.org>
AuthorDate: Thu Jul 9 12:30:54 2020 +0200

    OOZIE-3601 Upgrade quartz to 2.3.2 (dengliming via matijhs)
---
 pom.xml         | 2 +-
 release-log.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a3452b3..59f8712 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1530,7 +1530,7 @@
             <dependency>
                 <groupId>org.quartz-scheduler</groupId>
                 <artifactId>quartz</artifactId>
-                <version>2.3.1</version>
+                <version>2.3.2</version>
             </dependency>
 
             <dependency>
diff --git a/release-log.txt b/release-log.txt
index d1b1599..e18ca4f 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.2.1 release (unreleased)
 
+OOZIE-3601 Upgrade quartz to 2.3.2 (dengliming via matijhs)
 OOZIE-3549 Add back support for truststore passwords (matijhs via asalamon74)
 
 -- Oozie 5.2.0 release


[oozie] 02/04: OOZIE-3549 Add back support for truststore passwords (matijhs via asalamon74)

Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dionusos pushed a commit to branch branch-5.2
in repository https://gitbox.apache.org/repos/asf/oozie.git

commit c93c05e0ac0e3d8fe8d6f6ed50286f99c3a1f90c
Author: Andras Salamon <as...@apache.org>
AuthorDate: Thu Nov 28 11:58:21 2019 +0100

    OOZIE-3549 Add back support for truststore passwords (matijhs via asalamon74)
---
 core/src/main/resources/oozie-default.xml             |  8 ++++++++
 docs/src/site/markdown/AG_Install.md                  |  3 ++-
 release-log.txt                                       |  2 ++
 .../org/apache/oozie/server/EmbeddedOozieServer.java  | 18 ++++++++++++++++++
 .../oozie/server/SSLServerConnectorFactory.java       |  2 +-
 .../apache/oozie/server/TestEmbeddedOozieServer.java  | 19 ++++++++++++++++++-
 .../oozie/server/TestSSLServerConnectorFactory.java   |  2 +-
 7 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/core/src/main/resources/oozie-default.xml b/core/src/main/resources/oozie-default.xml
index 56c5b59..8d34be4 100644
--- a/core/src/main/resources/oozie-default.xml
+++ b/core/src/main/resources/oozie-default.xml
@@ -2745,6 +2745,14 @@ will be the requeue interval for the actions which are waiting for a long time w
     </property>
 
     <property>
+        <name>oozie.https.truststore.pass</name>
+        <value></value>
+        <description>
+            Password to the TrustStore.
+        </description>TestSSLServerConnectorFactory
+    </property>
+
+    <property>
         <name>oozie.https.keystore.file</name>
         <value></value>
         <description>
diff --git a/docs/src/site/markdown/AG_Install.md b/docs/src/site/markdown/AG_Install.md
index f18528f..8996e8a 100644
--- a/docs/src/site/markdown/AG_Install.md
+++ b/docs/src/site/markdown/AG_Install.md
@@ -932,7 +932,8 @@ included with your JRE. If it's not on your path, you should be able to find it
     2b. Set location and password for the keystore and location for truststore by setting `oozie.https.keystore.file`,
     `oozie.https.keystore.pass`, `oozie.https.truststore.file`.
 
-    **Note:** `oozie.https.truststore.file` can be overridden by setting `javax.net.ssl.trustStore` system property.
+    **Note:** `oozie.https.truststore.file` can be overridden by setting `javax.net.ssl.trustStore` system property,
+    `oozie.https.keystore.pass` by setting `javax.net.ssl.trustStorePassword`.
 
     The default HTTPS port Oozie listens on for secure connections is 11443; it can be changed via `oozie.https.port`.
 
diff --git a/release-log.txt b/release-log.txt
index b4bb718..d1b1599 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,7 @@
 -- Oozie 5.2.1 release (unreleased)
 
+OOZIE-3549 Add back support for truststore passwords (matijhs via asalamon74)
+
 -- Oozie 5.2.0 release
 
 OOZIE-3553 [examples] Fix sqoop example (asalamon74 via kmarton)
diff --git a/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java b/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java
index daf5237..76c1fd6 100644
--- a/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java
+++ b/server/src/main/java/org/apache/oozie/server/EmbeddedOozieServer.java
@@ -52,7 +52,9 @@ import java.util.Objects;
 public class EmbeddedOozieServer {
     private static final Logger LOG = LoggerFactory.getLogger(EmbeddedOozieServer.class);
     protected static final String OOZIE_HTTPS_TRUSTSTORE_FILE = "oozie.https.truststore.file";
+    protected static final String OOZIE_HTTPS_TRUSTSTORE_PASS = "oozie.https.truststore.pass";
     protected static final String TRUSTSTORE_PATH_SYSTEM_PROPERTY = "javax.net.ssl.trustStore";
+    protected static final String TRUSTSTORE_PASS_SYSTEM_PROPERTY = "javax.net.ssl.trustStorePassword";
     private static String contextPath;
     protected Server server;
     private int httpPort;
@@ -122,6 +124,7 @@ public class EmbeddedOozieServer {
 
         HandlerCollection handlerCollection = new HandlerCollection();
         setTrustStore();
+        setTrustStorePassword();
 
         if (isSecured()) {
             httpsPort =  getConfigPort(ConfigUtils.OOZIE_HTTPS_PORT);
@@ -163,6 +166,21 @@ public class EmbeddedOozieServer {
         }
     }
 
+    /**
+     * set the truststore password from the config file, if is not set by the user
+     */
+    private void setTrustStorePassword() {
+        if (System.getProperty(TRUSTSTORE_PASS_SYSTEM_PROPERTY) == null) {
+            final String trustStorePassword = conf.get(OOZIE_HTTPS_TRUSTSTORE_PASS);
+            if (trustStorePassword != null) {
+                LOG.info("Setting javax.net.ssl.trustStorePassword from config file");
+                System.setProperty(TRUSTSTORE_PASS_SYSTEM_PROPERTY, trustStorePassword);
+            }
+        } else {
+            LOG.info("javax.net.ssl.trustStorePassword is already set. The value from config file will be ignored");
+        }
+    }
+
     private void addErrorHandler() {
         ErrorPageErrorHandler errorHandler = new ErrorPageErrorHandler();
         errorHandler.addErrorPage(HttpServletResponse.SC_BAD_REQUEST, "/error");
diff --git a/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java b/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java
index 62f84b1..9110d7f 100644
--- a/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java
+++ b/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java
@@ -137,7 +137,7 @@ class SSLServerConnectorFactory {
     private void setKeystorePass() {
         String keystorePass = ConfigurationService.getPassword(conf, OOZIE_HTTPS_KEYSTORE_PASS);
         Objects.requireNonNull(keystorePass, "keystorePass is null");
-        sslContextFactory.setKeyManagerPassword(keystorePass);
+        sslContextFactory.setKeyStorePassword(keystorePass);
     }
 
     private void setKeyStoreFile() {
diff --git a/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java b/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java
index ee12186..e144dae 100644
--- a/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java
+++ b/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java
@@ -28,7 +28,6 @@ import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.junit.After;
 import org.junit.Assert;
@@ -95,6 +94,7 @@ public class TestEmbeddedOozieServer {
 
     @After public void tearDown() {
         System.clearProperty(EmbeddedOozieServer.TRUSTSTORE_PATH_SYSTEM_PROPERTY);
+        System.clearProperty(EmbeddedOozieServer.TRUSTSTORE_PASS_SYSTEM_PROPERTY);
 
         verify(mockServices).get(ConfigurationService.class);
 
@@ -135,6 +135,23 @@ public class TestEmbeddedOozieServer {
         verify(mockConfiguration, never()).get(EmbeddedOozieServer.OOZIE_HTTPS_TRUSTSTORE_FILE);
     }
 
+    /**
+     * test case for when the trustore password is set via system property
+     * expected result: the password is used from the system property and the value is not even retrieved from the config file
+     */
+    @Test
+    public void testServerSetupTruststorePassSetViaSystemProperty() throws Exception {
+        final String trustStorePassword = "myTrustedPassword";
+        doReturn(String.valueOf(false)).when(mockConfiguration).get("oozie.https.enabled");
+        System.setProperty(EmbeddedOozieServer.TRUSTSTORE_PASS_SYSTEM_PROPERTY, trustStorePassword);
+
+        embeddedOozieServer.setup();
+        verify(mockJspHandler).setupWebAppContext(isA(WebAppContext.class));
+        verify(oozieFilterMapper).addFilters();
+
+        Assert.assertEquals(trustStorePassword, System.getProperty("javax.net.ssl.trustStorePassword"));
+        verify(mockConfiguration, never()).get(EmbeddedOozieServer.OOZIE_HTTPS_TRUSTSTORE_PASS);
+    }
 
     @Test
     public void testSecureServerSetup() throws Exception {
diff --git a/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java b/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java
index f6ff5de..b05a9ce 100644
--- a/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java
+++ b/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java
@@ -83,7 +83,7 @@ public class TestSSLServerConnectorFactory {
     public void tearDown() {
         testConfig.clear();
         verify(mockSSLContextFactory).setKeyStorePath(anyString());
-        verify(mockSSLContextFactory).setKeyManagerPassword(anyString());
+        verify(mockSSLContextFactory).setKeyStorePassword(anyString());
         verifyNoMoreInteractions(
                 mockServerConnector,
                 mockSSLServerConnectorFactory);


[oozie] 01/04: Changed version to 5.2.1

Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dionusos pushed a commit to branch branch-5.2
in repository https://gitbox.apache.org/repos/asf/oozie.git

commit b00122037cc8bd91a847c0404a70edbd7c5e7018
Author: Denes Bodo <db...@hortonworks.com>
AuthorDate: Fri Feb 5 10:17:03 2021 +0100

    Changed version to 5.2.1
---
 client/pom.xml                       | 4 ++--
 core/pom.xml                         | 4 ++--
 distro/pom.xml                       | 4 ++--
 docs/pom.xml                         | 4 ++--
 examples/pom.xml                     | 4 ++--
 fluent-job/fluent-job-api/pom.xml    | 4 ++--
 fluent-job/fluent-job-client/pom.xml | 4 ++--
 fluent-job/pom.xml                   | 2 +-
 minitest/pom.xml                     | 4 ++--
 pom.xml                              | 2 +-
 release-log.txt                      | 2 ++
 server/pom.xml                       | 4 ++--
 sharelib/distcp/pom.xml              | 4 ++--
 sharelib/git/pom.xml                 | 4 ++--
 sharelib/hcatalog/pom.xml            | 4 ++--
 sharelib/hive/pom.xml                | 4 ++--
 sharelib/hive2/pom.xml               | 4 ++--
 sharelib/oozie/pom.xml               | 4 ++--
 sharelib/pig/pom.xml                 | 4 ++--
 sharelib/pom.xml                     | 4 ++--
 sharelib/spark/pom.xml               | 4 ++--
 sharelib/sqoop/pom.xml               | 4 ++--
 sharelib/streaming/pom.xml           | 4 ++--
 tools/pom.xml                        | 4 ++--
 webapp/pom.xml                       | 4 ++--
 zookeeper-security-tests/pom.xml     | 4 ++--
 26 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index dae4220..59adfb0 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
 
     <artifactId>oozie-client</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Client</description>
     <name>Apache Oozie Client</name>
     <packaging>jar</packaging>
diff --git a/core/pom.xml b/core/pom.xml
index a60d5b9..15f081f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
 
     <artifactId>oozie-core</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Core</description>
     <name>Apache Oozie Core</name>
     <packaging>jar</packaging>
diff --git a/distro/pom.xml b/distro/pom.xml
index 8bb57d6..c7dfed1 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
 
     <artifactId>oozie-distro</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Distro</description>
     <name>Apache Oozie Distro</name>
     <packaging>jar</packaging>
diff --git a/docs/pom.xml b/docs/pom.xml
index b0de117..790e56d 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
 
     <artifactId>oozie-docs</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Docs</description>
     <name>Apache Oozie Docs</name>
     <packaging>war</packaging>
diff --git a/examples/pom.xml b/examples/pom.xml
index 65a63a4..4e10e63 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
 
     <artifactId>oozie-examples</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Examples</description>
     <name>Apache Oozie Examples</name>
     <packaging>jar</packaging>
diff --git a/fluent-job/fluent-job-api/pom.xml b/fluent-job/fluent-job-api/pom.xml
index 819e8ad..4cd246c 100644
--- a/fluent-job/fluent-job-api/pom.xml
+++ b/fluent-job/fluent-job-api/pom.xml
@@ -23,11 +23,11 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-fluent-job</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
 
     <artifactId>oozie-fluent-job-api</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Fluent Job API</description>
     <name>Apache Oozie Fluent Job API</name>
     <packaging>jar</packaging>
diff --git a/fluent-job/fluent-job-client/pom.xml b/fluent-job/fluent-job-client/pom.xml
index 0438a5b..c0740ff 100644
--- a/fluent-job/fluent-job-client/pom.xml
+++ b/fluent-job/fluent-job-client/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>oozie-fluent-job</artifactId>
         <groupId>org.apache.oozie</groupId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>oozie-fluent-job-client</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Fluent Job Client</description>
     <name>Apache Oozie Fluent Job Client</name>
     <packaging>jar</packaging>
diff --git a/fluent-job/pom.xml b/fluent-job/pom.xml
index ae1d5e1..b144674 100644
--- a/fluent-job/pom.xml
+++ b/fluent-job/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>oozie-main</artifactId>
         <groupId>org.apache.oozie</groupId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/minitest/pom.xml b/minitest/pom.xml
index 82ed8cf..7ba9d89 100644
--- a/minitest/pom.xml
+++ b/minitest/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
 
     <groupId>org.apache.oozie.test</groupId>
     <artifactId>oozie-mini</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie MiniOozie</description>
     <name>Apache Oozie MiniOozie</name>
 
diff --git a/pom.xml b/pom.xml
index f161b53..a3452b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.oozie</groupId>
     <artifactId>oozie-main</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Main</description>
     <name>Apache Oozie Main</name>
     <packaging>pom</packaging>
diff --git a/release-log.txt b/release-log.txt
index 8e95f80..b4bb718 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,3 +1,5 @@
+-- Oozie 5.2.1 release (unreleased)
+
 -- Oozie 5.2.0 release
 
 OOZIE-3553 [examples] Fix sqoop example (asalamon74 via kmarton)
diff --git a/server/pom.xml b/server/pom.xml
index 40fbb33..5c2ba55 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -23,11 +23,11 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
 
     <artifactId>oozie-server</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Server</description>
     <name>Apache Oozie Server</name>
     <packaging>jar</packaging>
diff --git a/sharelib/distcp/pom.xml b/sharelib/distcp/pom.xml
index a6a4716..1069be8 100644
--- a/sharelib/distcp/pom.xml
+++ b/sharelib/distcp/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <artifactId>oozie-sharelib-distcp</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Share Lib Distcp</description>
     <name>Apache Oozie Share Lib Distcp</name>
     <packaging>jar</packaging>
diff --git a/sharelib/git/pom.xml b/sharelib/git/pom.xml
index 8cf6855..6613660 100644
--- a/sharelib/git/pom.xml
+++ b/sharelib/git/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
         <relativePath>../..</relativePath>
     </parent>
     <groupId>org.apache.oozie</groupId>
     <artifactId>oozie-sharelib-git</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Share Lib Git</description>
     <name>Apache Oozie Share Lib Git</name>
     <packaging>jar</packaging>
diff --git a/sharelib/hcatalog/pom.xml b/sharelib/hcatalog/pom.xml
index 9507df1..1e07c6a 100644
--- a/sharelib/hcatalog/pom.xml
+++ b/sharelib/hcatalog/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <artifactId>oozie-sharelib-hcatalog</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Share Lib HCatalog</description>
     <name>Apache Oozie Share Lib HCatalog</name>
     <packaging>jar</packaging>
diff --git a/sharelib/hive/pom.xml b/sharelib/hive/pom.xml
index 78343cd..d509845 100644
--- a/sharelib/hive/pom.xml
+++ b/sharelib/hive/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <artifactId>oozie-sharelib-hive</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Share Lib Hive</description>
     <name>Apache Oozie Share Lib Hive</name>
     <packaging>jar</packaging>
diff --git a/sharelib/hive2/pom.xml b/sharelib/hive2/pom.xml
index 6d1cae0..6197688 100644
--- a/sharelib/hive2/pom.xml
+++ b/sharelib/hive2/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <artifactId>oozie-sharelib-hive2</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Share Lib Hive 2</description>
     <name>Apache Oozie Share Lib Hive 2</name>
     <packaging>jar</packaging>
diff --git a/sharelib/oozie/pom.xml b/sharelib/oozie/pom.xml
index 7e687cd..92ee1e8 100644
--- a/sharelib/oozie/pom.xml
+++ b/sharelib/oozie/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <artifactId>oozie-sharelib-oozie</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Share Lib Oozie</description>
     <name>Apache Oozie Share Lib Oozie</name>
     <packaging>jar</packaging>
diff --git a/sharelib/pig/pom.xml b/sharelib/pig/pom.xml
index 8b57e78..d9fb408 100644
--- a/sharelib/pig/pom.xml
+++ b/sharelib/pig/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <artifactId>oozie-sharelib-pig</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Share Lib Pig</description>
     <name>Apache Oozie Share Lib Pig</name>
     <packaging>jar</packaging>
diff --git a/sharelib/pom.xml b/sharelib/pom.xml
index e5d7196..dddd465 100644
--- a/sharelib/pom.xml
+++ b/sharelib/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
 
     <artifactId>oozie-sharelib</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Share Lib</description>
     <name>Apache Oozie Share Lib</name>
     <packaging>pom</packaging>
diff --git a/sharelib/spark/pom.xml b/sharelib/spark/pom.xml
index e506c83..17a538a 100644
--- a/sharelib/spark/pom.xml
+++ b/sharelib/spark/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <artifactId>oozie-sharelib-spark</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Share Lib Spark</description>
     <name>Apache Oozie Share Lib Spark</name>
     <packaging>jar</packaging>
diff --git a/sharelib/sqoop/pom.xml b/sharelib/sqoop/pom.xml
index 8c42feb..f7add01 100644
--- a/sharelib/sqoop/pom.xml
+++ b/sharelib/sqoop/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <artifactId>oozie-sharelib-sqoop</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Share Lib Sqoop</description>
     <name>Apache Oozie Share Lib Sqoop</name>
     <packaging>jar</packaging>
diff --git a/sharelib/streaming/pom.xml b/sharelib/streaming/pom.xml
index e8f102e..df370d7 100644
--- a/sharelib/streaming/pom.xml
+++ b/sharelib/streaming/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
         <relativePath>../..</relativePath>
     </parent>
 
     <artifactId>oozie-sharelib-streaming</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Share Lib Streaming</description>
     <name>Apache Oozie Share Lib Streaming</name>
     <packaging>jar</packaging>
diff --git a/tools/pom.xml b/tools/pom.xml
index ad9bbb7..56209a1 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
 
     <artifactId>oozie-tools</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie Tools</description>
     <name>Apache Oozie Tools</name>
     <packaging>jar</packaging>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 6fa9b67..425e1dd 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
 
     <artifactId>oozie-webapp</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie WebApp</description>
     <name>Apache Oozie WebApp</name>
     <packaging>war</packaging>
diff --git a/zookeeper-security-tests/pom.xml b/zookeeper-security-tests/pom.xml
index 1be28bd..57c8f45 100644
--- a/zookeeper-security-tests/pom.xml
+++ b/zookeeper-security-tests/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.apache.oozie</groupId>
         <artifactId>oozie-main</artifactId>
-        <version>5.2.0</version>
+        <version>5.2.1</version>
     </parent>
 
     <artifactId>oozie-zookeeper-security-tests</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1</version>
     <description>Apache Oozie ZooKeeper Security Tests</description>
     <name>Apache Oozie ZooKeeper Security Tests</name>
     <packaging>jar</packaging>