From 0186de26c2b60b4715b4e43cb09b8fab61564062 Mon Sep 17 00:00:00 2001 From: andsel Date: Wed, 16 May 2018 23:22:24 +0200 Subject: [PATCH] Bumped and released version 0.11 --- .../main/java/io/moquette/server/Server.java | 2 +- build.gradle | 24 ++- distribution/src/main/scripts/moquette.bat | 176 +++++++++--------- distribution/src/main/scripts/moquette.sh | 2 +- .../integration/brokerEmbeddedTest.groovy | 2 +- 5 files changed, 110 insertions(+), 96 deletions(-) diff --git a/broker/src/main/java/io/moquette/server/Server.java b/broker/src/main/java/io/moquette/server/Server.java index 43ecd08c..cba03ebd 100644 --- a/broker/src/main/java/io/moquette/server/Server.java +++ b/broker/src/main/java/io/moquette/server/Server.java @@ -75,7 +75,7 @@ public class Server { public static void main(String[] args) throws IOException { final Server server = new Server(); server.startServer(); - System.out.println("Server started, version 0.11-SNAPSHOT"); + System.out.println("Server started, version 0.11"); //Bind a shutdown hook Runtime.getRuntime().addShutdownHook(new Thread(server::stopServer)); } diff --git a/build.gradle b/build.gradle index a88de93c..749f8736 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,9 @@ allprojects { apply plugin: 'maven' + apply plugin: 'maven-publish' group = 'io.moquette' - version = '0.11-SNAPSHOT' + version = '0.11' } buildscript { @@ -67,15 +68,28 @@ subprojects { } // Deploy set environment variables and run ./gradlew bintrayUpload + // publication to maven repo + publishing { + publications { + MyPublication(MavenPublication) { + from components.java + groupId "$project.group" + artifactId "${project.name}" + version '0.11' + } + } + } + bintray { - user = System.getenv('BINTRAY_USER') - key = System.getenv('BINTRAY_KEY') + user = bintrayUser //System.getenv('BINTRAY_USER') + key = bintrayPassword //System.getenv('BINTRAY_KEY') pkg { - repo = '${project.group}' - name = "${project.name}" + repo = 'maven'//"${project.group}" + name = "${project.group}.${project.name}" userOrg = 'andsel' licenses = ['Apache-2.0'] vcsUrl = "https://api.bintray.com/maven/andsel/maven/${project.group}.${project.name}" + publications = ['MyPublication'] } } } diff --git a/distribution/src/main/scripts/moquette.bat b/distribution/src/main/scripts/moquette.bat index e0e14228..9727acee 100644 --- a/distribution/src/main/scripts/moquette.bat +++ b/distribution/src/main/scripts/moquette.bat @@ -1,88 +1,88 @@ -@ECHO OFF -rem # -rem # Copyright (c) 2012-2015 Andrea Selva -rem # - -echo " " -echo " ___ ___ _ _ ___ ________ _____ _____ " -echo " | \/ | | | | | | \/ | _ |_ _|_ _| " -echo " | . . | ___ __ _ _ _ ___| |_| |_ ___ | . . | | | | | | | | " -echo " | |\/| |/ _ \ / _\ | | | |/ _ \ __| __/ _ \ | |\/| | | | | | | | | " -echo " | | | | (_) | (_| | |_| | __/ |_| || __/ | | | \ \/' / | | | | " -echo " \_| |_/\___/ \__, |\__,_|\___|\__|\__\___| \_| |_/\_/\_\ \_/ \_/ " -echo " | | " -echo " |_| " -echo " " -echo " version: 0.11-SNAPSHOT " - -set "CURRENT_DIR=%cd%" -if not "%MOQUETTE_HOME%" == "" goto gotHome -set "MOQUETTE_HOME=%CURRENT_DIR%" -if exist "%MOQUETTE_HOME%\bin\moquette.bat" goto okHome -cd .. -set "MOQUETTE_HOME=%cd%" -cd "%CURRENT_DIR%" -:gotHome -if exist "%MOQUETTE_HOME%\bin\moquette.bat" goto okHome - echo The MOQUETTE_HOME environment variable is not defined correctly - echo This environment variable is needed to run this program -goto end -:okHome - -rem Set JavaHome if it exists -if exist { "%JAVA_HOME%\bin\java" } ( - set "JAVA="%JAVA_HOME%\bin\java" -) - -echo Using JAVA_HOME: "%JAVA_HOME%" -echo Using MOQUETTE_HOME: "%MOQUETTE_HOME%" - -rem set LOG_CONSOLE_LEVEL=info -rem set LOG_FILE_LEVEL=fine -set JAVA_OPTS= -set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -set MOQUETTE_PATH=%MOQUETTE_HOME% -set LOG_FILE=%MOQUETTE_HOME%\config\moquette-log.properties - -rem # Use the Hotspot garbage-first collector. -set JAVA_OPTS=%JAVA_OPTS% -XX:+UseG1GC - -rem # Have the JVM do less remembered set work during STW, instead -rem # preferring concurrent GC. Reduces p99.9 latency. -set JAVA_OPTS=%JAVA_OPTS% -XX:G1RSetUpdatingPauseTimePercent=5 - -rem # Main G1GC tunable: lowering the pause target will lower throughput and vise versa. -rem # 200ms is the JVM default and lowest viable setting -rem # 1000ms increases throughput. Keep it smaller than the timeouts. -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxGCPauseMillis=500 - -rem # Optional G1 Settings - -rem Save CPU time on large (>= 16GB) heaps by delaying region scanning -rem until the heap is 70% full. The default in Hotspot 8u40 is 40%. -rem set JAVA_OPTS=%JAVA_OPTS% -XX:InitiatingHeapOccupancyPercent=70 - -rem For systems with > 8 cores, the default ParallelGCThreads is 5/8 the number of logical cores. -rem Otherwise equal to the number of cores when 8 or less. -rem Machines with > 10 cores should try setting these to <= full cores. -rem set JAVA_OPTS=%JAVA_OPTS% -XX:ParallelGCThreads=16 - -rem By default, ConcGCThreads is 1/4 of ParallelGCThreads. -rem Setting both to the same value can reduce STW durations. -rem set JAVA_OPTS=%JAVA_OPTS% -XX:ConcGCThreads=16 - -rem ## GC logging options -- uncomment to enable - -set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCDetails -set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCDateStamps -set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintHeapAtGC -set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintTenuringDistribution -set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCApplicationStoppedTime -set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintPromotionFailure -rem set JAVA_OPTS=%JAVA_OPTS% -XX:PrintFLSStatistics=1 -rem set JAVA_OPTS=%JAVA_OPTS% -Xloggc:/var/log/moquette/gc.log -set JAVA_OPTS=%JAVA_OPTS% -XX:+UseGCLogFileRotation -set JAVA_OPTS=%JAVA_OPTS% -XX:NumberOfGCLogFiles=10 -set JAVA_OPTS=%JAVA_OPTS% -XX:GCLogFileSize=10M" - -%JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% -Dlog4j.configuration=file:%LOG_FILE% -Dmoquette.path=%MOQUETTE_PATH% -cp %MOQUETTE_HOME%\lib\* io.moquette.server.Server +@ECHO OFF +rem # +rem # Copyright (c) 2012-2015 Andrea Selva +rem # + +echo " " +echo " ___ ___ _ _ ___ ________ _____ _____ " +echo " | \/ | | | | | | \/ | _ |_ _|_ _| " +echo " | . . | ___ __ _ _ _ ___| |_| |_ ___ | . . | | | | | | | | " +echo " | |\/| |/ _ \ / _\ | | | |/ _ \ __| __/ _ \ | |\/| | | | | | | | | " +echo " | | | | (_) | (_| | |_| | __/ |_| || __/ | | | \ \/' / | | | | " +echo " \_| |_/\___/ \__, |\__,_|\___|\__|\__\___| \_| |_/\_/\_\ \_/ \_/ " +echo " | | " +echo " |_| " +echo " " +echo " version: 0.11 " + +set "CURRENT_DIR=%cd%" +if not "%MOQUETTE_HOME%" == "" goto gotHome +set "MOQUETTE_HOME=%CURRENT_DIR%" +if exist "%MOQUETTE_HOME%\bin\moquette.bat" goto okHome +cd .. +set "MOQUETTE_HOME=%cd%" +cd "%CURRENT_DIR%" +:gotHome +if exist "%MOQUETTE_HOME%\bin\moquette.bat" goto okHome + echo The MOQUETTE_HOME environment variable is not defined correctly + echo This environment variable is needed to run this program +goto end +:okHome + +rem Set JavaHome if it exists +if exist { "%JAVA_HOME%\bin\java" } ( + set "JAVA="%JAVA_HOME%\bin\java" +) + +echo Using JAVA_HOME: "%JAVA_HOME%" +echo Using MOQUETTE_HOME: "%MOQUETTE_HOME%" + +rem set LOG_CONSOLE_LEVEL=info +rem set LOG_FILE_LEVEL=fine +set JAVA_OPTS= +set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true +set MOQUETTE_PATH=%MOQUETTE_HOME% +set LOG_FILE=%MOQUETTE_HOME%\config\moquette-log.properties + +rem # Use the Hotspot garbage-first collector. +set JAVA_OPTS=%JAVA_OPTS% -XX:+UseG1GC + +rem # Have the JVM do less remembered set work during STW, instead +rem # preferring concurrent GC. Reduces p99.9 latency. +set JAVA_OPTS=%JAVA_OPTS% -XX:G1RSetUpdatingPauseTimePercent=5 + +rem # Main G1GC tunable: lowering the pause target will lower throughput and vise versa. +rem # 200ms is the JVM default and lowest viable setting +rem # 1000ms increases throughput. Keep it smaller than the timeouts. +set JAVA_OPTS=%JAVA_OPTS% -XX:MaxGCPauseMillis=500 + +rem # Optional G1 Settings + +rem Save CPU time on large (>= 16GB) heaps by delaying region scanning +rem until the heap is 70% full. The default in Hotspot 8u40 is 40%. +rem set JAVA_OPTS=%JAVA_OPTS% -XX:InitiatingHeapOccupancyPercent=70 + +rem For systems with > 8 cores, the default ParallelGCThreads is 5/8 the number of logical cores. +rem Otherwise equal to the number of cores when 8 or less. +rem Machines with > 10 cores should try setting these to <= full cores. +rem set JAVA_OPTS=%JAVA_OPTS% -XX:ParallelGCThreads=16 + +rem By default, ConcGCThreads is 1/4 of ParallelGCThreads. +rem Setting both to the same value can reduce STW durations. +rem set JAVA_OPTS=%JAVA_OPTS% -XX:ConcGCThreads=16 + +rem ## GC logging options -- uncomment to enable + +set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCDetails +set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCDateStamps +set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintHeapAtGC +set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintTenuringDistribution +set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCApplicationStoppedTime +set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintPromotionFailure +rem set JAVA_OPTS=%JAVA_OPTS% -XX:PrintFLSStatistics=1 +rem set JAVA_OPTS=%JAVA_OPTS% -Xloggc:/var/log/moquette/gc.log +set JAVA_OPTS=%JAVA_OPTS% -XX:+UseGCLogFileRotation +set JAVA_OPTS=%JAVA_OPTS% -XX:NumberOfGCLogFiles=10 +set JAVA_OPTS=%JAVA_OPTS% -XX:GCLogFileSize=10M" + +%JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% -Dlog4j.configuration=file:%LOG_FILE% -Dmoquette.path=%MOQUETTE_PATH% -cp %MOQUETTE_HOME%\lib\* io.moquette.server.Server diff --git a/distribution/src/main/scripts/moquette.sh b/distribution/src/main/scripts/moquette.sh index 3391cbaa..f01e6e39 100644 --- a/distribution/src/main/scripts/moquette.sh +++ b/distribution/src/main/scripts/moquette.sh @@ -13,7 +13,7 @@ echo " \_| |_/\___/ \__, |\__,_|\___|\__|\__\___| \_| |_/\_/\_\ \_/ \_/ " echo " | | " echo " |_| " echo " " -echo " version: 0.11-SNAPSHOT " +echo " version: 0.11 " cd "$(dirname "$0")" diff --git a/tools_scripts/integration/brokerEmbeddedTest.groovy b/tools_scripts/integration/brokerEmbeddedTest.groovy index 7c40de79..97fe45b2 100644 --- a/tools_scripts/integration/brokerEmbeddedTest.groovy +++ b/tools_scripts/integration/brokerEmbeddedTest.groovy @@ -1,5 +1,5 @@ @GrabResolver(name='moquette-bintray', root='http://dl.bintray.com/andsel/maven/') -@Grab(group='io.moquette', module='moquette-broker', version='0.11-SNAPSHOT') +@Grab(group='io.moquette', module='moquette-broker', version='0.11') import io.moquette.server.Server