Return-Path: X-Original-To: apmail-zest-commits-archive@minotaur.apache.org Delivered-To: apmail-zest-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1701017821 for ; Tue, 28 Jul 2015 12:55:34 +0000 (UTC) Received: (qmail 34279 invoked by uid 500); 28 Jul 2015 12:54:59 -0000 Delivered-To: apmail-zest-commits-archive@zest.apache.org Received: (qmail 34228 invoked by uid 500); 28 Jul 2015 12:54:59 -0000 Mailing-List: contact commits-help@zest.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zest.apache.org Delivered-To: mailing list commits@zest.apache.org Received: (qmail 33563 invoked by uid 99); 28 Jul 2015 12:54:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jul 2015 12:54:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 09EACE188E; Tue, 28 Jul 2015 12:54:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulmerlin@apache.org To: commits@zest.apache.org Date: Tue, 28 Jul 2015 12:55:36 -0000 Message-Id: <1dabcc080d124d21b345a211a498d0e7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [39/50] zest-java git commit: ZEST-24 Fix POM content customization ZEST-24 Fix POM content customization Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/29828264 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/29828264 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/29828264 Branch: refs/heads/master Commit: 298282644b7b4a5109a1bb27cd8f3254fc290a06 Parents: 59e9d86 Author: Paul Merlin Authored: Sat Jul 25 14:33:10 2015 +0200 Committer: Paul Merlin Committed: Sat Jul 25 14:33:10 2015 +0200 ---------------------------------------------------------------------- build.gradle | 2 +- maven-compat.gradle | 470 ++++++++++++++++++++++++----------------------- 2 files changed, 238 insertions(+), 234 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/29828264/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 55b1208..f342ad4 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,6 @@ apply plugin: 'idea' apply plugin: 'signing' apply plugin: 'maven' apply plugin: 'maven-publish-auth' -apply from: 'maven-compat.gradle' apply plugin: 'project-report' apply from: 'libraries.gradle' apply plugin: 'org.nosphere.apache.rat' @@ -425,6 +424,7 @@ allprojects { } } } + apply from: "$rootProject.projectDir/maven-compat.gradle" apply plugin: 'maven-publish-auth' // Bug in maven-publish-auth require apply after uploadArchives setup idea.module.iml { http://git-wip-us.apache.org/repos/asf/zest-java/blob/29828264/maven-compat.gradle ---------------------------------------------------------------------- diff --git a/maven-compat.gradle b/maven-compat.gradle index c2fec45..0387818 100644 --- a/maven-compat.gradle +++ b/maven-compat.gradle @@ -17,262 +17,266 @@ * under the License. */ -apply plugin: 'maven' - // See http://maven.apache.org/pom/asf/ -pom { +uploadArchives { + repositories.mavenDeployer { - project { - url 'https://zest.apache.org/' - organization { - name 'The Apache Software Foundation' - url 'https://apache.org/' - } - inceptionYear '2007' - issueManagement { - system 'jira' - url 'https://issues.apache.org/jira/browse/ZEST' - } - scm { - url "https://github.com/apache/zest-qi4j" - connection "scm:git:https://git-wip-us.apache.org/repos/asf/zest-qi4j.git" - developerConnection "scm:git:https://git-wip-us.apache.org/repos/asf/zest-qi4j.git" - } - licenses { - license { - name 'Apache License, version 2.0.' - url 'http://www.apache.org/licenses/LICENSE-2.0' - } - } - mailingLists { - mailingList { - name 'Users List' - subscribe 'users-subscribe@zest.apache.org' - unsubscribe 'users-unsubscribe@zest.apache.org' - post 'users@zest.apache.org' - archive 'https://mail-archives.apache.org/mod_mbox/zest-users/' - otherArchives { - otherArchive 'https://www.apache.org/foundation/mailinglists.html#archives' - } - } - mailingList { - name 'Development List' - subscribe 'dev-subscribe@zest.apache.org' - unsubscribe 'dev-unsubscribe@zest.apache.org' - post 'dev@zest.apache.org' - archive 'https://mail-archives.apache.org/mod_mbox/zest-dev/' - otherArchives { - otherArchive 'https://www.apache.org/foundation/mailinglists.html#archives' - } - } - mailingList { - name 'Commits List' - subscribe 'commits-subscribe@zest.apache.org' - unsubscribe 'commits-unsubscribe@zest.apache.org' - post 'commits@zest.apache.org' - archive 'https://mail-archives.apache.org/mod_mbox/zest-commits/' - otherArchives { - otherArchive 'https://www.apache.org/foundation/mailinglists.html#archives' - } - } - } - developers { - developer { - id 'niclas@hedhman.org' - name 'Niclas Hedhman' - email 'niclas@hedhman.org' - roles { - role 'Core Team' + pom { + + project { + url 'https://zest.apache.org/' + organization { + name 'The Apache Software Foundation' + url 'https://apache.org/' } - organizationUrl 'http://www.qi4j.org' - timezone 'UTC+8' - } - developer { - id 'rickardoberg' - name 'Rickard \u00F6berg' - email 'rickard.oberg@jayway.se' - roles { - role 'Core Team' + inceptionYear '2007' + issueManagement { + system 'jira' + url 'https://issues.apache.org/jira/browse/ZEST' } - url 'http://www.neotechnology.com' - organization 'Neo Technology AB' - organizationUrl 'http://www.neotechnology.com' - timezone 'UTC+8' - } - developer { - id 'edward.yakop@gmail.com' - name 'Edward Yakop' - email 'efy@codedragons.com' - roles { - role 'Core Team' + scm { + url "https://github.com/apache/zest-java" + connection "scm:git:https://git-wip-us.apache.org/repos/asf/zest-java.git" + developerConnection "scm:git:https://git-wip-us.apache.org/repos/asf/zest-java.git" } - organizationUrl 'http://www.qi4j.org' - timezone 'UTC+8' - } - developer { - id 'adreghiciu@gmail.com' - name 'Alin Dreghiciu' - email 'adreghiciu@codedragons.com' - roles { - role 'Core Team' + licenses { + license { + name 'Apache License, version 2.0.' + url 'http://www.apache.org/licenses/LICENSE-2.0' + } } - organizationUrl 'http://www.qi4j.org' - timezone 'UTC+2' - } - developer { - id 'mesirii' - name 'Michael Hunger' - email 'qi4j@jexp.de' - roles { - role 'Core Team' + mailingLists { + mailingList { + name 'Users List' + subscribe 'users-subscribe@zest.apache.org' + unsubscribe 'users-unsubscribe@zest.apache.org' + post 'users@zest.apache.org' + archive 'https://mail-archives.apache.org/mod_mbox/zest-users/' + otherArchives { + otherArchive 'https://www.apache.org/foundation/mailinglists.html#archives' + } + } + mailingList { + name 'Development List' + subscribe 'dev-subscribe@zest.apache.org' + unsubscribe 'dev-unsubscribe@zest.apache.org' + post 'dev@zest.apache.org' + archive 'https://mail-archives.apache.org/mod_mbox/zest-dev/' + otherArchives { + otherArchive 'https://www.apache.org/foundation/mailinglists.html#archives' + } + } + mailingList { + name 'Commits List' + subscribe 'commits-subscribe@zest.apache.org' + unsubscribe 'commits-unsubscribe@zest.apache.org' + post 'commits@zest.apache.org' + archive 'https://mail-archives.apache.org/mod_mbox/zest-commits/' + otherArchives { + otherArchive 'https://www.apache.org/foundation/mailinglists.html#archives' + } + } } - timezone 'CET' - } + developers { + developer { + id 'niclas@hedhman.org' + name 'Niclas Hedhman' + email 'niclas@hedhman.org' + roles { + role 'Core Team' + } + organizationUrl 'http://www.qi4j.org' + timezone 'UTC+8' + } + developer { + id 'rickardoberg' + name 'Rickard \u00F6berg' + email 'rickard.oberg@jayway.se' + roles { + role 'Core Team' + } + url 'http://www.neotechnology.com' + organization 'Neo Technology AB' + organizationUrl 'http://www.neotechnology.com' + timezone 'UTC+8' + } + developer { + id 'edward.yakop@gmail.com' + name 'Edward Yakop' + email 'efy@codedragons.com' + roles { + role 'Core Team' + } + organizationUrl 'http://www.qi4j.org' + timezone 'UTC+8' + } + developer { + id 'adreghiciu@gmail.com' + name 'Alin Dreghiciu' + email 'adreghiciu@codedragons.com' + roles { + role 'Core Team' + } + organizationUrl 'http://www.qi4j.org' + timezone 'UTC+2' + } + developer { + id 'mesirii' + name 'Michael Hunger' + email 'qi4j@jexp.de' + roles { + role 'Core Team' + } + timezone 'CET' + } - developer { - id "muhdkamil" - name "Muhd Kamil bin Mohd Baki" - roles { - role 'Platform Team' - } - timezone "UTC+8" - } + developer { + id "muhdkamil" + name "Muhd Kamil bin Mohd Baki" + roles { + role 'Platform Team' + } + timezone "UTC+8" + } - developer { - id "ops4j@leangen.net" - name "David Leangen" - organization "Bioscene" - email "ops4j@leangen.net" - roles { - role 'Platform Team' - } - timezone "UTC+9" - } + developer { + id "ops4j@leangen.net" + name "David Leangen" + organization "Bioscene" + email "ops4j@leangen.net" + roles { + role 'Platform Team' + } + timezone "UTC+9" + } - developer { - id "sonny.gill@jayway.net" - name "Sonny Gill" - email "sonny.public@gmail.com" - roles { - role 'Community Team' - } - timezone "UTC+8" - } + developer { + id "sonny.gill@jayway.net" + name "Sonny Gill" + email "sonny.public@gmail.com" + roles { + role 'Community Team' + } + timezone "UTC+8" + } - developer { - id "taowen" - name "Tao Wen" - organization "" - email "taowen@gmail.com" - roles { - role 'Community Team' - } - timezone "UTC+8" - } + developer { + id "taowen" + name "Tao Wen" + organization "" + email "taowen@gmail.com" + roles { + role 'Community Team' + } + timezone "UTC+8" + } - developer { - id "thobe" - name "Tobias Ivarsson" - email "tobias@neotechnology.com" - url "http://www.neotechnology.com" - organization "NeoTechnology" - organizationUrl "http://www.neotechnology.com" - roles { - role "Platform Team" - } - timezone "CET" - } + developer { + id "thobe" + name "Tobias Ivarsson" + email "tobias@neotechnology.com" + url "http://www.neotechnology.com" + organization "NeoTechnology" + organizationUrl "http://www.neotechnology.com" + roles { + role "Platform Team" + } + timezone "CET" + } - developer { - id "boon" - name "Lan Boon Ping" - email "boonping81@gmail.com" - roles { - role 'Platform Team' - } - timezone "UTC+8" - } + developer { + id "boon" + name "Lan Boon Ping" + email "boonping81@gmail.com" + roles { + role 'Platform Team' + } + timezone "UTC+8" + } - developer { - id "jan.kronquist@gmail.com" - name "Jan Kronquist" - email "jan.kronquist@gmail.com" - organization "Jayway" - roles { - role 'Platform Team' - } - timezone "CET" - } + developer { + id "jan.kronquist@gmail.com" + name "Jan Kronquist" + email "jan.kronquist@gmail.com" + organization "Jayway" + roles { + role 'Platform Team' + } + timezone "CET" + } - developer { - id "nmwael" - name "Nino Saturnino Martinez Vazquez Wael" - roles { - role 'Platform Team' - } - timezone "CET" - } + developer { + id "nmwael" + name "Nino Saturnino Martinez Vazquez Wael" + roles { + role 'Platform Team' + } + timezone "CET" + } - developer { - id "peter@neubauer.se" - name "Peter Neubauer" - email "peter@neubauer.se" - roles { - role 'Platform Team' - } - timezone "CET" - } + developer { + id "peter@neubauer.se" + name "Peter Neubauer" + email "peter@neubauer.se" + roles { + role 'Platform Team' + } + timezone "CET" + } - developer { - id "rwallace" - name "Richard Wallace" - email "rwallace@thewallacepack.net" - roles { - role 'Platform Team' - } - timezone "UTC-7" - } + developer { + id "rwallace" + name "Richard Wallace" + email "rwallace@thewallacepack.net" + roles { + role 'Platform Team' + } + timezone "UTC-7" + } - developer { - id "siannyhalim@gmail.com" - name "Sianny Halim" - email "siannyhalim@gmail.com" - roles { - role 'Platform Team' - } - timezone "UTC+8" - } + developer { + id "siannyhalim@gmail.com" + name "Sianny Halim" + email "siannyhalim@gmail.com" + roles { + role 'Platform Team' + } + timezone "UTC+8" + } - developer { - id "paul@nosphere.org" - name "Paul Merlin" - email "paul@nosphere.org" - roles { - role 'Core Team' - } - timezone "CET" - } + developer { + id "paul@nosphere.org" + name "Paul Merlin" + email "paul@nosphere.org" + roles { + role 'Core Team' + } + timezone "CET" + } - developer { - id "stas.dev+qi4j@gmail.com" - name "Stanislav Muhametsin" - email "stas.dev+qi4j@gmail.com" - roles { - role 'Platform Team' - } - timezone "UTC+2" - } + developer { + id "stas.dev+qi4j@gmail.com" + name "Stanislav Muhametsin" + email "stas.dev+qi4j@gmail.com" + roles { + role 'Platform Team' + } + timezone "UTC+2" + } - developer { - id "tonny" - name "Tonny Kohar" - roles { - role "Community Team" + developer { + id "tonny" + name "Tonny Kohar" + roles { + role "Community Team" + } + email "tonny.kohar@gmail.com" + timezone "UTC+7" + } } - email "tonny.kohar@gmail.com" - timezone "UTC+7" } } - } + + } }