diff --git a/build.gradle b/build.gradle index 6feaef8..77efb10 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,10 @@ test { jar { from { - configurations.artifactory.collect { it.isDirectory() ? it : zipTree(it)} + configurations.artifactory.collect { it.isDirectory() ? it : zipTree(it).matching { + exclude "**/**/com.jfrog.artifactory.properties" + } + } } } @@ -176,6 +179,35 @@ signing { sign configurations.archives, configurations.documentation } +gradlePlugin { + plugins { + escrowPlugin { + id = 'com.intershop.gradle.escrow-plugin' + implementationClass = "com.intershop.gradle.escrow.EscrowPlugin" + } + javadocPlugin { + id = 'com.intershop.gradle.javadoc-configuration' + implementationClass = "com.intershop.gradle.javadoc.JavaDocConfigurationPlugin" + } + javasourcePlugin { + id = 'com.intershop.gradle.javasource-plugin' + implementationClass = 'com.intershop.gradle.javasource.JavaSourcePlugin' + } + simplepublishPlugin { + id = 'com.intershop.gradle.simplepublish-configuration' + implementationClass = 'com.intershop.gradle.simplepublish.PublishConfigurationPlugin' + } + artifactorypublishPlugin { + id = 'com.intershop.gradle.artifactorypublish-configuration' + implementationClass = 'com.intershop.gradle.artifactorypublish.ArtifactoryPublishConfigurationPlugin' + } + simpleartifactorypublishPlugin { + id = 'com.intershop.gradle.simpleartifactorypublish-configuration' + implementationClass = 'com.intershop.gradle.artifactorypublish.SimpleArtifactoryPublishConfigurationPlugin' + } + } +} + pluginBundle { website = "https://github.com/IntershopCommunicationsAG/${project.name}" vcsUrl = "https://github.com/IntershopCommunicationsAG/${project.name}" @@ -184,28 +216,28 @@ pluginBundle { plugins { escrowPlugin { - id = 'com.intershop.gradle.escrow-plugin' displayName = 'Plugin for escrow package creation' + tags = ['intershop', 'publish', 'release', 'escrow'] } javadocPlugin { - id = 'com.intershop.gradle.javadoc-configuration' displayName = 'Plugin with Intershop specific javadoc configuration' + tags = ['intershop', 'publish', 'release', 'java', 'doc'] } javasourcePlugin { - id = 'com.intershop.gradle.javasource-plugin' displayName = 'Plugin with Intershop specific javasource package configuration' + tags = ['intershop', 'publish', 'release', 'java', 'source'] } simplepublishPlugin { - id = 'com.intershop.gradle.simplepublish-configuration' displayName = 'Plugin with simple publishing configuration' + tags = ['intershop', 'publish', 'release', 'simple'] } artifactorypublishPlugin { - id = 'com.intershop.gradle.artifactorypublish-configuration' displayName = 'Plugin with Intershop specific publishing configuration with Artifactory' + tags = ['intershop', 'publish', 'release', 'artifactory'] } simpleartifactorypublishPlugin { - id = 'com.intershop.gradle.simpleartifactorypublish-configuration' displayName = 'Plugin with Intershop specific simple publishing configuration with Artifactory' + tags = ['intershop', 'publish', 'release', 'artifactory', 'simple'] } } } @@ -241,7 +273,7 @@ dependencies { "libs/build-info-extractor-2.9.2.jar", "libs/build-info-extractor-gradle-4.6.0.jar") - compileOnly files("libs/build-info-api-2.9.2.jar", + compile files("libs/build-info-api-2.9.2.jar", "libs/build-info-client-2.9.2.jar", "libs/build-info-extractor-2.9.2.jar", "libs/build-info-extractor-gradle-4.6.0.jar") diff --git a/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.artifactorypublish-configuration.properties b/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.artifactorypublish-configuration.properties deleted file mode 100644 index 3b7485d..0000000 --- a/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.artifactorypublish-configuration.properties +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright 2015 Intershop Communications AG. -# -# 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. -# - -implementation-class=com.intershop.gradle.artifactorypublish.ArtifactoryPublishConfigurationPlugin \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.escrow-plugin.properties b/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.escrow-plugin.properties deleted file mode 100644 index 9f0fcd7..0000000 --- a/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.escrow-plugin.properties +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright 2015 Intershop Communications AG. -# -# 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. -# - -implementation-class=com.intershop.gradle.escrow.EscrowPlugin \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.javadoc-configuration.properties b/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.javadoc-configuration.properties deleted file mode 100644 index 3ab7935..0000000 --- a/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.javadoc-configuration.properties +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright 2015 Intershop Communications AG. -# -# 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. -# -implementation-class=com.intershop.gradle.javadoc.JavaDocConfigurationPlugin \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.javasource-plugin.properties b/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.javasource-plugin.properties deleted file mode 100644 index 4c5ec70..0000000 --- a/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.javasource-plugin.properties +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright 2015 Intershop Communications AG. -# -# 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. -# - -implementation-class=com.intershop.gradle.javasource.JavaSourcePlugin \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.simpleartifactorypublish-configuration.properties b/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.simpleartifactorypublish-configuration.properties deleted file mode 100644 index 10b6fd8..0000000 --- a/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.simpleartifactorypublish-configuration.properties +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright 2015 Intershop Communications AG. -# -# 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. -# - -implementation-class=com.intershop.gradle.artifactorypublish.SimpleArtifactoryPublishConfigurationPlugin \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.simplepublish-configuration.properties b/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.simplepublish-configuration.properties deleted file mode 100644 index 36cf199..0000000 --- a/src/main/resources/META-INF/gradle-plugins/com.intershop.gradle.simplepublish-configuration.properties +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright 2015 Intershop Communications AG. -# -# 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. -# - -implementation-class=com.intershop.gradle.simplepublish.PublishConfigurationPlugin \ No newline at end of file diff --git a/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectArtifactorySpec.groovy b/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectArtifactorySpec.groovy index d1b700f..bd4ef55 100644 --- a/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectArtifactorySpec.groovy +++ b/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectArtifactorySpec.groovy @@ -84,8 +84,8 @@ class MultiProjectArtifactorySpec extends AbstractIntegrationSpec { buildFile << """ plugins { id "ivy-publish" - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.artifactorypublish-configuration' } @@ -169,8 +169,8 @@ class MultiProjectArtifactorySpec extends AbstractIntegrationSpec { buildFile << """ plugins { id "ivy-publish" - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.artifactorypublish-configuration' } @@ -248,8 +248,8 @@ class MultiProjectArtifactorySpec extends AbstractIntegrationSpec { buildFile << """ plugins { id "maven-publish" - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.artifactorypublish-configuration' } @@ -329,8 +329,8 @@ class MultiProjectArtifactorySpec extends AbstractIntegrationSpec { buildFile << """ plugins { id "ivy-publish" - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.artifactorypublish-configuration' } @@ -410,8 +410,8 @@ class MultiProjectArtifactorySpec extends AbstractIntegrationSpec { buildFile << """ plugins { id "ivy-publish" - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.artifactorypublish-configuration' } @@ -491,8 +491,8 @@ class MultiProjectArtifactorySpec extends AbstractIntegrationSpec { buildFile << """ plugins { id "ivy-publish" - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.artifactorypublish-configuration' } diff --git a/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectSimpleArtifactoryPublishSpec.groovy b/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectSimpleArtifactoryPublishSpec.groovy index 95c4284..54475f5 100644 --- a/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectSimpleArtifactoryPublishSpec.groovy +++ b/src/test/groovy/com/intershop/gradle/artifactorypublish/MultiProjectSimpleArtifactoryPublishSpec.groovy @@ -78,8 +78,8 @@ class MultiProjectSimpleArtifactoryPublishSpec extends AbstractIntegrationSpec { buildFile << """ plugins { id "ivy-publish" - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.simpleartifactorypublish-configuration' } @@ -143,8 +143,8 @@ class MultiProjectSimpleArtifactoryPublishSpec extends AbstractIntegrationSpec { buildFile << """ plugins { id "maven-publish" - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.simpleartifactorypublish-configuration' } @@ -203,8 +203,8 @@ class MultiProjectSimpleArtifactoryPublishSpec extends AbstractIntegrationSpec { buildFile << """ plugins { id "ivy-publish" - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.simpleartifactorypublish-configuration' } @@ -266,8 +266,8 @@ class MultiProjectSimpleArtifactoryPublishSpec extends AbstractIntegrationSpec { buildFile << """ plugins { id "ivy-publish" - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.simpleartifactorypublish-configuration' } diff --git a/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleProjectSpec.groovy b/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleProjectSpec.groovy index f7b37bd..d7fdcaf 100644 --- a/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleProjectSpec.groovy +++ b/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleProjectSpec.groovy @@ -60,8 +60,8 @@ class SingleProjectSpec extends AbstractIntegrationSpec { plugins { id 'java' id 'ivy-publish' - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.artifactorypublish-configuration' } @@ -143,8 +143,8 @@ class SingleProjectSpec extends AbstractIntegrationSpec { plugins { id 'java' id 'ivy-publish' - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.artifactorypublish-configuration' } @@ -220,8 +220,8 @@ class SingleProjectSpec extends AbstractIntegrationSpec { plugins { id 'java' id 'maven-publish' - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.artifactorypublish-configuration' } @@ -300,8 +300,8 @@ class SingleProjectSpec extends AbstractIntegrationSpec { plugins { id 'java' id 'ivy-publish' - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.artifactorypublish-configuration' } @@ -379,8 +379,8 @@ class SingleProjectSpec extends AbstractIntegrationSpec { plugins { id 'java' id 'ivy-publish' - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.artifactorypublish-configuration' } diff --git a/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleSimpleProjectSpec.groovy b/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleSimpleProjectSpec.groovy index afabb25..ab93a61 100644 --- a/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleSimpleProjectSpec.groovy +++ b/src/test/groovy/com/intershop/gradle/artifactorypublish/SingleSimpleProjectSpec.groovy @@ -41,8 +41,8 @@ class SingleSimpleProjectSpec extends AbstractIntegrationSpec { plugins { id 'java' id 'ivy-publish' - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.simpleartifactorypublish-configuration' } @@ -104,8 +104,8 @@ class SingleSimpleProjectSpec extends AbstractIntegrationSpec { plugins { id 'java' id 'maven-publish' - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.simpleartifactorypublish-configuration' } @@ -164,8 +164,8 @@ class SingleSimpleProjectSpec extends AbstractIntegrationSpec { plugins { id 'java' id 'ivy-publish' - id 'com.intershop.gradle.scmversion' version '1.3.0' - id 'com.intershop.gradle.buildinfo' version '2.0.0' + id 'com.intershop.gradle.scmversion' version '2.7.4' + id 'com.intershop.gradle.buildinfo' version '2.4.2' id 'com.intershop.gradle.simpleartifactorypublish-configuration' }