diff --git a/build.gradle b/build.gradle index b404e3b62a..c3071b0e9a 100644 --- a/build.gradle +++ b/build.gradle @@ -22,18 +22,25 @@ buildscript { maven { url "https://maven.aliyun.com/repository/public" } + + maven { + url "https://plugins.gradle.org/m2/" + } + } dependencies { - classpath("net.sourceforge.pmd:pmd-java:5.4.1") - classpath("com.puppycrawl.tools:checkstyle:6.16.1") - classpath("com.google.code.findbugs:findbugs:3.0.1") + //classpath("net.sourceforge.pmd:pmd-java:5.4.1") + //classpath("com.puppycrawl.tools:checkstyle:6.16.1") + classpath("gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.0.7") + classpath('com.github.spotbugs:spotbugs:4.0.0') } } allprojects { apply plugin: 'java' + clean.doFirst { delete 'build' delete 'dist' @@ -45,7 +52,7 @@ allprojects { } } -task tar(overwrite: true, type: Tar) { +task tar(type: Tar) { extension = 'tar.gz' compression = Compression.GZIP archiveName = project.name + '_' + project.version + '.' + extension @@ -55,7 +62,7 @@ task tar(overwrite: true, type: Tar) { } } -task zip(overwrite: true, type: Zip) { +task zip(type: Zip) { extension = 'zip' archiveName = project.name + '.' + project.version + '.' + extension destinationDir = new File(projectDir, 'build') @@ -65,7 +72,8 @@ task zip(overwrite: true, type: Zip) { } subprojects { - apply plugin: "java" + + apply plugin: "maven" apply plugin: "eclipse" apply plugin: "idea" @@ -73,31 +81,66 @@ subprojects { apply plugin: "jacoco" apply plugin: "checkstyle" apply plugin: "pmd" - apply plugin: "findbugs" + apply plugin: 'com.github.spotbugs' [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8' compileJava.options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" jacoco { - toolVersion = "0.7.7.201606060606" + toolVersion = "0.8.5" reportsDir = file("$buildDir/reports/jacoco") } + jacocoTestReport { +// sourceSets sourceSets.main +// executionData files("$buildDir/jacoco/jacocoTest.exec") + + reports { + xml.enabled false + csv.enabled false + html.destination file("${buildDir}/reports/jacoco") + } + } + checkstyle { - checkstyle.toolVersion = "6.19" + toolVersion = "8.32" ignoreFailures = true sourceSets = [sourceSets.main] configFile = 'conf/checkstyle.xml' as File + showViolations true } - findbugs { + tasks.withType(Checkstyle) { + reports { + xml.enabled false + html.enabled true + } + } + + spotbugs { + toolVersion = '4.0.2' ignoreFailures = true - findbugsTest.enabled = false - sourceSets = [sourceSets.main] + effort = "default" + reportLevel = "default" + showProgress = true } - tasks.withType(FindBugs) { +// tasks.withType(com.github.spotbugs.SpotBugsTask) { +// sourceDirs = [sourceSets.main] +// reports { +// xml.enabled = false +// html.enabled = true +// } +// } + spotbugsMain { + reports { + xml.enabled = false + html.enabled = true + } + } + + spotbugsTest { reports { xml.enabled = false html.enabled = true @@ -111,35 +154,16 @@ subprojects { } } + pmd { + consoleOutput = true + toolVersion = "6.23.0" + rulePriority = 5 + ruleSets = ["category/java/errorprone.xml", "category/java/bestpractices.xml"] ignoreFailures = true - pmdTest.enabled = false - sourceSets = [sourceSets.main] - ruleSets = [ - 'java-basic', - 'java-braces', - 'java-clone', - 'java-codesize', - 'java-comments', - 'java-controversial', - 'java-coupling', - 'java-design', - 'java-empty', - 'java-finalizers', - 'java-imports', - 'java-optimizations', - 'java-strictexception', - 'java-strings', - 'java-typeresolution', - 'java-unnecessary', - 'java-unusedcode' - ] } - task jacocoAllTestReport(type: JacocoReport, dependsOn: ["test"]) { - sourceSets sourceSets.main - executionData files("$buildDir/jacoco/jacocoTest.exec") - } + List junit = [ "junit:junit:4.12" diff --git a/defibus-broker/conf/checkstyle.xml b/defibus-broker/conf/checkstyle.xml index aa4dd14af0..3d024111bc 100644 --- a/defibus-broker/conf/checkstyle.xml +++ b/defibus-broker/conf/checkstyle.xml @@ -1,43 +1,59 @@ - + + + + Checkstyle configuration that checks the Google coding conventions from Google Java Style + that can be found at https://google.github.io/styleguide/javaguide.html - + Checkstyle is very configurable. Be sure to read the documentation at + http://checkstyle.org (or in your downloaded distribution). - - - - + To completely disable a check, just comment it out or delete it from the file. + To suppress certain violations please review suppression filters. + + Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov. + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> + @@ -46,29 +62,63 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. - + + + - + + + + - - + - + + + + + + value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, + INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"/> + + + + + + - + + value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> + @@ -78,101 +128,187 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. + - + + - + + + + + + + + + + + + + + + + + + + - + - + + - + + - + + + + + + + + + + - - - + + - + - + + + + + - - - - + + + + + + + + + - - - + + - + + + + + + + + + + + + - + value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, + LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/> - + + + + - - - + + + - + - - - - + + + + + + + + - + @@ -180,18 +316,14 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. - - - - - - + + - - + + + + - - - diff --git a/defibus-broker/src/main/java/cn/webank/defibus/broker/client/AdjustQueueNumStrategy.java b/defibus-broker/src/main/java/cn/webank/defibus/broker/client/AdjustQueueNumStrategy.java index 360294eb0d..da9b5c34ae 100644 --- a/defibus-broker/src/main/java/cn/webank/defibus/broker/client/AdjustQueueNumStrategy.java +++ b/defibus-broker/src/main/java/cn/webank/defibus/broker/client/AdjustQueueNumStrategy.java @@ -17,9 +17,6 @@ package cn.webank.defibus.broker.client; -import cn.webank.defibus.broker.DeFiBrokerController; -import cn.webank.defibus.common.DeFiBusConstant; -import io.netty.channel.Channel; import java.util.List; import java.util.Set; import java.util.concurrent.ScheduledThreadPoolExecutor; @@ -27,6 +24,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Predicate; + +import io.netty.channel.Channel; + import org.apache.rocketmq.broker.client.ConsumerGroupInfo; import org.apache.rocketmq.common.MixAll; import org.apache.rocketmq.common.TopicConfig; @@ -36,6 +36,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.webank.defibus.broker.DeFiBrokerController; +import cn.webank.defibus.common.DeFiBusConstant; + public class AdjustQueueNumStrategy { private static final Logger log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME); private final DeFiBrokerController deFiBrokerController; @@ -114,7 +117,7 @@ public void run() { log.info("try adjust read queue size to {} for [{}], prev: {}, {}", adjustReadQueueSize, topic, topicConfig.getReadQueueNums(), mode); if (adjustReadQueueSize < topicConfig.getWriteQueueNums()) { log.info("adjust read queues to {} for [{}] fail. read queue size can't less than write queue size[{}]. {}", - adjustReadQueueSize, topic, topicConfig.getWriteQueueNums(), mode); + adjustReadQueueSize, topic, topicConfig.getWriteQueueNums(), mode); return; } boolean canAdjustReadQueueSize = isCanAdjustReadQueueSize(topic, adjustReadQueueSize); @@ -182,7 +185,7 @@ public void run() { notifyWhenTopicConfigChange(topic); } else { log.info("adjust write queues to {} for [{}] fail. target write queue size can't less than 0 or greater than read queue size[{}]. mode: {}", - adjustWriteQueueSize, topic, topicConfig.getReadQueueNums(), mode); + adjustWriteQueueSize, topic, topicConfig.getReadQueueNums(), mode); } } else { log.info("no need to adjust write queue size for [{}]. now [w:{}/r:{}]. {}", topic, topicConfig.getWriteQueueNums(), topicConfig.getReadQueueNums(), mode); @@ -243,10 +246,10 @@ private long nearbyClients(Set cidList) { public boolean test(String cid) { String[] cidArr = cid.split(DeFiBusConstant.INSTANCE_NAME_SEPERATER); if (cidArr.length > 2) { - String idc = cidArr[cidArr.length-1]; + String idc = cidArr[cidArr.length - 1]; String clusterName = deFiBrokerController.getBrokerConfig().getBrokerClusterName(); if (clusterName.toUpperCase().startsWith(idc) || - idc.startsWith(clusterName.toUpperCase())) { + idc.startsWith(clusterName.toUpperCase())) { return true; } } @@ -328,7 +331,7 @@ private boolean isAllMessageConsumed(String topic, Set groups, int queue long ackOffset = deFiBrokerController.getConsumeQueueManager().queryOffset(group, topic, queueId); if (ackOffset < maxOffset) { log.info("not finish consume message for topic: {} by group : {}, queueId: {}, ackOffset: {}, maxOffset: {}", - topic, group, queueId, ackOffset, maxOffset); + topic, group, queueId, ackOffset, maxOffset); return false; } } diff --git a/defibus-client/conf/checkstyle.xml b/defibus-client/conf/checkstyle.xml index aa4dd14af0..3d024111bc 100644 --- a/defibus-client/conf/checkstyle.xml +++ b/defibus-client/conf/checkstyle.xml @@ -1,43 +1,59 @@ - + + + + Checkstyle configuration that checks the Google coding conventions from Google Java Style + that can be found at https://google.github.io/styleguide/javaguide.html - + Checkstyle is very configurable. Be sure to read the documentation at + http://checkstyle.org (or in your downloaded distribution). - - - - + To completely disable a check, just comment it out or delete it from the file. + To suppress certain violations please review suppression filters. + + Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov. + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> + @@ -46,29 +62,63 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. - + + + - + + + + - - + - + + + + + + value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, + INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"/> + + + + + + - + + value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> + @@ -78,101 +128,187 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. + - + + - + + + + + + + + + + + + + + + + + + + - + - + + - + + - + + + + + + + + + + - - - + + - + - + + + + + - - - - + + + + + + + + + - - - + + - + + + + + + + + + + + + - + value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, + LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/> - + + + + - - - + + + - + - - - - + + + + + + + + - + @@ -180,18 +316,14 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. - - - - - - + + - - + + + + - - - diff --git a/defibus-common/conf/checkstyle.xml b/defibus-common/conf/checkstyle.xml index aa4dd14af0..3d024111bc 100644 --- a/defibus-common/conf/checkstyle.xml +++ b/defibus-common/conf/checkstyle.xml @@ -1,43 +1,59 @@ - + + + + Checkstyle configuration that checks the Google coding conventions from Google Java Style + that can be found at https://google.github.io/styleguide/javaguide.html - + Checkstyle is very configurable. Be sure to read the documentation at + http://checkstyle.org (or in your downloaded distribution). - - - - + To completely disable a check, just comment it out or delete it from the file. + To suppress certain violations please review suppression filters. + + Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov. + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> + @@ -46,29 +62,63 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. - + + + - + + + + - - + - + + + + + + value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, + INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"/> + + + + + + - + + value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> + @@ -78,101 +128,187 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. + - + + - + + + + + + + + + + + + + + + + + + + - + - + + - + + - + + + + + + + + + + - - - + + - + - + + + + + - - - - + + + + + + + + + - - - + + - + + + + + + + + + + + + - + value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, + LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/> - + + + + - - - + + + - + - - - - + + + + + + + + - + @@ -180,18 +316,14 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. - - - - - - + + - - + + + + - - - diff --git a/defibus-examples/conf/checkstyle.xml b/defibus-examples/conf/checkstyle.xml index aa4dd14af0..3d024111bc 100644 --- a/defibus-examples/conf/checkstyle.xml +++ b/defibus-examples/conf/checkstyle.xml @@ -1,43 +1,59 @@ - + + + + Checkstyle configuration that checks the Google coding conventions from Google Java Style + that can be found at https://google.github.io/styleguide/javaguide.html - + Checkstyle is very configurable. Be sure to read the documentation at + http://checkstyle.org (or in your downloaded distribution). - - - - + To completely disable a check, just comment it out or delete it from the file. + To suppress certain violations please review suppression filters. + + Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov. + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> + @@ -46,29 +62,63 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. - + + + - + + + + - - + - + + + + + + value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, + INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"/> + + + + + + - + + value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> + @@ -78,101 +128,187 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. + - + + - + + + + + + + + + + + + + + + + + + + - + - + + - + + - + + + + + + + + + + - - - + + - + - + + + + + - - - - + + + + + + + + + - - - + + - + + + + + + + + + + + + - + value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, + LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/> - + + + + - - - + + + - + - - - - + + + + + + + + - + @@ -180,18 +316,14 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. - - - - - - + + - - + + + + - - - diff --git a/defibus-namesrv/conf/checkstyle.xml b/defibus-namesrv/conf/checkstyle.xml index aa4dd14af0..3d024111bc 100644 --- a/defibus-namesrv/conf/checkstyle.xml +++ b/defibus-namesrv/conf/checkstyle.xml @@ -1,43 +1,59 @@ - + + + + Checkstyle configuration that checks the Google coding conventions from Google Java Style + that can be found at https://google.github.io/styleguide/javaguide.html - + Checkstyle is very configurable. Be sure to read the documentation at + http://checkstyle.org (or in your downloaded distribution). - - - - + To completely disable a check, just comment it out or delete it from the file. + To suppress certain violations please review suppression filters. + + Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov. + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> + @@ -46,29 +62,63 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. - + + + - + + + + - - + - + + + + + + value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, + INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"/> + + + + + + - + + value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> + @@ -78,101 +128,187 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. + - + + - + + + + + + + + + + + + + + + + + + + - + - + + - + + - + + + + + + + + + + - - - + + - + - + + + + + - - - - + + + + + + + + + - - - + + - + + + + + + + + + + + + - + value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, + LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/> - + + + + - - - + + + - + - - - - + + + + + + + + - + @@ -180,18 +316,14 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. - - - - - - + + - - + + + + - - - diff --git a/defibus-tools/conf/checkstyle.xml b/defibus-tools/conf/checkstyle.xml index aa4dd14af0..3d024111bc 100644 --- a/defibus-tools/conf/checkstyle.xml +++ b/defibus-tools/conf/checkstyle.xml @@ -1,43 +1,59 @@ - + + + + Checkstyle configuration that checks the Google coding conventions from Google Java Style + that can be found at https://google.github.io/styleguide/javaguide.html - + Checkstyle is very configurable. Be sure to read the documentation at + http://checkstyle.org (or in your downloaded distribution). - - - - + To completely disable a check, just comment it out or delete it from the file. + To suppress certain violations please review suppression filters. + + Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov. + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> + @@ -46,29 +62,63 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. - + + + - + + + + - - + - + + + + + + value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, + INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"/> + + + + + + - + + value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> + @@ -78,101 +128,187 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. + - + + - + + + + + + + + + + + + + + + + + + + - + - + + - + + - + + + + + + + + + + - - - + + - + - + + + + + - - - - + + + + + + + + + - - - + + - + + + + + + + + + + + + - + value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, + LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/> - + + + + - - - + + + - + - - - - + + + + + + + + - + @@ -180,18 +316,14 @@ Checkstyle configuration that checks the DeFiBus Team coding convertions. - - - - - - + + - - + + + + - - - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..490fda8577 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..6623300beb --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 4453ccea33..2fe81a7d95 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# 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 +# +# https://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. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,16 +44,16 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -109,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` @@ -138,35 +154,30 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f9553162f1..62bd9b9cce 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/style/codeStyle.xml b/style/codeStyle.xml deleted file mode 100644 index 30db1f5b28..0000000000 --- a/style/codeStyle.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - \ No newline at end of file