You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2013/07/17 15:28:51 UTC
svn commit: r1504128 - in /httpcomponents/project-release-tools/trunk:
buildSrc/build.gradle buildSrc/src/main/groovy/HCProject.groovy
buildSrc/src/main/groovy/Pom.groovy
buildSrc/src/main/groovy/PomArtifact.groovy rc.gradle site.gradle
Author: olegk
Date: Wed Jul 17 13:28:50 2013
New Revision: 1504128
URL: http://svn.apache.org/r1504128
Log:
Publish web content of published releases by their respectie release branch version
Modified:
httpcomponents/project-release-tools/trunk/buildSrc/build.gradle
httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCProject.groovy
httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Pom.groovy
httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/PomArtifact.groovy
httpcomponents/project-release-tools/trunk/rc.gradle
httpcomponents/project-release-tools/trunk/site.gradle
Modified: httpcomponents/project-release-tools/trunk/buildSrc/build.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/build.gradle?rev=1504128&r1=1504127&r2=1504128&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/build.gradle (original)
+++ httpcomponents/project-release-tools/trunk/buildSrc/build.gradle Wed Jul 17 13:28:50 2013
@@ -34,6 +34,7 @@ repositories {
dependencies {
compile gradleApi()
compile localGroovy()
- compile group: 'org.ccil.cowan.tagsoup', name: 'tagsoup', version: '1.2.1'
- compile group: 'org.tmatesoft.svnkit', name: 'svnkit', version: '1.7.8'
+ compile group: 'org.ccil.cowan.tagsoup', name: 'tagsoup', version: '1.2+'
+ compile group: 'org.tmatesoft.svnkit', name: 'svnkit', version: '1.7+'
+ compile group: 'org.apache.maven', name: 'maven-artifact', version: '3.0+'
}
Modified: httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCProject.groovy
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCProject.groovy?rev=1504128&r1=1504127&r2=1504128&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCProject.groovy (original)
+++ httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/HCProject.groovy Wed Jul 17 13:28:50 2013
@@ -53,7 +53,7 @@ class HCProject {
}
localDir = new File(buildDir, l.replace('/', '-'))
if (!localDir.exists()) {
- println("Checking out from SVN repository at ${repo}")
+ println("Checking out from SVN repository ${repo}")
Svn.checkout(repo, localDir)
}
}
Modified: httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Pom.groovy
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Pom.groovy?rev=1504128&r1=1504127&r2=1504128&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Pom.groovy (original)
+++ httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Pom.groovy Wed Jul 17 13:28:50 2013
@@ -53,6 +53,26 @@ class Pom {
artifact.version
}
+ int getMajor() {
+ artifact.major
+ }
+
+ int getMinor() {
+ artifact.minor
+ }
+
+ int getIncremental() {
+ artifact.incremental
+ }
+
+ int getBuildNumber() {
+ artifact.buildNumber
+ }
+
+ String getQualifier() {
+ artifact.qualifier
+ }
+
List<String> getModules() {
modules
}
Modified: httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/PomArtifact.groovy
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/PomArtifact.groovy?rev=1504128&r1=1504127&r2=1504128&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/PomArtifact.groovy (original)
+++ httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/PomArtifact.groovy Wed Jul 17 13:28:50 2013
@@ -25,16 +25,41 @@
*
*/
+import org.apache.maven.artifact.versioning.ArtifactVersion
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion
+
class PomArtifact {
final String groupId
final String id
final String version
+ final private ArtifactVersion parsedVersion
PomArtifact(String groupId, String id, String version) {
this.groupId = groupId
this.id = id
this.version = version
+ this.parsedVersion = new DefaultArtifactVersion(version)
+ }
+
+ int getMajor() {
+ parsedVersion.majorVersion
+ }
+
+ int getMinor() {
+ parsedVersion.minorVersion
+ }
+
+ int getIncremental() {
+ parsedVersion.incrementalVersion
+ }
+
+ int getBuildNumber() {
+ parsedVersion.buildNumber
+ }
+
+ String getQualifier() {
+ parsedVersion.qualifier
}
}
Modified: httpcomponents/project-release-tools/trunk/rc.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/rc.gradle?rev=1504128&r1=1504127&r2=1504128&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/rc.gradle (original)
+++ httpcomponents/project-release-tools/trunk/rc.gradle Wed Jul 17 13:28:50 2013
@@ -28,9 +28,9 @@
apply plugin: HCPlugin
apply plugin: 'signing'
-println("========================================================")
-println("Release candidate ${rc.pom.artifactId}:${rc.pom.version}")
-println("========================================================")
+println "========================================================"
+println "Release candidate ${rc.pom.artifactId}:${rc.pom.version}"
+println "========================================================"
repositories {
mavenLocal()
Modified: httpcomponents/project-release-tools/trunk/site.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/site.gradle?rev=1504128&r1=1504127&r2=1504128&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/site.gradle (original)
+++ httpcomponents/project-release-tools/trunk/site.gradle Wed Jul 17 13:28:50 2013
@@ -27,18 +27,12 @@
apply plugin: HCSitePlugin
-println("========================================================")
-println("Web site ${website.pom.artifactId}:${website.pom.version}")
+println "========================================================"
+println "Web site ${website.pom.artifactId}:${website.pom.version}"
for (HCProject release: publishedReleases) {
- println("Published release ${release.pom.artifactId}:${release.pom.version}")
-}
-println("========================================================")
-
-task clean << {
- if (project.buildDir.exists()) {
- GFileUtils.cleanDirectory(project.buildDir)
- }
+ println "Published release ${release.pom.artifactId}:${release.pom.version}"
}
+println "========================================================"
task generate << {
Svn.update(website.localDir)
@@ -49,26 +43,26 @@ task generate << {
}
task stage << {
- copy {
- into staging
- with siteContent(website)
- }
-
for (HCProject release: publishedReleases) {
- logger.info("Staging published release content ${release.pom.artifactId}:${release.pom.version}")
-
- def releaseStaging = "${staging}/${release.pom.artifactId}-${release.pom.version}"
+ String releaseSeries = "${release.pom.artifactId}-${release.pom.major}.${release.pom.minor}.x"
+ def releaseStaging = "${staging}/${releaseSeries}"
+ println("Coping content ${release.pom.artifactId}:${release.pom.version} to ${releaseStaging}")
copy {
- into releaseStaging
+ into "${staging}/${releaseSeries}"
with siteContent(release)
}
release.pom.modules.each { String submodule ->
copy {
- into "${releaseStaging}/${submodule}"
+ into "${staging}/${releaseSeries}/${submodule}"
with siteContent(file("${release.localDir}/${submodule}"))
}
}
- fixLinks(release, file(releaseStaging))
+ fixLinks(release, file("${staging}/${releaseSeries}"))
+ }
+ println("Coping content ${website.pom.artifactId}:${website.pom.version} to ${staging}")
+ copy {
+ into staging
+ with siteContent(website)
}
}