Develop to main

Jenkinsfile

@@ -1,64 +1,88 @@
 pipeline {
     agent any
     environment {
-            JAVA_HOME = '/usr/lib/jvm/java-17-openjdk-amd64'
-            PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
+        JAVA_HOME = '/usr/lib/jvm/java-17-openjdk-amd64'
+        PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
+        DB_URL = 'jdbc:mariadb://localhost:3306/travel'
+        DB_USERNAME = 'root'
+        DB_PASSWORD = '1q!1q!'
+        JENKINS_SERVER = "172.17.0.2"
+        NGINX_MINIJIN = "172.17.0.3"
+        BUILD_PJASYPT = credentials('Pjasypt')
+        DEPLOY_DJASYPT = credentials('Djasypt')
     }
     stages {
         stage('Checkout') {
             steps {
-                // 저장소의 해당 브랜치를 체크아웃합니다.
                 git branch: env.BRANCH_NAME, url: 'https://github.com/team-MiniJin/BE.git'
+                sh 'java -version'
+                sh './gradlew -v'
+                echo "Building branch: ${env.BRANCH_NAME}"
+                sh '''
+                JDBC_DRIVER_PATH="/usr/local/lib/mariadb-java-client-3.3.3.jar"
+                WORK_DIR="/tmp"
+                javac -cp .:$JDBC_DRIVER_PATH $WORK_DIR/TestJDBC.java
+                java -cp .:$WORK_DIR:$JDBC_DRIVER_PATH TestJDBC
+                '''
             }
         }
         stage('Build') {
+            when { branch 'develop' }
             steps {
-                script {
-                    if (env.BRANCH_NAME == 'develop' || env.BRANCH_NAME.startsWith('feature/')) {
-                        // 빌드 단계
-                        sh './gradlew build'
-                    }
-                }
+                sh "./gradlew clean build ${BUILD_PJASYPT}"
             }
         }
         stage('Test') {
+            when { branch pattern: 'develop|feature/.*' }
             steps {
-                script {
-                    if (env.BRANCH_NAME == 'develop' || env.BRANCH_NAME.startsWith('feature/')) {
-                        // 테스트 단계
-                        sh './gradlew test'
-                    }
-                }
+                sh "./gradlew test ${BUILD_PJASYPT}"
             }
         }
         stage('Release') {
-            when {
-                branch 'release/*'
-            }
+            when { branch 'release/*' }
             steps {
-                // 릴리스 단계
                 sh './gradlew publish'
             }
         }
         stage('Hotfix') {
-            when {
-                branch 'hotfix/*'
-            }
+            when { branch 'hotfix/*' }
             steps {
-                // 핫픽스 단계
                 sh './gradlew build'
             }
         }
-        /*
         stage('Deploy') {
             when {
-                branch 'main'
+                anyOf {
+                    branch 'develop'
+                    changeRequest()
+                }
             }
             steps {
-                // 배포 단계
-                sh './gradlew deploy'
+                script {
+                    echo "Using SSH credentials: jenkins-ssh-key"
+                    sshagent (credentials: ['jenkins-ssh-key']) {
+                        try {
+                            sh """
+                            echo "Starting SSH connection..."
+                            ssh -i ~/.ssh/jenkins_agent_key root@$NGINX_MINIJIN 'echo "SSH connection successful"'
+                            echo "SSH connection established successfully."
+                            echo "Killing 8080, java service"
+                            ssh -i ~/.ssh/jenkins_agent_key root@$NGINX_MINIJIN '/home/user/kill_java.sh'
+                            echo "Killing Complete 8080, java service"
+                            echo "Transferring file..."
+                            scp -i ~/.ssh/jenkins_agent_key /var/jenkins_home/workspace/minijin_BE_develop/build/libs/travel-0.0.1-SNAPSHOT.jar root@${env.NGINX_MINIJIN}:/home/user/
+                            echo "File transferred successfully."
+                            echo "Deploying the application..."
+                            ssh -i ~/.ssh/jenkins_agent_key -o StrictHostKeyChecking=no root@${env.NGINX_MINIJIN} "nohup java ${env.DEPLOY_DJASYPT} -jar /home/user/travel-0.0.1-SNAPSHOT.jar --server.port=8080 > /home/user/travel.log 2>&1 &"
+                            echo "Application deployed successfully."
+                            """
+                        } catch (Exception e) {
+                            echo "SSH connection or file transfer failed: ${e}"
+                            error "Stopping pipeline due to SSH failure"
+                        }
+                    }
+                }
             }
         }
-         */
     }
-}
+}

build.gradle

@@ -1,48 +1,62 @@
 plugins {
-	id 'java'
-	id 'org.springframework.boot' version '3.3.0'
-	id 'io.spring.dependency-management' version '1.1.5'
+    id 'java'
+    id 'org.springframework.boot' version '3.3.0'
+    id 'io.spring.dependency-management' version '1.1.5'
 }
 
 group = 'com.minizin.travel'
 version = '0.0.1-SNAPSHOT'
 
 java {
-	sourceCompatibility = '17'
+    sourceCompatibility = '17'
 }
 
 configurations {
-	compileOnly {
-		extendsFrom annotationProcessor
-	}
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
 }
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
 dependencies {
-	// Framework
-	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	implementation 'org.springframework.boot:spring-boot-starter-security'
-	implementation 'org.springframework.boot:spring-boot-starter-validation'
-	implementation 'org.springframework.boot:spring-boot-starter-web'
-	//jwt
-	implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
-	implementation 'io.jsonwebtoken:jjwt-impl:0.12.3'
-	implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3'
-	// lombok
-	compileOnly 'org.projectlombok:lombok'
-	annotationProcessor 'org.projectlombok:lombok'
-	// DB
-	runtimeOnly 'com.h2database:h2'
-	runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
-	//// test for
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	testImplementation 'org.springframework.security:spring-security-test'
-	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    // Framework
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation 'org.springframework.boot:spring-boot-starter-mail'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    // jasypt
+    implementation 'com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.5'
+    //jwt
+    implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
+    implementation 'io.jsonwebtoken:jjwt-impl:0.12.3'
+    implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3'
+    // lombok
+    compileOnly 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
+    // DB
+    runtimeOnly 'com.h2database:h2'
+    runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    // gson
+    implementation 'com.google.code.gson:gson:2.8.8'
+    // okhttp
+    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
+    //API DOC
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    //// test for
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.springframework.security:spring-security-test'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.3'
 }
 
 tasks.named('test') {
-	useJUnitPlatform()
+    useJUnitPlatform()
+    systemProperty 'jasypt.encryptor.password', findProperty("jasypt.encryptor.password")
 }