You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2017/02/27 21:32:42 UTC
[1/3] polygene-java git commit: build: refine aggregated javadoc
generation
Repository: polygene-java
Updated Branches:
refs/heads/develop 53e42c91c -> f29b50411
build: refine aggregated javadoc generation
encoding, timestamps, external links
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/5f18263d
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/5f18263d
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/5f18263d
Branch: refs/heads/develop
Commit: 5f18263d278921b8832356ba137139f546e5955c
Parents: 53e42c9
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Feb 27 20:51:56 2017 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Feb 27 21:11:02 2017 +0100
----------------------------------------------------------------------
.../polygene/gradle/structure/reports/ReportsPlugin.groovy | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5f18263d/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/reports/ReportsPlugin.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/reports/ReportsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/reports/ReportsPlugin.groovy
index 0452d04..862e2ec 100644
--- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/reports/ReportsPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/reports/ReportsPlugin.groovy
@@ -107,6 +107,9 @@ class ReportsPlugin implements Plugin<Project>
def options = task.options as StandardJavadocDocletOptions
options.docFilesSubDirs = true
options.encoding = 'UTF-8'
+ options.docEncoding = 'UTF-8'
+ options.charSet = 'UTF-8'
+ options.noTimestamp = true
options.overview = "${ project.projectDir }/src/javadoc/overview.html"
task.title = "${ RootPlugin.PROJECT_TITLE } ${ project.version }"
options.group( [
@@ -130,6 +133,11 @@ class ReportsPlugin implements Plugin<Project>
"Test Support" : [ "org.apache.polygene.test",
"org.apache.polygene.test.*" ]
] )
+ options.links = [
+ 'http://docs.oracle.com/javase/8/docs/api/',
+ 'https://stleary.github.io/JSON-java/',
+ 'http://junit.org/junit4/javadoc/latest/'
+ ]
}
project.tasks.getByName( LifecycleBasePlugin.CHECK_TASK_NAME ).dependsOn javadocsTask
project.tasks.withType( Javadoc ) { Javadoc task ->
[3/3] polygene-java git commit: build: reinstate distributions signing
Posted by pa...@apache.org.
build: reinstate distributions signing
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/f29b5041
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/f29b5041
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/f29b5041
Branch: refs/heads/develop
Commit: f29b50411e693de009dea5fa8d3578b64b909a54
Parents: 9001660
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Feb 27 21:52:42 2017 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Feb 27 22:13:48 2017 +0100
----------------------------------------------------------------------
.../gradle/code/PublishingPlugin.groovy | 1 +
.../distributions/DistributionsPlugin.groovy | 21 ++++++++++++++++++++
2 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f29b5041/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/PublishingPlugin.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/PublishingPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/PublishingPlugin.groovy
index cd14487..8f48922 100644
--- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/PublishingPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/PublishingPlugin.groovy
@@ -120,6 +120,7 @@ class PublishingPlugin implements Plugin<Project>
signing.required = config.signed
signing.sign project.configurations.getByName( 'archives' )
def signArchives = project.tasks.getByName( 'signArchives' ) as Sign
+ signArchives.enabled = config.signed
signArchives.onlyIf { !project.findProperty( 'skipSigning' ) }
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f29b5041/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
index f6ad9db..ab62df6 100644
--- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
@@ -52,6 +52,8 @@ import org.gradle.maven.MavenModule
import org.gradle.maven.MavenPomArtifact
import org.gradle.plugins.ide.internal.IdeDependenciesExtractor
import org.gradle.plugins.ide.internal.resolver.model.IdeExtendedRepoFileDependency
+import org.gradle.plugins.signing.Sign
+import org.gradle.plugins.signing.SigningExtension
// TODO Expose all project outputs into configurations
@CompileStatic
@@ -90,6 +92,7 @@ class DistributionsPlugin implements Plugin<Project>
applyAssembleDistributions project
applyCheckDistributions project
configureDistributionChecksums project
+ configureSigning project
}
private static void applyAssembleDistributions( Project project )
@@ -428,6 +431,24 @@ class DistributionsPlugin implements Plugin<Project>
}
}
+ private static void configureSigning( Project project )
+ {
+ def releaseSpec = project.extensions.getByType( ReleaseSpecExtension )
+ project.plugins.apply 'signing'
+ def signing = project.extensions.getByType SigningExtension
+ signing.required = !releaseSpec.developmentVersion
+ def distTasks = [TaskNames.ZIP_SOURCE_DIST, TaskNames.TAR_SOURCE_DIST,
+ TaskNames.ZIP_BINARY_DIST, TaskNames.TAR_BINARY_DIST]
+ .collect { taskName -> project.tasks.getByName( taskName ) }
+ distTasks.each { distTask ->
+ distTask.finalizedBy signing.sign( distTask )
+ }
+ project.tasks.withType(Sign) { Sign task ->
+ task.enabled = !releaseSpec.developmentVersion
+ task.onlyIf { !project.findProperty( 'skipSigning' ) }
+ }
+ }
+
private static void applyStageBinariesMavenRepository( Project project )
{
def releaseSpec = project.extensions.getByType ReleaseSpecExtension
[2/3] polygene-java git commit: build: remove test & coverage reports
from the binary distribution
Posted by pa...@apache.org.
build: remove test & coverage reports from the binary distribution
much smaller archives, much faster built
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/90016609
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/90016609
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/90016609
Branch: refs/heads/develop
Commit: 900166098aa98c8fc04e48b5a7bdcbeee4cd87da
Parents: 5f18263
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Feb 27 21:12:53 2017 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Feb 27 21:12:53 2017 +0100
----------------------------------------------------------------------
.../structure/distributions/DistributionsPlugin.groovy | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/90016609/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
index 6af247a..f6ad9db 100644
--- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
@@ -309,10 +309,6 @@ class DistributionsPlugin implements Plugin<Project>
private static void applyBinaryDistribution( Project project )
{
def releaseSpec = project.extensions.getByType( ReleaseSpecExtension )
- def reportsDistCopySpec = project.copySpec { CopySpec spec ->
- spec.from "$project.rootProject.projectDir/reports/build/reports"
- spec.into 'docs/reports'
- }
def docsCopySpec = project.copySpec { CopySpec spec ->
spec.from "$project.rootProject.projectDir/reports/build/docs"
spec.from "$project.rootProject.projectDir/manual/build/docs/website"
@@ -350,7 +346,6 @@ class DistributionsPlugin implements Plugin<Project>
spec.into "apache-polygene-java-$project.version-bin"
spec.with binDistNoticesCopySpec
spec.with docsCopySpec
- spec.with reportsDistCopySpec
spec.with extraDistTextCopySpec
spec.with extraDistBinCopySpec
spec.with libsCopySpec
@@ -358,8 +353,9 @@ class DistributionsPlugin implements Plugin<Project>
def binariesBuildDependencies = {
project.rootProject.allprojects
- .findAll { p -> p.plugins.hasPlugin( PublishedCodePlugin ) || p.path == ':manual' || p.path == ':reports' }
- .collect { p -> "${ p.path }:${ LifecycleBasePlugin.BUILD_TASK_NAME }" }
+ .findAll { p -> p.plugins.hasPlugin( PublishedCodePlugin ) }
+ .collect { p -> "${ p.path }:${ LifecycleBasePlugin.ASSEMBLE_TASK_NAME }" as String } +
+ ( releaseSpec.developmentVersion ? [] as List<String> : [ ':manual:website', ':reports:javadocs' ] )
}
def zipBinaries = project.tasks.create( TaskNames.ZIP_BINARY_DIST, Zip ) { Zip task ->
@@ -521,4 +517,4 @@ class DistributionsPlugin implements Plugin<Project>
task.into "apache-polygene-java-$project.version-dependencies"
}
}
-}
\ No newline at end of file
+}