From 3d237aa0f84e67b95610b2763e9fccc9d454cdda Mon Sep 17 00:00:00 2001 From: Aldin Date: Sun, 14 Aug 2022 21:24:55 +0200 Subject: [PATCH] chore: prepare RC-1 (#783) ### Motivation RC-1 is on its way and we need to prepare everything for it. ### Modifications Added a new `beta` branch in the launcher.cnl which is the new default. ### Results We are getting closer to RC-1 --- Jenkinsfile | 65 ------------------- build-extensions/src/main/kotlin/Versions.kt | 2 +- .../java17/src/main/resources/launcher.cnl | 5 +- .../main/resources/documentation/swagger.json | 2 +- 4 files changed, 6 insertions(+), 68 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index ca47228896..0000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2019-2022 CloudNetService team & contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -pipeline { - agent any - tools { - jdk 'Java17' - } - - options { - buildDiscarder logRotator(numToKeepStr: '10') - } - - stages { - stage('Build lifecycle') { - steps { - configFileProvider([configFile(fileId: "e94f788c-1d9c-48d4-b9a9-8286ff68275e", targetLocation: 'gradle.properties')]) { - sh './gradlew --full-stacktrace' - } - } - } - - stage('Publish to repository') { - when { - anyOf { - branch 'master' - branch 'development' - } - } - - steps { - sh './gradlew publish --full-stacktrace' - } - } - - stage('Artifacts zip') { - steps { - sh 'mkdir -p temp/'; - sh 'mkdir -p temp/plugins'; - - sh 'cp -r .template/* temp/'; - sh 'cp LICENSE temp/license.txt'; - sh 'cp launcher/java17/build/libs/launcher.jar temp/launcher.jar;' - - sh 'find plugins/ -type f -regex ".*/build/libs/.*\\.jar" ! -name "*-javadoc.jar" ! -name "*-sources.jar" -exec cp {} temp/plugins \\;' - zip archive: true, dir: 'temp', glob: '', zipFile: 'CloudNet.zip' - - sh 'rm -r temp/' - } - } - } -} diff --git a/build-extensions/src/main/kotlin/Versions.kt b/build-extensions/src/main/kotlin/Versions.kt index 1515f1431f..55a3937426 100644 --- a/build-extensions/src/main/kotlin/Versions.kt +++ b/build-extensions/src/main/kotlin/Versions.kt @@ -17,7 +17,7 @@ object Versions { // internal versions - const val cloudNet = "4.0.0-SNAPSHOT" + const val cloudNet = "4.0.0-RC1" const val cloudNetCodeName = "Blizzard" // external tools diff --git a/launcher/java17/src/main/resources/launcher.cnl b/launcher/java17/src/main/resources/launcher.cnl index 063ba6b764..e8a150c129 100644 --- a/launcher/java17/src/main/resources/launcher.cnl +++ b/launcher/java17/src/main/resources/launcher.cnl @@ -34,10 +34,13 @@ var cloudnet.updateRepo CloudNetService/launchermeta # branches are: # - 'release': Always contains the latest release version. This is the best version you can choose for a network # running in production. +# - 'beta': Contains the newest features of the system which are partly tested and out for community testing. +# These features might still be broken but shouldn't break your network. Changes to these features are +# still possible and your configuration you did might break when the feature gets out of testing. # - 'nightly': All bleeding edge but newest features of the system. DO NOT USE IN PRODUCTION. Your network is not # safe and something might break. Good for testing purposes or developers which want to use the latest # features available. (Use this branch at your own risk!) -var cloudnet.updateBranch release +var cloudnet.updateBranch beta # available default log levels: OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST, ALL # each level includes all messages for levels lower than itself (in the above list: left to right) too diff --git a/modules/rest/src/main/resources/documentation/swagger.json b/modules/rest/src/main/resources/documentation/swagger.json index c2cfa215c5..7806e1ced4 100644 --- a/modules/rest/src/main/resources/documentation/swagger.json +++ b/modules/rest/src/main/resources/documentation/swagger.json @@ -3,7 +3,7 @@ "info" : { "description" : "CloudNet's rest API version 2 is the next generation in CloudNet's rest history. It has\ndefinitely more opportunities than the previous version of it and provides\na lot of methods to manage and control the CloudNet node and cluster behaviour.\n\nThe API is based on http/https requests and mostly JSON responses. You need\nto send your session bearer token when you make a request. The token can be\nobtained by sending a request to the /auth route. Most of the routes require\nan authentication and a permission which must be set to access the endpoint.\n\nAll the responses contain a `success` boolean (if they are JSON responses) giving\ninformation whether or not the request was handled successfully. If that boolean is\n`false` an extra `reason` field is appended to the JSON entity defining the cause\nof the failure.\n\nEvery rest rout is fixed to a version number and every call must contain one.\nThe latest one is 2. The latest stable endpoint base URL is\n`http(s)://{host}:{port}/api/v2/`. Host and port is the one defined in your\nCloudNet's node config.json `httpListeners` section. If you want to use https\nyou have to configure the web SSL settings in the same file.\n", "version" : "2", - "title" : "CloudNet v3", + "title" : "CloudNet", "contact" : { "url" : "https://cloudnetservice.eu", "name" : "CloudNetService"