From d5e2d285fdc990b27ef6a62aead3a1c9ef5949b6 Mon Sep 17 00:00:00 2001 From: Mike Lueders Date: Thu, 7 Aug 2014 23:11:43 -0500 Subject: [PATCH] upgraded license plugin to version 0.9.0 --- build.gradle | 3 +-- buildSrc/build.gradle | 2 +- ...uginMultiModuleIntegrationSpecification.groovy | 15 +++++++++++++++ ...stractCpdPluginIntegrationSpecification.groovy | 15 +++++++++++++++ ...ginMultiProjectIntegrationSpecification.groovy | 15 +++++++++++++++ ...uginMultiModuleIntegrationSpecification.groovy | 15 +++++++++++++++ .../gradle/license/LicenseExtPlugin.groovy | 6 ++++++ .../maven/publish/DependencyResolver.groovy | 15 +++++++++++++++ .../bancvue/gradle/maven/publish/Exclusion.groovy | 15 +++++++++++++++ .../multiproject/PostEvaluationNotifier.groovy | 15 +++++++++++++++ .../bancvue/gradle/test/JacocoExtExtension.groovy | 15 +++++++++++++++ .../PostEvaluationNotifierTest.groovy | 15 +++++++++++++++ 12 files changed, 143 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 391d786..d44fd94 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ repositories { dependencies { compile localGroovy() compile gradleApi() - compile ("nl.javadude.gradle.plugins:license-gradle-plugin:0.7.0") { + compile ("nl.javadude.gradle.plugins:license-gradle-plugin:0.9.0") { exclude group: 'com.google.guava' } @@ -48,7 +48,6 @@ license { - /**********************************************************************************************************************/ // Everything below is POC diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index d55f2e1..846d103 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -4,7 +4,7 @@ repositories { dependencies { compile gradleApi() - compile 'nl.javadude.gradle.plugins:license-gradle-plugin:0.7.0' + compile 'nl.javadude.gradle.plugins:license-gradle-plugin:0.9.0' } sourceSets { diff --git a/src/integrationTest/groovy/com/bancvue/gradle/maven/publish/MavenPublishExtPluginMultiModuleIntegrationSpecification.groovy b/src/integrationTest/groovy/com/bancvue/gradle/maven/publish/MavenPublishExtPluginMultiModuleIntegrationSpecification.groovy index 94da423..69b677c 100644 --- a/src/integrationTest/groovy/com/bancvue/gradle/maven/publish/MavenPublishExtPluginMultiModuleIntegrationSpecification.groovy +++ b/src/integrationTest/groovy/com/bancvue/gradle/maven/publish/MavenPublishExtPluginMultiModuleIntegrationSpecification.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014 BancVue, LTD + * + * 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. + */ package com.bancvue.gradle.maven.publish import com.bancvue.gradle.test.AbstractPluginIntegrationSpecification diff --git a/src/integrationTest/groovy/com/bancvue/gradle/pmd/AbstractCpdPluginIntegrationSpecification.groovy b/src/integrationTest/groovy/com/bancvue/gradle/pmd/AbstractCpdPluginIntegrationSpecification.groovy index 4642aaf..17d2b50 100644 --- a/src/integrationTest/groovy/com/bancvue/gradle/pmd/AbstractCpdPluginIntegrationSpecification.groovy +++ b/src/integrationTest/groovy/com/bancvue/gradle/pmd/AbstractCpdPluginIntegrationSpecification.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014 BancVue, LTD + * + * 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. + */ package com.bancvue.gradle.pmd import com.bancvue.gradle.test.AbstractPluginIntegrationSpecification diff --git a/src/integrationTest/groovy/com/bancvue/gradle/pmd/CpdPluginMultiProjectIntegrationSpecification.groovy b/src/integrationTest/groovy/com/bancvue/gradle/pmd/CpdPluginMultiProjectIntegrationSpecification.groovy index 49daf19..8ca8553 100644 --- a/src/integrationTest/groovy/com/bancvue/gradle/pmd/CpdPluginMultiProjectIntegrationSpecification.groovy +++ b/src/integrationTest/groovy/com/bancvue/gradle/pmd/CpdPluginMultiProjectIntegrationSpecification.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014 BancVue, LTD + * + * 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. + */ package com.bancvue.gradle.pmd import com.bancvue.exception.ExceptionSupport import org.gradle.tooling.BuildException diff --git a/src/integrationTest/groovy/com/bancvue/gradle/test/JacocoExtPluginMultiModuleIntegrationSpecification.groovy b/src/integrationTest/groovy/com/bancvue/gradle/test/JacocoExtPluginMultiModuleIntegrationSpecification.groovy index 6aa4600..d82e125 100644 --- a/src/integrationTest/groovy/com/bancvue/gradle/test/JacocoExtPluginMultiModuleIntegrationSpecification.groovy +++ b/src/integrationTest/groovy/com/bancvue/gradle/test/JacocoExtPluginMultiModuleIntegrationSpecification.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014 BancVue, LTD + * + * 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. + */ package com.bancvue.gradle.test class JacocoExtPluginMultiModuleIntegrationSpecification extends AbstractPluginIntegrationSpecification { diff --git a/src/main/groovy/com/bancvue/gradle/license/LicenseExtPlugin.groovy b/src/main/groovy/com/bancvue/gradle/license/LicenseExtPlugin.groovy index b344752..264a951 100644 --- a/src/main/groovy/com/bancvue/gradle/license/LicenseExtPlugin.groovy +++ b/src/main/groovy/com/bancvue/gradle/license/LicenseExtPlugin.groovy @@ -35,6 +35,7 @@ class LicenseExtPlugin implements Plugin { configureLicenseHeader() excludedConfiguredFileExtensions() addCheckAllLicenseTask() + setGroupOnLicenseTasks() } private void init(Project project) { @@ -99,6 +100,11 @@ class LicenseExtPlugin implements Plugin { expressions } + private void setGroupOnLicenseTasks() { + project.tasks.findByName("licenseFormat")?.group = GROUP_NAME + project.tasks.findByName("downloadLicenses")?.group = GROUP_NAME + } + private void addCheckAllLicenseTask() { Task licenseCheck = project.tasks.create('licenseCheck') licenseCheck.group = GROUP_NAME diff --git a/src/main/groovy/com/bancvue/gradle/maven/publish/DependencyResolver.groovy b/src/main/groovy/com/bancvue/gradle/maven/publish/DependencyResolver.groovy index 5ad8a27..c6b774b 100644 --- a/src/main/groovy/com/bancvue/gradle/maven/publish/DependencyResolver.groovy +++ b/src/main/groovy/com/bancvue/gradle/maven/publish/DependencyResolver.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014 BancVue, LTD + * + * 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. + */ package com.bancvue.gradle.maven.publish import org.gradle.api.Project diff --git a/src/main/groovy/com/bancvue/gradle/maven/publish/Exclusion.groovy b/src/main/groovy/com/bancvue/gradle/maven/publish/Exclusion.groovy index 85d9eed..33a059b 100644 --- a/src/main/groovy/com/bancvue/gradle/maven/publish/Exclusion.groovy +++ b/src/main/groovy/com/bancvue/gradle/maven/publish/Exclusion.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014 BancVue, LTD + * + * 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. + */ package com.bancvue.gradle.maven.publish import org.gradle.api.artifacts.ExcludeRule diff --git a/src/main/groovy/com/bancvue/gradle/multiproject/PostEvaluationNotifier.groovy b/src/main/groovy/com/bancvue/gradle/multiproject/PostEvaluationNotifier.groovy index 49efe74..7e65248 100644 --- a/src/main/groovy/com/bancvue/gradle/multiproject/PostEvaluationNotifier.groovy +++ b/src/main/groovy/com/bancvue/gradle/multiproject/PostEvaluationNotifier.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014 BancVue, LTD + * + * 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. + */ package com.bancvue.gradle.multiproject import org.gradle.api.Project diff --git a/src/main/groovy/com/bancvue/gradle/test/JacocoExtExtension.groovy b/src/main/groovy/com/bancvue/gradle/test/JacocoExtExtension.groovy index b77d029..f31e3df 100644 --- a/src/main/groovy/com/bancvue/gradle/test/JacocoExtExtension.groovy +++ b/src/main/groovy/com/bancvue/gradle/test/JacocoExtExtension.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014 BancVue, LTD + * + * 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. + */ package com.bancvue.gradle.test class JacocoExtExtension { diff --git a/src/test/groovy/com/bancvue/gradle/multiproject/PostEvaluationNotifierTest.groovy b/src/test/groovy/com/bancvue/gradle/multiproject/PostEvaluationNotifierTest.groovy index 8b7d688..241f1d4 100644 --- a/src/test/groovy/com/bancvue/gradle/multiproject/PostEvaluationNotifierTest.groovy +++ b/src/test/groovy/com/bancvue/gradle/multiproject/PostEvaluationNotifierTest.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2014 BancVue, LTD + * + * 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. + */ package com.bancvue.gradle.multiproject import com.bancvue.gradle.test.AbstractProjectSpecification import org.gradle.api.Project