Build, prepare for Apache Nexus artifacts publication ZEST-20 & ZEST-28
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/b351def7 Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/b351def7 Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/b351def7 Branch: refs/heads/develop Commit: b351def71fb68e1262bf890a9c2b86c1576724b0 Parents: 8886104 Author: Paul Merlin <[email protected]> Authored: Fri Jun 19 11:41:10 2015 +0200 Committer: Paul Merlin <[email protected]> Committed: Fri Jun 19 11:41:10 2015 +0200 ---------------------------------------------------------------------- build.gradle | 30 +++++++++++++------- .../src/docs/tutorials/howto-build-system.txt | 4 +-- 2 files changed, 22 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/b351def7/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 57dd7be..37cbc5d 100644 --- a/build.gradle +++ b/build.gradle @@ -30,9 +30,11 @@ project.ext { buildscript { repositories { maven { url "https://plugins.gradle.org/m2/"; } + jcenter() } dependencies { classpath 'gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.1.1' + classpath 'org.hibernate.build.gradle:gradle-maven-publish-auth:2.0.1' } } @@ -41,6 +43,7 @@ apply plugin: 'java' 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' @@ -136,11 +139,12 @@ allprojects { // apply plugin: 'checkstyle' apply plugin: 'project-report' apply plugin: 'maven' + apply plugin: 'maven-publish-auth' defaultTasks 'classes', 'test' - group = name.substring( 0, name.lastIndexOf( '.' ) ) + group = name == 'org.qi4j' ? 'org.qi4j' : name.substring( 0, name.lastIndexOf( '.' ) ) version = System.properties.version ?: "0" // UTF-8 For all compilations and javadocs @@ -180,16 +184,22 @@ allprojects { def uploadReleaseSpec = rootProject.hasProperty('uploadReleaseSpec') \ ? rootProject.uploadReleaseSpec : uploadReleases \ ? true : false - // By default RELEASES are uploaded using SSH, SNAPSHOTS using WEBDAV + // By default RELEASES and SNAPSHOTS are uploaded using HTTP // Used Wagon can be overriden by setting the uploadWagon property - // def wagonSSH = "org.apache.maven.wagon:wagon-ssh:1.0-beta-2" - def wagonWEBDAV = "org.apache.maven.wagon:wagon-webdav:1.0-beta-2" + // def wagonSSH = "org.apache.maven.wagon:wagon-ssh:2.2" + // def wagonWEBDAV = "org.apache.maven.wagon:wagon-webdav:1.0-beta-2" + def wagonHTTP = "org.apache.maven.wagon:wagon-http:2.2" def uploadWagon = rootProject.hasProperty('uploadWagon') \ - ? rootProject.uploadWagon : wagonWEBDAV - // By default RELEASES are uploaded to OPS4J, SNAPSHOTS to Cloudbees + ? rootProject.uploadWagon : wagonHTTP + // By default RELEASES and SNAPSHOTS are uploaded to Apache Nexus // Target repository can be overriden by setting the uploadRepository property - def releasesRepository = "dav:https://repository-qi4j.forge.cloudbees.com/release/"; - def snapshotsRepository = "dav:https://repository-qi4j.forge.cloudbees.com/snapshot/"; + def releasesRepositoryName = "apache.releases.https" + def releasesRepository = "https://repository.apache.org/content/repositories/releases"; + def snapshotsRepositoryName = "apache.snapshots.https" + def snapshotsRepository = "https://repository.apache.org/content/repositories/snapshots"; + def uploadRepositoryName = rootProject.hasProperty('uploadRepositoryName') \ + ? rootProject.uploadRepositoryName \ + : uploadReleases ? releasesRepositoryName : snapshotsRepositoryName def uploadRepository = rootProject.hasProperty('uploadRepository') \ ? rootProject.uploadRepository \ : uploadReleases ? releasesRepository : snapshotsRepository @@ -372,11 +382,11 @@ allprojects { if( uploadSigned ) beforeDeployment { MavenDeployment deployment -> signing.signPom( deployment ) } configuration = configurations.deployerJars - repository(url: uploadRepository) { + repository(id: uploadRepositoryName, url: uploadRepository) { if( uploadUsername ) authentication(userName: uploadUsername, password: uploadPassword) } - snapshotRepository(url: uploadRepository) { + snapshotRepository(id: uploadRepositoryName, url: uploadRepository) { if( uploadUsername ) authentication(userName: uploadUsername, password: uploadPassword) } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/b351def7/manual/src/docs/tutorials/howto-build-system.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-build-system.txt b/manual/src/docs/tutorials/howto-build-system.txt index 8c0da11..c26186b 100644 --- a/manual/src/docs/tutorials/howto-build-system.txt +++ b/manual/src/docs/tutorials/howto-build-system.txt @@ -209,10 +209,10 @@ Signing can be turned on or off by setting the `uploadSigned` property to false. By default RELEASES must satisfy ReleaseSpecification, SNAPSHOT don't. ReleaseSpecification usage can be turned on or off by setting the `uploadReleaseSpec` property to false. -By default RELEASES and SNAPHOTS are uploaded using WEBDAV. +By default RELEASES and SNAPHOTS are uploaded using HTTP. Used Wagon can be overriden by setting the `uploadWagon` property. -By default RELEASES and SNAPSHOTS are uploaded to Cloudbees. +By default RELEASES and SNAPSHOTS are uploaded to the Apache Nexus. Target repository can be overriden by setting the `uploadRepository` property. No username/password is provided by default.
