Merge remote-tracking branch 'origin/master'

Dockerfile

@@ -9,7 +9,13 @@ FROM ubuntu
 # MAINTAINER name Chunteng Xiao
 RUN apt-get clean
 RUN apt-get update
-RUN apt-get -f install -y curl unzip default-jdk wget
+RUN apt-get install -y software-properties-common
+RUN add-apt-repository ppa:webupd8team/java
+RUN apt-get update
+RUN apt-get -f install -y curl unzip wget tar
+RUN echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections
+RUN apt-get install -y oracle-java8-installer 
+RUN apt-get install -y oracle-java8-set-default
 RUN curl --insecure -o ./sonarscanner.zip -L https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.2.0.1227-linux.zip
 RUN unzip sonarscanner.zip
 RUN rm sonarscanner.zip
@@ -18,14 +24,21 @@ ENV PATH $PATH:/sonar-scanner-3.2.0.1227-linux/bin
 RUN wget http://www-us.apache.org/dist/tomcat/tomcat-9/v9.0.10/bin/apache-tomcat-9.0.10.tar.gz
 RUN tar xzf apache-tomcat-9.0.10.tar.gz
 RUN mv apache-tomcat-9.0.10 apache-tomcat9
-RUN wget http://www-eu.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz
+RUN wget http://mirrors.hust.edu.cn/apache/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz
 RUN tar xzvf apache-maven-3.5.4-bin.tar.gz
 RUN ln -s apache-maven-3.5.4 apache-maven
-ENV M2_HOME=/usr/local/apache-maven
-ENV CATALINA_HOME=/usr/local/apache-tomcat9
-ENV MAVEN_HOME=/usr/local/apache-maven
+ENV M2_HOME=//apache-maven
+ENV CATALINA_HOME=/apache-tomcat9
+ENV TOMCAT_HOME=/apache-tomcat9
+ENV MAVEN_HOME=/apache-maven
 ENV PATH=${M2_HOME}/bin:${PATH}
 ENV JAVA_HOME=/usr/lib/jvm/java-8-oracle
 ENV JRE_HOME=/usr/lib/jvm/java-8-oracle/jre
+ADD ca.crt ./
+COPY ./additional_jars ./additional_jars
+RUN keytool -import -trustcacerts -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit -noprompt -alias maven2.ca -file ca.crt
+RUN keytool -import -trustcacerts -keystore $JAVA_HOME/jre/lib/security/jssecacerts -storepass changeit -noprompt -alias maven2.ca -file ca.crt
+RUN mvn install:install-file -DgroupId=com.oracle -DartifactId=ojdbc7 -Dversion=12.2.0.1.0 -Dpackaging=jar -Dfile=./additional_jars/ojdbc7.jar
 COPY sonar-runner.properties ./sonar-scanner-3.2.0.1227-linux/conf/sonar-scanner.properties
-EXPOSE 84
+EXPOSE 84
+EXPOSE 8080

Jenkinsfile

@@ -7,15 +7,21 @@ pipeline {
         }
     }
     stages {
-        stage('SonarQube Analysis') {
+        stage('Confirm to Proceed') {
             steps {
-                sh 'sonar-scanner'
+                input message: 'Proceed? (Click "Proceed" to continue)'
             }
         }
-        stage('Maven Test') {
+        stage('Maven Test and Deploy') {
             steps {
-                    sh "mvn test"
                     sh "mvn -version"
+                    sh "mvn test"
+                    sh "mvn deploy"
+            }
+        }
+        stage('SonarQube Analysis') {
+            steps {
+                sh 'sonar-scanner'
             }
         }
         stage('Deliver'){

ca.crt

@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFGDCCBACgAwIBAgIQC9a3ySZZzpzPjwnTKWFKYDANBgkqhkiG9w0BAQsFADBN
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
+aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTcwNzE5MDAwMDAwWhcN
+MjAwOTAzMTIwMDAwWjBjMQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUQxDzANBgNV
+BAcTBkZ1bHRvbjEWMBQGA1UEChMNU29uYXR5cGUsIEluYzEeMBwGA1UEAxMVcmVw
+by5tYXZlbi5hcGFjaGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAxRtj/yQxAZG4AFZJKJJfoOMPnEOzAnNWP+XohOaq1Q0yapzuZfK5kV+aCzok
+zrAktkA2MBjJ+G7W/22I3rHt/syz20erwR6gcjRVVOzTbYWF7drA3ZA9me+R8cxk
+TSinRctN1+mXyIXclGoNPffaOH95kgvsX5wkZy6eAmXftznBnQJ90CXLuW1/CdAy
+jXtHE0kANNQ8CuzrMreio1IdX+LfLSicXa2NEFKZE/GatzP5Bb1qMFbuxz6vnl5m
+N2IqeO9GPQXEjPv+PmlYUSuTy86JGIydnbd6ugC8nrTafatsIQcp93hu6Vvb9mpf
+cLYSE3USE3qxZx+UZJrA34UdvQIDAQABo4IB3DCCAdgwHwYDVR0jBBgwFoAUD4Bh
+HIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFKE9jbAJliKr9QCmrhNmLq13sJ8w
+MCAGA1UdEQQZMBeCFXJlcG8ubWF2ZW4uYXBhY2hlLm9yZzAOBgNVHQ8BAf8EBAMC
+BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6At
+oCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9zc2NhLXNoYTItZzEuY3JsMC+g
+LaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWcxLmNybDBM
+BgNVHSAERTBDMDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3
+dy5kaWdpY2VydC5jb20vQ1BTMAgGBmeBDAECAjB8BggrBgEFBQcBAQRwMG4wJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6
+aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNl
+cnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQC/43mG
+1Nlqmm6zbCLhAIdpkTvC0+YayOcaVPb1pN2HVBSjxgbnjAwfrDbxcStYusAfbMv4
+xeopmlIqlz8N+Cv8qm6KUBKGDpCn7q+27638HoP0BsLlESJWJjqTgQ4PlQopDjEL
+g50yymmebD8O1zdw9OiX2Am7zH7OIzUI+qCWRtzyQOkjsPlinjX2xJuuG0gXx8zy
+vJYHXtfFMWr/pqPh2tDTlEwO9oO2uLMkQSXsG3vK982Qqsr5zah9RQlzUrsZXRnG
+rlrIOsDX1IX6yIr6IUmEygO1ot5dJGALTdcDjZNq7sOizxF6D9bTdI6tokoMWeBF
+Xi/kckbEnvp8+oQM
+-----END CERTIFICATE-----