Test2

jenkins/Jenkinsfile-do-release

@@ -9,7 +9,7 @@ pipeline {
         stage('Clone Minager-properties repository') {
             steps {
                 dir('minager-properties') {
-                    git url:'https://gogs.takiguchi.ovh/Minager/minager-properties.git', branch: 'master', credentialsId: 'a6494064-8130-42fd-9d3d-e7734518c79e'
+                    git url:'https://gogs.takiguchi.ovh/Minager/minager-properties.git', branch: 'do-release', credentialsId: 'a6494064-8130-42fd-9d3d-e7734518c79e'
                 }
             }
         }

jenkins/Jenkinsfile-prod

@@ -2,8 +2,8 @@ pipeline {
     agent any
 
     tools {
-        maven 'Maven-3.6.0'
+        maven 'Maven-3.5.0'
-        jdk 'OpenJdk-11.0.4'
+        jdk 'OpenJdk-11.0.2'
     }
 
     environment {
@@ -14,7 +14,7 @@ pipeline {
         stage('Configuration') {
             steps {
                 dir('minager-properties') {
-                    git url:'https://gitea.takiguchi.ovh/Minager/minager-properties.git', branch: 'master', credentialsId: 'Jenkins-gitea'
+                    git url:'https://gogs.takiguchi.ovh/Minager/minager-properties.git', branch: 'master', credentialsId: 'a6494064-8130-42fd-9d3d-e7734518c79e'
                 }
                 script {
                     sh 'cp ./minager-properties/application-prod.yml ./src/main/resources/application.yml'
@@ -50,7 +50,7 @@ pipeline {
                 sshPublisher(
                     publishers: [
                         sshPublisherDesc(
-                            configName: 'DebianServer [minecraft]',
+                            configName: 'DebianServer [minager]',
                             transfers: [
                                 sshTransfer(
                                     cleanRemote: false,
@@ -70,8 +70,8 @@ pipeline {
                                     cleanRemote: false,
                                     excludes: '',
                                     execCommand: """
-                                        mv /home/minecraft/minager.jar /home/minecraft/minager/minager.jar
+                                        mv /home/minecraft/minager.jar /home/minecraft/minager/bin/minager.jar
-                                        chmod 700 /home/minecraft/minager/minager.jar
+                                        chmod 500 /home/minecraft/minager/bin/minager.jar
                                         sudo service minager restart
                                     """,
                                     execTimeout: 120000,

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.minager</groupId>
 	<artifactId>minager</artifactId>
-	<version>1.2.0</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Minager</name>

src/main/bash/do-release.bash

@@ -6,13 +6,16 @@ function setVersion()
 
     echo 'Update properties file'
     sed -i -z -E "s/minager:\n  version: ([0-9]+(\.[0-9]+){2}(-SNAPSHOT)?)/minager:\n  version: $1/" \
-            minager-properties/application-prod.yml
+            ../minager-properties/application-prod.yml
 
     echo 'Update Angular app version'
     sed -i -E "s/appVersion: '([0-9]+(\.[0-9]+){2}(-SNAPSHOT)?)'/appVersion: $1/" \
             src/main/ts/src/environments/environment.prod.ts
 }
 
+BRANCH_NAME=do-release
+cd ../../..
+
 echo 'Retreive the project version...'
 VERSION=$(mvn -q \
         -Dexec.executable="echo" \
@@ -37,21 +40,25 @@ setVersion $RELEASE_VERSION
 
 echo 'Git tag for release freezing'
 git tag $RELEASE_VERSION
-cd minager-properties && git tag $RELEASE_VERSION && cd ..
+cd ../minager-properties || exit 1
+git tag $RELEASE_VERSION || exit 1
+cd - || exit 1
 
 echo 'Change files to next version'
 setVersion $NEXT_VERSION
 
 echo 'Git commit and push'
 # Minager-properties
-cd minager-properties
+cd ../minager-properties || exit 1
-git add application-prod.yml
+git add application-prod.yml || exit 1
-git commit -m "Set version for next iteration: $NEXT_VERSION"
+git commit -m "Set version for next iteration: $NEXT_VERSION" || exit 1
-git push origin master
+git push origin $BRANCH_NAME || exit 1
-cd ..
+git push origin --tags || exit 1
+cd - || exit 1
 
 # Minager
 git add pom.xml
 git add src/main/ts/src/environments/environment.prod.ts
 git commit -m "Set version for next iteration: $NEXT_VERSION"
-git push origin master
+git push origin $BRANCH_NAME
+git push origin --tags

src/main/ts/src/app/server/server.component.ts

@@ -27,7 +27,7 @@ import { NotificationsComponent } from '../core/notifications/notifications.comp
   `]
 })
 export class ServerComponent implements OnInit {
-  serverAddress = 'takiguchi.ovh:54311';
+  serverAddress = '176.188.217.1:54311';
   serverStartedChecked = false;
   serverStarted = false;
   restarting = false;

src/main/ts/src/environments/environment.prod.ts

@@ -1,5 +1,5 @@
 export const environment = {
   production: true,
-  appVersion: '1.2.0',
+  appVersion: '1.3.0-SNAPSHOT',
   title: ''
 };