changing few software versions

Jenkinsfile

@@ -1,12 +1,61 @@
-pipeline {
-  agent { label "linux" }
-  options { disableConcurrentBuilds() }
+def getGitBranchName() {
+  if (env.CHANGE_BRANCH) {
+    return env.CHANGE_BRANCH
+  }
+  return scm.branches[0].name
+}
+
+node("uptycs") {
+  stage("checkout") {
+    PULL_REQUEST = env.CHANGE_ID
+    GIT_BRANCH = getGitBranchName()
+    if ("${GIT_BRANCH}" == "mulesoft") {
+      GIT_BRANCH = "production"
+    }
+    cleanWs()
+    git branch: GIT_BRANCH, credentialsId: 'github', url: 'https://github.com/Uptycs/uptycs-hive.git'
+    GIT_COMMIT = sh (script: "git log -n 1 --pretty=format:'%H'", returnStdout: true)
+  } // checkout
+
+  withEnv(["UPTYCS_HIVE_HOME=${WORKSPACE}"]) {
+    stage("info") {
+      DATE = new Date().format("yyyy-MM-dd'T'HH:mm:ss'Z'")
+      if ("${GIT_BRANCH}" == "release" || "${GIT_BRANCH}" == "production") {
+        env.VERSION = "${BUILD_NUMBER}"
+      } else {
+        env.VERSION = "1.0-" + "${GIT_BRANCH}".replace("origin/", "").replace("/", "-")
+      }
+
+      println "Build version: ${VERSION}"
+      println "Build number: ${BUILD_NUMBER}"
+      println "Commit: ${GIT_COMMIT}"
+      println "Branch: ${GIT_BRANCH}"
+      println "Date/time: ${DATE}"
+
+      sh "set"
+    } // info stage
 
-  stages {
     stage("build") {
-      steps {
-        sh "${WORKSPACE}/mvnw --settings settings.xml -B clean deploy -DskipTests=true"
+      dir("${WORKSPACE}") {
+        sh "mvn clean package -Pdist -DskipTests -Dmaven.javadoc.skip=true -Drat.skip=true"
+      } // dir
+    } // build stage
+
+
+    stage("upload-to-s3") {
+      BUCKET_NAME = "uptycs-apt-w2-2"
+      if (PULL_REQUEST != null) {
+        return
       }
-    }
-  } // stages
-} // end pipeline
+      dir("${WORKSPACE}/packaging/target") {
+        withAWS(credentials:'S3CREDS') {
+          sh """
+            ls -l *.tar.gz
+            aws configure set default.s3.signature_version s3v4
+            aws s3 cp apache-hive-2.3.7u1-bin.tar.gz s3://${BUCKET_NAME}/apache-hive/ --quiet
+          """
+        } // withAWS
+      } // dir
+    } // upload-to-s3
+  } // withEnv
+} // node

packaging/pom.xml

@@ -208,11 +208,6 @@
       <artifactId>hive-hbase-handler</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hive</groupId>
-      <artifactId>hive-druid-handler</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-jdbc-handler</artifactId>

pom.xml

@@ -37,7 +37,6 @@
     <module>cli</module>
     <module>common</module>
     <module>contrib</module>
-    <module>druid-handler</module>
     <module>hbase-handler</module>
     <module>jdbc-handler</module>
     <module>hcatalog</module>
@@ -151,7 +150,7 @@
     <ivy.version>2.4.0</ivy.version>
     <jackson.version>1.9.13</jackson.version>
     <!-- jackson 1 and 2 lines can coexist without issue, as they have different artifactIds -->
-    <jackson.new.version>2.6.5</jackson.new.version>
+    <jackson.new.version>2.9.10.6</jackson.new.version>
     <jasper.version>5.5.23</jasper.version>
     <jamon.plugin.version>2.3.4</jamon.plugin.version>
     <jamon-runtime.version>2.3.1</jamon-runtime.version>
@@ -178,7 +177,7 @@
     <orc.version>1.3.4</orc.version>
     <mockito-all.version>1.9.5</mockito-all.version>
     <mina.version>2.0.0-M5</mina.version>
-    <netty.version>4.0.52.Final</netty.version>
+    <netty.version>4.1.44.Final</netty.version>
     <parquet.version>1.8.1</parquet.version>
     <pig.version>0.16.0</pig.version>
     <protobuf.version>2.5.0</protobuf.version>
@@ -197,7 +196,7 @@
     <wadl-resourcedoc-doclet.version>1.4</wadl-resourcedoc-doclet.version>
     <velocity.version>1.5</velocity.version>
     <xerces.version>2.9.1</xerces.version>
-    <zookeeper.version>3.4.6</zookeeper.version>
+    <zookeeper.version>3.5.5</zookeeper.version>
     <jpam.version>1.1</jpam.version>
     <felix.version>2.4.0</felix.version>
     <curator.version>2.7.1</curator.version>