diff --git a/build.gradle b/build.gradle index e5c2e3b0b..38bf72058 100644 --- a/build.gradle +++ b/build.gradle @@ -101,8 +101,8 @@ subprojects { } checkstyle { - configFile = rootProject.file('build/checkstyle/checkstyle.xml') - configProperties.checkstyleConfigDir = rootProject.file('build/checkstyle/') + configFile = rootProject.file('buildtools/src/main/resources/checkstyle/checkstyle.xml') + configProperties.checkstyleConfigDir = rootProject.file('buildtools/src/main/resources/checkstyle/') toolVersion = '8.1' } @@ -123,7 +123,7 @@ subprojects { license { include "**/*.java" - header rootProject.file('build/license/HEADER.txt') + header rootProject.file('buildtools/src/main/resources/license/HEADER.txt') strictCheck true mapping { java = 'SLASHSTAR_STYLE' @@ -231,27 +231,6 @@ subprojects { apply plugin: 'java' -configurations { - buildToolsConfig -} - -dependencies { - buildToolsConfig 'org.trellisldp:trellis-build-tools:0.2.0' -} - - -task processBuildTools(type: Copy) { - from { - configurations.buildToolsConfig.collect { - zipTree(it).matching { - include 'checkstyle/*.xml' - include 'license/*.txt' - } - } - } - into 'build' -} - task apidocs(type: Javadoc, dependsOn: getTasksByName('docs', true)) { outputs.upToDateWhen { false } destinationDir = new File(projectDir, "docs/apidocs") @@ -304,4 +283,3 @@ tasks.coveralls { dependsOn 'jacocoRootReport' } -check.dependsOn processBuildTools diff --git a/src/install/install-jdk-10.sh b/buildtools/src/install/install-jdk-10.sh similarity index 100% rename from src/install/install-jdk-10.sh rename to buildtools/src/install/install-jdk-10.sh diff --git a/buildtools/src/main/resources/checkstyle/checkstyle.xml b/buildtools/src/main/resources/checkstyle/checkstyle.xml new file mode 100644 index 000000000..e1e12b7b2 --- /dev/null +++ b/buildtools/src/main/resources/checkstyle/checkstyle.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildtools/src/main/resources/checkstyle/suppressions.xml b/buildtools/src/main/resources/checkstyle/suppressions.xml new file mode 100644 index 000000000..3465bd87c --- /dev/null +++ b/buildtools/src/main/resources/checkstyle/suppressions.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/buildtools/src/main/resources/license/HEADER.txt b/buildtools/src/main/resources/license/HEADER.txt new file mode 100644 index 000000000..51fca54c2 --- /dev/null +++ b/buildtools/src/main/resources/license/HEADER.txt @@ -0,0 +1,11 @@ +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.