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 2016/11/06 17:00:53 UTC
[01/16] zest-java git commit: Remove now unused Wicket dependency
declaration
Repository: zest-java
Updated Branches:
refs/heads/develop 520aa5f38 -> 246e588cd
Remove now unused Wicket dependency declaration
Only the now removed DCI/DDD samples used to depend on it
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/fba4a31a
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/fba4a31a
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/fba4a31a
Branch: refs/heads/develop
Commit: fba4a31a1362590e65f553a481cd78ba203c5ed3
Parents: 520aa5f
Author: Paul Merlin <pa...@apache.org>
Authored: Tue Nov 1 11:28:30 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Tue Nov 1 11:28:30 2016 +0100
----------------------------------------------------------------------
libraries.gradle | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/fba4a31a/libraries.gradle
----------------------------------------------------------------------
diff --git a/libraries.gradle b/libraries.gradle
index ac7a974..bfec2b7 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -68,8 +68,6 @@ def springVersion = '4.3.2.RELEASE'
def spymemcachedVersion = '2.12.1'
def sqliteVersion = '3.8.11.2'
def velocityVersion = '1.7'
-def wicketVersion = '1.5.8' // 6.x Samples fails to compile!
-def wicketStatelessVersion = '1.5.0'
def woodstoxVersion = '4.4.1'
def yammerMetricsVersion = '2.2.0' // 3.x exists, relocated to io.dropwizard
@@ -177,14 +175,6 @@ rootProject.ext {
javascript: "org.mozilla:rhino:$javascriptVersion",
- // Wicket
- wicket: [ "org.apache.wicket:wicket-core:$wicketVersion",
- "org.apache.wicket:wicket-datetime:$wicketVersion",
- "org.apache.wicket:wicket-extensions:$wicketVersion"
- ],
- wicket_devutils: "org.apache.wicket:wicket-devutils:$wicketVersion",
- wicket_stateless: "com.jolira:wicket-stateless:$wicketStatelessVersion",
-
// Library & Extension dependencies
jackson_mapper: "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
ehcache: "org.ehcache:ehcache:$ehcacheVersion",
[03/16] zest-java git commit: build: remove idea plugin as Gradle
project import works out of the box these days
Posted by pa...@apache.org.
build: remove idea plugin as Gradle project import works out of the box these days
This should speed up the build a little
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/78a75eaa
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/78a75eaa
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/78a75eaa
Branch: refs/heads/develop
Commit: 78a75eaa7f4993f9f7ef949d53b0228344a5bae4
Parents: 55c5102
Author: Paul Merlin <pa...@apache.org>
Authored: Thu Nov 3 18:55:28 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Nov 3 18:55:28 2016 +0100
----------------------------------------------------------------------
build.gradle | 19 -------------------
.../app/templates/buildtool/gradle-root.tmpl | 3 +--
.../etc/templates/default/files/build.gradle_ | 1 -
.../etc/templates/ng2-heroes/files/build.gradle_ | 1 -
.../dist/etc/templates/null/files/build.gradle_ | 1 -
.../etc/templates/restapp/files/build.gradle_ | 1 -
.../etc/templates/singleton/files/build.gradle_ | 1 -
7 files changed, 1 insertion(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/78a75eaa/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 15b9107..d58223a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,7 +44,6 @@ buildscript {
apply plugin: 'java'
-apply plugin: 'idea'
apply plugin: 'signing'
apply plugin: 'maven'
apply plugin: 'maven-publish-auth'
@@ -106,18 +105,6 @@ rat {
]
}
-
-// External tools BEGIN ---------------------------------------------------
-
-// IDEA plugin configuration
-idea.project.ipr {
- withXml { provider ->
- provider.node.component.find { it.@name == 'VcsDirectoryMappings' }.mapping.@vcs = 'Git'
- }
-}
-
-// External tools END -----------------------------------------------------
-
// Define repositories URLs here so we can reuse them in the build script
// Needed as Gradle forbid access to declared repositories URLs by design
// Releasable submodules should not declare repositories in their own build files
@@ -131,7 +118,6 @@ def repos_urls = [
allprojects {
apply plugin: 'eclipse'
- apply plugin: 'idea'
apply plugin: 'signing'
apply plugin: 'java'
// apply plugin: 'checkstyle'
@@ -442,11 +428,6 @@ 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 {
- whenMerged { module ->
- module.dependencies*.exported = true
- }
- }
} // allprojects END -------------------------------------------------------
// Allow easy download of all dependencies to go offline
http://git-wip-us.apache.org/repos/asf/zest-java/blob/78a75eaa/tools/generator-zest/app/templates/buildtool/gradle-root.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-zest/app/templates/buildtool/gradle-root.tmpl b/tools/generator-zest/app/templates/buildtool/gradle-root.tmpl
index f2b7de7..cae3f2a 100644
--- a/tools/generator-zest/app/templates/buildtool/gradle-root.tmpl
+++ b/tools/generator-zest/app/templates/buildtool/gradle-root.tmpl
@@ -26,7 +26,6 @@ rootProject.ext {
allprojects() {
apply plugin: 'java'
- apply plugin: 'idea'
apply plugin: 'maven'
defaultTasks 'assemble'
@@ -44,4 +43,4 @@ allprojects() {
compile "org.apache.zest.core:org.apache.zest.core.api:$zestVersion"
testCompile "org.apache.zest.core:org.apache.zest.core.testsupport:$zestVersion"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/78a75eaa/tools/shell/src/dist/etc/templates/default/files/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/default/files/build.gradle_ b/tools/shell/src/dist/etc/templates/default/files/build.gradle_
index 3d5b366..bc1285e 100644
--- a/tools/shell/src/dist/etc/templates/default/files/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/default/files/build.gradle_
@@ -7,7 +7,6 @@ rootProject.ext {
allprojects() {
apply plugin: 'java'
- apply plugin: 'idea'
apply plugin: 'maven'
repositories {
http://git-wip-us.apache.org/repos/asf/zest-java/blob/78a75eaa/tools/shell/src/dist/etc/templates/ng2-heroes/files/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/ng2-heroes/files/build.gradle_ b/tools/shell/src/dist/etc/templates/ng2-heroes/files/build.gradle_
index 3d5b366..bc1285e 100644
--- a/tools/shell/src/dist/etc/templates/ng2-heroes/files/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/ng2-heroes/files/build.gradle_
@@ -7,7 +7,6 @@ rootProject.ext {
allprojects() {
apply plugin: 'java'
- apply plugin: 'idea'
apply plugin: 'maven'
repositories {
http://git-wip-us.apache.org/repos/asf/zest-java/blob/78a75eaa/tools/shell/src/dist/etc/templates/null/files/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/null/files/build.gradle_ b/tools/shell/src/dist/etc/templates/null/files/build.gradle_
index 3234abc..874ce6d 100644
--- a/tools/shell/src/dist/etc/templates/null/files/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/null/files/build.gradle_
@@ -7,7 +7,6 @@ rootProject.ext {
allprojects() {
apply plugin: 'java'
- apply plugin: 'idea'
apply plugin: 'maven'
repositories {
http://git-wip-us.apache.org/repos/asf/zest-java/blob/78a75eaa/tools/shell/src/dist/etc/templates/restapp/files/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/restapp/files/build.gradle_ b/tools/shell/src/dist/etc/templates/restapp/files/build.gradle_
index 3d5b366..bc1285e 100644
--- a/tools/shell/src/dist/etc/templates/restapp/files/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/restapp/files/build.gradle_
@@ -7,7 +7,6 @@ rootProject.ext {
allprojects() {
apply plugin: 'java'
- apply plugin: 'idea'
apply plugin: 'maven'
repositories {
http://git-wip-us.apache.org/repos/asf/zest-java/blob/78a75eaa/tools/shell/src/dist/etc/templates/singleton/files/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/singleton/files/build.gradle_ b/tools/shell/src/dist/etc/templates/singleton/files/build.gradle_
index 3234abc..874ce6d 100644
--- a/tools/shell/src/dist/etc/templates/singleton/files/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/singleton/files/build.gradle_
@@ -7,7 +7,6 @@ rootProject.ext {
allprojects() {
apply plugin: 'java'
- apply plugin: 'idea'
apply plugin: 'maven'
repositories {
[15/16] zest-java git commit: build: fix asciidoc snippet filter tag
matching
Posted by pa...@apache.org.
build: fix asciidoc snippet filter tag matching
more strict, line must end with snippet tag instead of containing it
fix e.g. issue with more than 9 numbered snippets in same file
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/9853ec94
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/9853ec94
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/9853ec94
Branch: refs/heads/develop
Commit: 9853ec9428df4744e727bf0437a64ce6f263d6ab
Parents: da65f86
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Nov 6 01:43:18 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Nov 6 01:43:18 2016 +0100
----------------------------------------------------------------------
buildSrc/src/asciidoc/filters/snippet/snippet.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/9853ec94/buildSrc/src/asciidoc/filters/snippet/snippet.py
----------------------------------------------------------------------
diff --git a/buildSrc/src/asciidoc/filters/snippet/snippet.py b/buildSrc/src/asciidoc/filters/snippet/snippet.py
index 9cb0bfb..0202ae4 100755
--- a/buildSrc/src/asciidoc/filters/snippet/snippet.py
+++ b/buildSrc/src/asciidoc/filters/snippet/snippet.py
@@ -6,9 +6,9 @@
# The ASF licenses this file to You 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.
@@ -58,7 +58,7 @@ def snippet(source=None, tag=None, tablength="4", snipMarker=" [...snip...]\n\n
emitted = False
for line in sourceFile:
- if END in line: emit = False
+ if line.strip().endswith(END): emit = False
if emit:
emitted = True
if not "SNIPPET" in line:
@@ -70,7 +70,7 @@ def snippet(source=None, tag=None, tablength="4", snipMarker=" [...snip...]\n\n
buff.append(indent + meat)
else:
buff.append('')
- if START in line:
+ if line.strip().endswith(START):
if emitted:
buff.append(indent + snipMarker)
emit = True
[14/16] zest-java git commit: build: remove unnecessary output
Posted by pa...@apache.org.
build: remove unnecessary output
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/da65f86c
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/da65f86c
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/da65f86c
Branch: refs/heads/develop
Commit: da65f86cc619be83c0d3bd525d8e5852823f8188
Parents: b398234
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Nov 6 01:38:15 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Nov 6 01:38:15 2016 +0100
----------------------------------------------------------------------
.../apache/zest/gradle/plugin/ModuleReleaseSpecification.groovy | 5 +++--
settings.gradle | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/da65f86c/buildSrc/src/main/groovy/org/apache/zest/gradle/plugin/ModuleReleaseSpecification.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/zest/gradle/plugin/ModuleReleaseSpecification.groovy b/buildSrc/src/main/groovy/org/apache/zest/gradle/plugin/ModuleReleaseSpecification.groovy
index e2bc93a..d9a33f8 100644
--- a/buildSrc/src/main/groovy/org/apache/zest/gradle/plugin/ModuleReleaseSpecification.groovy
+++ b/buildSrc/src/main/groovy/org/apache/zest/gradle/plugin/ModuleReleaseSpecification.groovy
@@ -39,7 +39,8 @@ class ModuleReleaseSpecification
satisfied |= ( codebase == 'beta' && (docs == 'complete' || docs == 'good' || docs == 'brief') && (tests == 'complete' || tests == 'good' || tests == 'some') )
satisfied |= ( codebase == 'stable' )
satisfied |= ( codebase == 'mature' )
- println "$project.name($satisfied) -> $codebase, $docs, $tests"
+ // TODO Add a task to report this easily
+ // println "$project.name($satisfied) -> $codebase, $docs, $tests"
return satisfied
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/da65f86c/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index 2f367d3..8d724c9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -124,7 +124,6 @@ def validateProject(project, parentName)
{
project.name = parentName + "." + project.name
}
- println "Project: " + project.name
project.children.each { child ->
validateProject(child, project.name)
}
[04/16] zest-java git commit: build: remove eclipse plugin as Gradle
project import works out of the box these days
Posted by pa...@apache.org.
build: remove eclipse plugin as Gradle project import works out of the box these days
This should speed up the build a little
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/bc9d9a1a
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/bc9d9a1a
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/bc9d9a1a
Branch: refs/heads/develop
Commit: bc9d9a1aab1eceda96bf5dcca7220a3bdbf655a6
Parents: 78a75ea
Author: Paul Merlin <pa...@apache.org>
Authored: Thu Nov 3 18:55:48 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Nov 3 18:55:48 2016 +0100
----------------------------------------------------------------------
build.gradle | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/bc9d9a1a/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index d58223a..60c5cd9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -117,7 +117,6 @@ def repos_urls = [
allprojects {
- apply plugin: 'eclipse'
apply plugin: 'signing'
apply plugin: 'java'
// apply plugin: 'checkstyle'
[07/16] zest-java git commit: build: remove provided configuration,
Gradle now provide compileOnly
Posted by pa...@apache.org.
build: remove provided configuration, Gradle now provide compileOnly
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/cb45e28f
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/cb45e28f
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/cb45e28f
Branch: refs/heads/develop
Commit: cb45e28feaea6296920bea94e61ebf47fa5b5daa
Parents: 2dd8c12
Author: Paul Merlin <pa...@apache.org>
Authored: Thu Nov 3 19:09:37 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Nov 3 19:09:37 2016 +0100
----------------------------------------------------------------------
build.gradle | 3 ---
core/runtime/build.gradle | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/cb45e28f/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 48602d6..19abe39 100644
--- a/build.gradle
+++ b/build.gradle
@@ -207,9 +207,6 @@ allprojects {
configurations {
archives
deployerJars
- provided
- compile.extendsFrom provided
- runtime.extendsFrom compile
}
dependencies {
http://git-wip-us.apache.org/repos/asf/zest-java/blob/cb45e28f/core/runtime/build.gradle
----------------------------------------------------------------------
diff --git a/core/runtime/build.gradle b/core/runtime/build.gradle
index 25db8e2..e25008e 100644
--- a/core/runtime/build.gradle
+++ b/core/runtime/build.gradle
@@ -22,7 +22,7 @@ jar { manifest { name = "Apache Zest\u2122 Core Runtime" } }
dependencies {
- provided libraries.osgi_core
+ compileOnly libraries.osgi_core
compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" )
compile libraries.asm
[08/16] zest-java git commit: build: remove old hack to continue on
test failures
Posted by pa...@apache.org.
build: remove old hack to continue on test failures
Gradle now provide --continue
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/e21cd26d
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/e21cd26d
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/e21cd26d
Branch: refs/heads/develop
Commit: e21cd26d71b090c24971c7cbf802cfebb0eef3a9
Parents: cb45e28
Author: Paul Merlin <pa...@apache.org>
Authored: Thu Nov 3 19:15:11 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Nov 3 19:15:11 2016 +0100
----------------------------------------------------------------------
build.gradle | 20 --------------------
1 file changed, 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/e21cd26d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 19abe39..88f2698 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,6 @@ import org.apache.tools.ant.filters.ReplaceTokens
project.ext {
title = "Apache Zest\u2122 (Java Edition) SDK"
description = "Apache Zest\u2122 (Java Edition) is a framework for domain centric application development, including evolved concepts from AOP, DI and DDD."
- testFailures = [ ]
mainClassName = 'org.apache.zest.container.Main'
groovycMain_mx = "700m"
groovycMain_permSize = "512m"
@@ -356,14 +355,7 @@ allprojects {
maxHeapSize = "1024m"
systemProperties = testProperties
systemProperties['user.dir'] = workingDir // GRADLE-2859
- ignoreFailures = true
reports.html.enabled(true)
- afterSuite { descriptor, result ->
- if( result.resultType == TestResult.ResultType.FAILURE )
- {
- rootProject.ext.testFailures << project
- }
- }
}
// ZEST-175
if(JavaVersion.current() < JavaVersion.VERSION_1_9 ) {
@@ -434,18 +426,6 @@ task goOffline {
}
}
-gradle.taskGraph.whenReady {taskGraph ->
- taskGraph.allTasks.last().doLast {
- if( rootProject.ext.testFailures )
- {
- println "\nTest failures in:"
- rootProject.ext.testFailures.unique().each { project -> println " " + project.name }
- println ""
- throw new RuntimeException( "There was TEST FAILURES!! See list above." )
- }
- }
-}
-
task globalTestReport( type: TestReport ) {
destinationDir = file("$buildDir/reports/tests")
reportOn subprojects*.test
[09/16] zest-java git commit: build: remove unused task
Posted by pa...@apache.org.
build: remove unused task
defaultTasks provide the same
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/ada2f24b
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/ada2f24b
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/ada2f24b
Branch: refs/heads/develop
Commit: ada2f24ba5b80879f234351f2c1d8b4bab70c09b
Parents: e21cd26
Author: Paul Merlin <pa...@apache.org>
Authored: Thu Nov 3 19:15:32 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Nov 3 19:15:32 2016 +0100
----------------------------------------------------------------------
build.gradle | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ada2f24b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 88f2698..5388bcd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -380,11 +380,6 @@ allprojects {
configurations = [ project.configurations.runtime ]
}
- task minBuild {
- dependsOn classes
- dependsOn test
- }
-
}
// Actual code projects END ---------------------------------------------
[05/16] zest-java git commit: build: remove custom wrapper task,
this is not needed anymore
Posted by pa...@apache.org.
build: remove custom wrapper task, this is not needed anymore
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/0d5a6055
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/0d5a6055
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/0d5a6055
Branch: refs/heads/develop
Commit: 0d5a6055fa5a69131c49e11774efb455bc6b9755
Parents: bc9d9a1
Author: Paul Merlin <pa...@apache.org>
Authored: Thu Nov 3 18:56:22 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Nov 3 18:56:22 2016 +0100
----------------------------------------------------------------------
build.gradle | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/0d5a6055/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 60c5cd9..aee3aa2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1043,14 +1043,3 @@ task release {
}
dependsOn checkReleaseSpec, rat, archiveJavadocs, ':org.apache.zest.manual:copyWebsite', allprojects*.uploadArchives, dist
}
-
-//
-// This is a task that generates the gradlew scripts, allowing users to run gradle without having gradle installed
-// on their system.
-// This task should be run by "build master" and the resulting ouput committed to source control. Its outputs include:
-// 1) /gradlew which is the *NIX shell script for executing builds
-// 2) /gradlew.bat which is the windows bat script for for executing builds
-// 3) /gradle/wrapper which is a directory named by the "jarPath" config which contains other needed files.
-task wrapper( type: Wrapper ) {
- gradleVersion = '2.11'
-}
[06/16] zest-java git commit: build: prefer httpS repositories when
possible
Posted by pa...@apache.org.
build: prefer httpS repositories when possible
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/2dd8c125
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/2dd8c125
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/2dd8c125
Branch: refs/heads/develop
Commit: 2dd8c12568dd69bb9e672d2e91f126062e047f0b
Parents: 0d5a605
Author: Paul Merlin <pa...@apache.org>
Authored: Thu Nov 3 18:56:53 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Nov 3 18:56:53 2016 +0100
----------------------------------------------------------------------
build.gradle | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/2dd8c125/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index aee3aa2..48602d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -109,10 +109,10 @@ rat {
// Needed as Gradle forbid access to declared repositories URLs by design
// Releasable submodules should not declare repositories in their own build files
def repos_urls = [
- mavenCentral: "http://repo1.maven.org/maven2/",
+ mavenCentral: "https://repo1.maven.org/maven2/",
ops4j: "http://repository.ops4j.org/maven2/",
- restlet: 'http://maven.restlet.org/',
- clojars: "http://clojars.org/repo/",
+ restlet: 'https://maven.restlet.org/',
+ clojars: "https://clojars.org/repo/",
]
allprojects {
[10/16] zest-java git commit: build: remove some now not needed
groovy flags
Posted by pa...@apache.org.
build: remove some now not needed groovy flags
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/3a9704c7
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/3a9704c7
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/3a9704c7
Branch: refs/heads/develop
Commit: 3a9704c7237a1e08fd2d37884504d704aa9c5203
Parents: ada2f24
Author: Paul Merlin <pa...@apache.org>
Authored: Thu Nov 3 19:16:36 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Nov 3 19:16:36 2016 +0100
----------------------------------------------------------------------
build.gradle | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/3a9704c7/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 5388bcd..c44e645 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,9 +24,6 @@ project.ext {
title = "Apache Zest\u2122 (Java Edition) SDK"
description = "Apache Zest\u2122 (Java Edition) is a framework for domain centric application development, including evolved concepts from AOP, DI and DDD."
mainClassName = 'org.apache.zest.container.Main'
- groovycMain_mx = "700m"
- groovycMain_permSize = "512m"
- groovycMain_maxPermSize = "512m"
}
buildscript {
[11/16] zest-java git commit: build: fix restlet maven repository url
Posted by pa...@apache.org.
build: fix restlet maven repository url
Certificate name was wrong
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/07c6ca3f
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/07c6ca3f
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/07c6ca3f
Branch: refs/heads/develop
Commit: 07c6ca3f1a3b251f59f7eecd490f2b66cf8025c0
Parents: 3a9704c
Author: Paul Merlin <pa...@apache.org>
Authored: Thu Nov 3 19:29:10 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Nov 3 19:29:10 2016 +0100
----------------------------------------------------------------------
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/07c6ca3f/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index c44e645..1a15bbc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -107,7 +107,7 @@ rat {
def repos_urls = [
mavenCentral: "https://repo1.maven.org/maven2/",
ops4j: "http://repository.ops4j.org/maven2/",
- restlet: 'https://maven.restlet.org/',
+ restlet: 'https://maven.restlet.com/',
clojars: "https://clojars.org/repo/",
]
[02/16] zest-java git commit: Minor libraries upgrades
Posted by pa...@apache.org.
Minor libraries upgrades
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/55c51022
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/55c51022
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/55c51022
Branch: refs/heads/develop
Commit: 55c510220001bf190382bed217b1927898bb2b02
Parents: fba4a31
Author: Paul Merlin <pa...@apache.org>
Authored: Tue Nov 1 12:30:22 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Tue Nov 1 12:30:22 2016 +0100
----------------------------------------------------------------------
libraries.gradle | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/55c51022/libraries.gradle
----------------------------------------------------------------------
diff --git a/libraries.gradle b/libraries.gradle
index bfec2b7..d99551c 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -21,21 +21,21 @@
// Versions of Dependencies;
def asmVersion = '5.1'
def bonecpVersion = '0.8.0.RELEASE'
-def bouncyVersion = '1.54'
+def bouncyVersion = '1.55'
def commonsDbcpVersion = '2.1.1'
-def commonsLangVersion = '3.4'
-def derbyVersion = '10.12.1.1'
+def commonsLangVersion = '3.5'
+def derbyVersion = '10.13.1.1'
def dnsJavaVersion = '2.1.7'
-def ehcacheVersion = '3.1.2'
+def ehcacheVersion = '3.1.3'
def elasticsearchVersion = '2.4.0'
def freemarkerVersion = '2.3.25-incubating'
def geodeVersion = '1.0.0-incubating.M3'
def groovyVersion = '2.4.7'
-def h2Version = '1.4.192'
-def hazelcastVersion = '3.7.1'
+def h2Version = '1.4.193'
+def hazelcastVersion = '3.7.2'
def hamcrestVersion = '1.3'
def httpClientVersion = '4.5.2'
-def jacksonVersion = '2.8.2'
+def jacksonVersion = '2.8.4'
def javascriptVersion = '1.7.7.1'
def javasqlgeneratorVersion = '0.3.2'
def jcloudsVersion = '1.9.2'
@@ -46,27 +46,27 @@ def jgoodiesLooksVersion = '2.7.0'
def jtaVersion = '1.1'
def leveldbVersion = '0.9'
def leveldbJniVersion = '1.8'
-def liquibaseVersion = '3.5.1'
+def liquibaseVersion = '3.5.3'
def logbackVersion = '1.1.7'
def mongodbVersion = '3.3.0'
def mysqlVersion = '6.0.4'
def orgJsonVersion = '20130213'
def osgiVersion = '4.2.0' // 4.3.0 Fails to compile! - 5.0.0 exists
def pdfboxVersion = '2.0.3'
-def postgresqlVersion = '9.4.1210'
+def postgresqlVersion = '9.4.1211'
def prefuseVersion = '1.0.1'
def restletVersion = '2.3.7'
def rdfVersion = '2.7.16' // 2.8.x change query results!! 4.x exists
def riakVersion = '2.0.8'
def scalaVersion = '2.11.8'
def servletVersion = '3.1.0'
-def shiroVersion = '1.3.1'
+def shiroVersion = '1.3.2'
def skedVersion = '2.1'
def slf4jVersion = '1.7.21'
def solrVersion = "1.4.1" // 4.x Fails to compile!
-def springVersion = '4.3.2.RELEASE'
+def springVersion = '4.3.3.RELEASE'
def spymemcachedVersion = '2.12.1'
-def sqliteVersion = '3.8.11.2'
+def sqliteVersion = '3.14.2.1'
def velocityVersion = '1.7'
def woodstoxVersion = '4.4.1'
def yammerMetricsVersion = '2.2.0' // 3.x exists, relocated to io.dropwizard
@@ -75,7 +75,7 @@ def antVersion = '1.9.7'
def awaitilityVersion = '2.0.0'
def easyMockVersion = '3.4'
def junitVersion = '4.12'
-def mockitoVersion = '1.10.19'
+def mockitoVersion = '2.2.9'
// build a map of the dependency artifacts to use. Allows centralized definition of the version of artifacts to
// use. In that respect it serves a role similar to <dependencyManagement> in Maven
[16/16] zest-java git commit: doc: fix various snippet tags
Posted by pa...@apache.org.
doc: fix various snippet tags
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/246e588c
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/246e588c
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/246e588c
Branch: refs/heads/develop
Commit: 246e588cdd359d071243910990139380490db57e
Parents: 9853ec9
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Nov 6 01:43:47 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Nov 6 01:43:47 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/zest/api/mixin/Car.java | 5 +-
.../org/apache/zest/api/mixin/Startable.java | 4 +-
.../java/org/apache/zest/api/mixin/Vehicle.java | 4 +-
.../zest/index/rdf/RdfNamedQueryTest.java | 98 ++++++++++----------
.../createEntity/CarEntityFactoryMixin.java | 5 +-
5 files changed, 57 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/246e588c/core/api/src/test/java/org/apache/zest/api/mixin/Car.java
----------------------------------------------------------------------
diff --git a/core/api/src/test/java/org/apache/zest/api/mixin/Car.java b/core/api/src/test/java/org/apache/zest/api/mixin/Car.java
index ad7eb22..a3b719d 100644
--- a/core/api/src/test/java/org/apache/zest/api/mixin/Car.java
+++ b/core/api/src/test/java/org/apache/zest/api/mixin/Car.java
@@ -19,9 +19,8 @@
*/
package org.apache.zest.api.mixin;
-// START SNIPPET: mixins
+// START SNIPPET: mixin
@Mixins( { StartMixin.class, VehicleMixin.class } )
public interface Car extends Startable, Vehicle
{}
-// END SNIPPET: mixins
-
+// END SNIPPET: mixin
http://git-wip-us.apache.org/repos/asf/zest-java/blob/246e588c/core/api/src/test/java/org/apache/zest/api/mixin/Startable.java
----------------------------------------------------------------------
diff --git a/core/api/src/test/java/org/apache/zest/api/mixin/Startable.java b/core/api/src/test/java/org/apache/zest/api/mixin/Startable.java
index c84b7a4..6bdce19 100644
--- a/core/api/src/test/java/org/apache/zest/api/mixin/Startable.java
+++ b/core/api/src/test/java/org/apache/zest/api/mixin/Startable.java
@@ -19,11 +19,11 @@
*/
package org.apache.zest.api.mixin;
-// START SNIPPET: mixins
+// START SNIPPET: mixin
public interface Startable
{
boolean start();
void stop();
}
-// END SNIPPET: mixins
\ No newline at end of file
+// END SNIPPET: mixin
http://git-wip-us.apache.org/repos/asf/zest-java/blob/246e588c/core/api/src/test/java/org/apache/zest/api/mixin/Vehicle.java
----------------------------------------------------------------------
diff --git a/core/api/src/test/java/org/apache/zest/api/mixin/Vehicle.java b/core/api/src/test/java/org/apache/zest/api/mixin/Vehicle.java
index 7dacb30..9feb1c9 100644
--- a/core/api/src/test/java/org/apache/zest/api/mixin/Vehicle.java
+++ b/core/api/src/test/java/org/apache/zest/api/mixin/Vehicle.java
@@ -19,7 +19,7 @@
*/
package org.apache.zest.api.mixin;
-// START SNIPPET: mixins
+// START SNIPPET: mixin
public interface Vehicle
{
void turn(float angle);
@@ -29,4 +29,4 @@ public interface Vehicle
// more methods
}
-// END SNIPPET: mixins
\ No newline at end of file
+// END SNIPPET: mixin
http://git-wip-us.apache.org/repos/asf/zest-java/blob/246e588c/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryTest.java
index 2555748..07c4ba0 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryTest.java
@@ -52,15 +52,15 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
private static String[] queryStrings =
{
-// START-SNIPPET: query1
+// START SNIPPET: query1
"PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?reference\n"
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n" + "\n" + "}", // script01
-// END-SNIPPET
+// END SNIPPET: query1
-// START-SNIPPET: query2
+// START SNIPPET: query2
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -68,17 +68,17 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Domain>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n" + "?entity ns1:name ?v0. \n"
+ "FILTER (?v0 = \"Gaming\")\n" + "}", // script02
-// END-SNIPPET
+// END SNIPPET: query2
-// START-SNIPPET: query3
+// START SNIPPET: query3
"PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?reference\n"
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n" + "\n" + "}", // script03
-// END-SNIPPET
+// END SNIPPET: query3
-// START-SNIPPET: query4
+// START SNIPPET: query4
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+ "PREFIX ns2: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
@@ -87,9 +87,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "?entity ns1:placeOfBirth ?v0. \n" + "?v0 ns2:name ?v1. \n" + "FILTER (?v1 = \"Kuala Lumpur\")\n" + "}", // script04
-// END-SNIPPET
+// END SNIPPET: query4
-// START-SNIPPET: query5
+// START SNIPPET: query5
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+ "PREFIX ns2: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
@@ -98,9 +98,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n" + "?entity ns1:mother ?v0. \n"
+ "?v0 ns1:placeOfBirth ?v1. \n" + "?v1 ns2:name ?v2. \n" + "FILTER (?v2 = \"Kuala Lumpur\")\n" + "}", // script05
-// END-SNIPPET
+// END SNIPPET: query5
-// START-SNIPPET: query6
+// START SNIPPET: query6
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -108,9 +108,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "?entity ns1:yearOfBirth ?v0. \n" + "FILTER (?v0 >= \"1973\")\n" + "}", // script06
-// END-SNIPPET
+// END SNIPPET: query6
-// START-SNIPPET: query7
+// START SNIPPET: query7
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+ "PREFIX ns2: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
@@ -120,9 +120,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "?entity ns1:yearOfBirth ?v0. \n" + "?entity ns1:placeOfBirth ?v1. \n" + "?v1 ns2:name ?v2. \n"
+ "FILTER ((?v0 >= \"1900\") && (?v2 = \"Penang\"))\n" + "}", // script07
-// END-SNIPPET
+// END SNIPPET: query7
-// START-SNIPPET: query8
+// START SNIPPET: query8
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -130,9 +130,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "?entity ns1:yearOfBirth ?v0. \n" + "FILTER ((?v0 = \"1970\") || (?v0 = \"1975\"))\n" + "}", // script08
-// END-SNIPPET
+// END SNIPPET: query8
-// START-SNIPPET: query9
+// START SNIPPET: query9
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -140,9 +140,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Female>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "?entity ns1:yearOfBirth ?v0. \n" + "FILTER ((?v0 = \"1970\") || (?v0 = \"1975\"))\n" + "}", // script09
-// END-SNIPPET
+// END SNIPPET: query9
-// START-SNIPPET: query10
+// START SNIPPET: query10
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -150,9 +150,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "?entity ns1:yearOfBirth ?v0. \n" + "FILTER (!(?v0 = \"1975\"))\n" + "}", // script10
-// END-SNIPPET
+// END SNIPPET: query10
-// START-SNIPPET: query11
+// START SNIPPET: query11
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -160,9 +160,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "OPTIONAL {?entity ns1:email ?v0}. \n" + "FILTER (bound(?v0))\n" + "}", // script11
-// END-SNIPPET
+// END SNIPPET: query11
-// START-SNIPPET: query12
+// START SNIPPET: query12
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -170,9 +170,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "OPTIONAL {?entity ns1:email ?v0}. \n" + "FILTER (! bound(?v0))\n" + "}", // script12
-// END-SNIPPET
+// END SNIPPET: query12
-// START-SNIPPET: query13
+// START SNIPPET: query13
"PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
+ "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Male#> \n"
@@ -180,9 +180,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "OPTIONAL {?entity ns1:wife ?v0}. \n" + "FILTER (bound(?v0))\n" + "}", // script13
-// END-SNIPPET
+// END SNIPPET: query13
-// START-SNIPPET: query14
+// START SNIPPET: query14
"PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
+ "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Male#> \n"
@@ -190,9 +190,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Male>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "OPTIONAL {?entity ns1:wife ?v0}. \n" + "FILTER (! bound(?v0))\n" + "}", // script14
-// END-SNIPPET
+// END SNIPPET: query14
-// START-SNIPPET: query15
+// START SNIPPET: query15
"PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
+ "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Male#> \n"
@@ -200,9 +200,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "OPTIONAL {?entity ns1:wife ?v0}. \n" + "FILTER (! bound(?v0))\n" + "}", // script15
-// END-SNIPPET
+// END SNIPPET: query15
-// START-SNIPPET: query16
+// START SNIPPET: query16
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -210,9 +210,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n" + "?entity ns1:name ?v0. \n"
+ "\n" + "}", // script16
-// END-SNIPPET
+// END SNIPPET: query16
-// START-SNIPPET: query17
+// START SNIPPET: query17
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -220,9 +220,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n" + "?entity ns1:name ?v0. \n"
+ "\n" + "} ", // script17
-// END-SNIPPET
+// END SNIPPET: query17
-// START-SNIPPET: query18
+// START SNIPPET: query18
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -230,9 +230,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n" + "?entity ns1:name ?v0. \n"
+ "\n" + "}\n", // script18
-// END-SNIPPET
+// END SNIPPET: query18
-// START-SNIPPET: query19
+// START SNIPPET: query19
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -240,9 +240,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n" + "?entity ns1:name ?v0. \n"
+ "FILTER (?v0 > \"D\")\n" + "} ", // script19
-// END-SNIPPET
+// END SNIPPET: query19
-// START-SNIPPET: query20
+// START SNIPPET: query20
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+ "PREFIX ns2: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
@@ -252,9 +252,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "?entity ns1:yearOfBirth ?v0. \n" + "?entity ns2:name ?v1. \n" + "FILTER (?v0 > \"1973\")\n" + "}\n"
, // script20
-// END-SNIPPET
+// END SNIPPET: query20
-// START-SNIPPET: query21
+// START SNIPPET: query21
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+ "PREFIX ns2: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
@@ -264,9 +264,9 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n"
+ "?entity ns1:placeOfBirth ?v0. \n" + "?v0 ns2:name ?v1. \n" + "?entity ns1:yearOfBirth ?v2. \n" + "\n"
+ "}", // script21
-// END-SNIPPET
+// END SNIPPET: query21
-// START-SNIPPET: query22
+// START SNIPPET: query22
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -274,13 +274,13 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n" + "?entity ns1:name ?v0. \n"
+ "FILTER regex(?v0,\"J.*Doe\")\n" + "}", // script22
-// END-SNIPPET
+// END SNIPPET: query22
-// START-SNIPPET: query23
+// START SNIPPET: query23
"", // script23
-// END-SNIPPET
+// END SNIPPET: query23
-// START-SNIPPET: query24
+// START SNIPPET: query24
"PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+ "PREFIX ns0: <urn:zest:type:org.apache.zest.api.identity.HasIdentity#> \n"
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -288,6 +288,6 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
+ "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Domain>. \n"
+ "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?reference. \n" + "?entity ns1:name ?v0. \n"
+ "FILTER (?v0 = ?domain)\n" + "}" // script24
-// END-SNIPPET
+// END SNIPPET: query24
};
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/246e588c/manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java
----------------------------------------------------------------------
diff --git a/manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java b/manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java
index b880a12..616f408 100644
--- a/manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java
+++ b/manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java
@@ -41,7 +41,7 @@ public class CarEntityFactoryMixin
}
// END SNIPPET: carFactoryMixin3
-// START SNIPPET: createCar
+// START SNIPPET: create
public Car create( Manufacturer manufacturer, String model )
{
UnitOfWork uow = unitOfWorkFactory.currentUnitOfWork();
@@ -53,6 +53,5 @@ public class CarEntityFactoryMixin
return builder.newInstance();
}
-// END SNIPPET: createCar
+// END SNIPPET: create
}
-
[13/16] zest-java git commit: build: groovy @CompileStatic buildSrc
Posted by pa...@apache.org.
build: groovy @CompileStatic buildSrc
ModuleReleaseSpecification left untouched for now
because of its use of XmlSlurper
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/b398234b
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/b398234b
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/b398234b
Branch: refs/heads/develop
Commit: b398234b3818716c4c7d39bb0a2d5ceb178cbeba
Parents: 11e8235
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Nov 6 01:06:23 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Nov 6 01:06:23 2016 +0100
----------------------------------------------------------------------
.../src/main/groovy/AsciidocBuildInfo.groovy | 4 +-
buildSrc/src/main/groovy/VersionClass.groovy | 27 ++++--
buildSrc/src/main/groovy/Xslt.groovy | 33 ++++---
.../zest/gradle/plugin/Documentation.groovy | 99 +++++++++++---------
4 files changed, 92 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b398234b/buildSrc/src/main/groovy/AsciidocBuildInfo.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/AsciidocBuildInfo.groovy b/buildSrc/src/main/groovy/AsciidocBuildInfo.groovy
index b72c9dd..6a9a77c 100644
--- a/buildSrc/src/main/groovy/AsciidocBuildInfo.groovy
+++ b/buildSrc/src/main/groovy/AsciidocBuildInfo.groovy
@@ -18,13 +18,15 @@
*
*/
+import groovy.transform.CompileStatic
import org.gradle.api.Project
import org.gradle.api.Plugin
+@CompileStatic
class AsciidocBuildInfo implements Plugin<Project>
{
- final static TASK_NAME = 'makeAsciidocBuildInfo'
+ final static String TASK_NAME = 'makeAsciidocBuildInfo'
AsciidocBuildInfo()
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b398234b/buildSrc/src/main/groovy/VersionClass.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/VersionClass.groovy b/buildSrc/src/main/groovy/VersionClass.groovy
index c82799f..b8c8a92 100644
--- a/buildSrc/src/main/groovy/VersionClass.groovy
+++ b/buildSrc/src/main/groovy/VersionClass.groovy
@@ -18,10 +18,20 @@
*
*/
+import groovy.transform.CompileStatic
import org.gradle.api.Project
import org.gradle.api.Plugin
+import org.gradle.api.Task
+import org.gradle.api.file.SourceDirectorySet
import org.gradle.api.plugins.JavaPlugin
+import org.gradle.api.plugins.JavaPluginConvention
+import org.gradle.api.tasks.SourceSet
+import org.gradle.api.tasks.bundling.Jar
+// TODO:perf Build only one for the whole project
+// TODO:perf Remove the build date, maybe not for release versions
+// TODO:release Put git data in with placeholders for dev versions
+@CompileStatic
class VersionClass implements Plugin<Project>
{
@@ -35,7 +45,7 @@ class VersionClass implements Plugin<Project>
def genSrc = 'generated-src/version'
def generatedSrcDir = new File(project.buildDir, genSrc)
- def makeVersionClassTask = project.task('makeVersionClass') << {
+ Task makeVersionClassTask = project.task('makeVersionClass') << {
def now = new Date()
def tmpGroup = project.name
if( tmpGroup.startsWith("org.apache.zest.core"))
@@ -73,14 +83,13 @@ public interface BuildVersion
""")
f.close()
}
- project.sourceSets {
- version {
- java {
- srcDir project.buildDir.name + '/' + genSrc + '/java'
+ def sourceSets = project.convention.getPlugin(JavaPluginConvention).sourceSets
+ sourceSets.create("version") { SourceSet sourceSet ->
+ sourceSet.java { SourceDirectorySet dirSet ->
+ dirSet.srcDir project.buildDir.name + '/' + genSrc + '/java'
}
- }
}
- makeVersionClassTask.getInputs().files(project.sourceSets.main.getAllSource())
+ makeVersionClassTask.getInputs().files(sourceSets.getByName('main').allSource)
makeVersionClassTask.getOutputs().file(generatedSrcDir)
if( project.getBuildFile() != null && project.getBuildFile().exists() )
{
@@ -88,8 +97,8 @@ public interface BuildVersion
}
project.getTasks().getByName('compileJava').dependsOn('compileVersionJava')
project.getTasks().getByName('compileVersionJava').dependsOn('makeVersionClass')
- project.getTasks().getByName('jar') {
- from project.sourceSets.version.output
+ project.getTasks().getByName('jar') { Jar task ->
+ task.from sourceSets.getByName('version').output
}
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b398234b/buildSrc/src/main/groovy/Xslt.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/Xslt.groovy b/buildSrc/src/main/groovy/Xslt.groovy
index ff9107f..3414350 100644
--- a/buildSrc/src/main/groovy/Xslt.groovy
+++ b/buildSrc/src/main/groovy/Xslt.groovy
@@ -54,9 +54,9 @@
*
*/
-import org.gradle.api.InvalidUserDataException
+import groovy.transform.CompileStatic
+import org.gradle.api.file.EmptyFileVisitor
import org.gradle.api.tasks.SourceTask
-import org.gradle.api.tasks.OutputFile
import org.gradle.api.tasks.OutputDirectory
import org.gradle.api.tasks.Optional
import org.gradle.api.tasks.InputFile
@@ -67,6 +67,7 @@ import javax.xml.transform.TransformerFactory
import javax.xml.transform.stream.StreamResult
import javax.xml.transform.stream.StreamSource
+@CompileStatic
class Xslt extends SourceTask
{
@@ -85,21 +86,19 @@ class Xslt extends SourceTask
def factory = TransformerFactory.newInstance()
def transformer = factory.newTransformer(new StreamSource(stylesheetFile));
- source.visit { FileVisitDetails fvd ->
- if( fvd.isDirectory() )
- {
- return
+ getSource().visit( new EmptyFileVisitor() {
+ @Override
+ void visitFile(FileVisitDetails fvd) {
+ // Remove the extension from the file name
+ def name = fvd.file.name.replaceAll('[.][^\\.]*$', '')
+ if( extension == null )
+ {
+ extension = 'html'
+ }
+ name += '.' + extension
+ def destFile = new File(destDir, name)
+ transformer.transform(new StreamSource(fvd.file), new StreamResult(destFile))
}
- // Remove the extension from the file name
- name = fvd.file.name.replaceAll('[.][^\\.]*$', '')
- if( extension == null )
- {
- extension = 'html'
- }
- name += '.' + extension
- def destFile = new File(destDir, name)
- transformer.transform(new StreamSource(fvd.file), new StreamResult(destFile))
-
- }
+ } )
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b398234b/buildSrc/src/main/groovy/org/apache/zest/gradle/plugin/Documentation.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/zest/gradle/plugin/Documentation.groovy b/buildSrc/src/main/groovy/org/apache/zest/gradle/plugin/Documentation.groovy
index ee04772..0d2a931 100644
--- a/buildSrc/src/main/groovy/org/apache/zest/gradle/plugin/Documentation.groovy
+++ b/buildSrc/src/main/groovy/org/apache/zest/gradle/plugin/Documentation.groovy
@@ -17,19 +17,24 @@
*
*
*/
-package org.apache.zest.gradle.plugin;
-
+package org.apache.zest.gradle.plugin
+import groovy.io.FileType
+import groovy.transform.CompileStatic
+import groovy.transform.TypeCheckingMode;
import org.gradle.api.DefaultTask
+import org.gradle.api.Project
+import org.gradle.api.file.CopySpec
import org.gradle.api.tasks.TaskAction
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.InputFile
import org.gradle.api.tasks.InputFiles
import org.gradle.api.tasks.OutputDirectory
+import org.gradle.process.ExecSpec
// TODO: try to use dependencies for FOP and execute within the same JVM.
// TODO: move the bulk of resources into this plugin, instead of sitting in the project.
+@CompileStatic
class Documentation extends DefaultTask
{
@Input def String docName
@@ -57,8 +62,8 @@ class Documentation extends DefaultTask
{
installAsciidocFilters()
- [ outputDir, tempAsciidocDir, tempDir ]*.deleteDir()
- [ outputDir, tempAsciidocDir, tempDir ]*.mkdirs()
+ [ outputDir, tempAsciidocDir, tempDir ].each { it.deleteDir() }
+ [ outputDir, tempAsciidocDir, tempDir ].each { it.mkdirs() }
copySubProjectsDocsResources()
generateAsciidocAccordingToReleaseSpecification()
@@ -94,38 +99,43 @@ class Documentation extends DefaultTask
if( installSnippets )
{
dotAsciidocFiltersDir.mkdirs()
- project.rootProject.copy {
- from filtersDir
- into dotAsciidocFiltersDir
+ project.rootProject.copy { CopySpec spec ->
+ spec.from filtersDir
+ spec.into dotAsciidocFiltersDir
}
- dotAsciidocFiltersDir.eachFileRecurse( groovy.io.FileType.FILES ) { file ->
+ dotAsciidocFiltersDir.eachFileRecurse( FileType.FILES ) { file ->
if( file.name.endsWith( '.py' ) ) {
- ant.chmod( file: file.absolutePath, perm: '755' )
+ chmod(file, '755')
}
}
println "Zest Asciidoc Filters Installed!"
}
}
+ @CompileStatic(TypeCheckingMode.SKIP)
+ def void chmod(File file, String permissions) {
+ ant.chmod( file: file.absolutePath, perm: permissions )
+ }
+
def void copySubProjectsDocsResources()
{
project.rootProject.subprojects.each { p ->
- p.copy {
- from p.file( 'src/docs/resources' )
- into outputDir
- include '**'
+ p.copy { CopySpec spec ->
+ spec.from p.file( 'src/docs/resources' )
+ spec.into outputDir
+ spec.include '**'
}
}
}
def void generateAsciidocAccordingToReleaseSpecification()
{
- project.copy {
- from docsDir
- into tempAsciidocDir
- include '**'
+ project.copy { CopySpec spec ->
+ spec.from docsDir
+ spec.into tempAsciidocDir
+ spec.include '**'
}
- if( project.version != '0' && !project.version.contains( 'SNAPSHOT' ) ) {
+ if( project.version != '0' && !project.version.toString().contains( 'SNAPSHOT' ) ) {
def licenseFile = new File( tempAsciidocDir, 'userguide/libraries.txt' )
def extensionsFile = new File( tempAsciidocDir, 'userguide/extensions.txt' )
def toolsFile = new File( tempAsciidocDir, 'userguide/tools.txt' )
@@ -134,7 +144,8 @@ class Documentation extends DefaultTask
asciidocFile.readLines().each { line ->
if( line.startsWith( 'include::' ) ) {
def approved = false
- project.rootProject.releaseApprovedProjects.collect{it.projectDir}.each { approvedProjectDir ->
+ Set<Project> releaseApprovedProjects = project.rootProject.extensions.extraProperties.get('releaseApprovedProjects') as Set<Project>
+ releaseApprovedProjects.collect{it.projectDir}.each { approvedProjectDir ->
if( line.contains( "${approvedProjectDir.parentFile.name}/${approvedProjectDir.name}" ) ) {
approved = true
}
@@ -153,16 +164,16 @@ class Documentation extends DefaultTask
def void generateXDoc()
{
- project.exec {
- executable = 'asciidoc'
- workingDir = '..'
+ project.exec { ExecSpec spec ->
+ spec.executable = 'asciidoc'
+ spec.workingDir = '..'
def commonResourcesPath = relativePath( project.rootDir, commonResourcesDir )
def asciidocConfigPath = relativePath( project.rootDir, new File( configDir, 'asciidoc.conf' ) )
def docbookConfigPath = relativePath( project.rootDir, new File( configDir, 'docbook45.conf' ) )
def linkimagesConfigPath = relativePath( project.rootDir, new File( configDir, 'linkedimages.conf' ) )
def xdocOutputPath = relativePath( project.rootDir, new File( tempDir, 'xdoc-temp.xml' ) )
def asciidocIndexPath = relativePath( project.rootDir, new File( tempAsciidocDir, "$docName/index.txt" ) )
- args = [
+ spec.args = [
'--attribute', 'revnumber=' + project.version,
'--attribute', 'level1=' + (docType.equals('article') ? 1 : 0),
'--attribute', 'level2=' + (docType.equals('article') ? 2 : 1),
@@ -183,22 +194,22 @@ class Documentation extends DefaultTask
def void generateChunkedHtml()
{
- project.copy {
- from commonResourcesDir
- into outputDir
- include '**'
+ project.copy { CopySpec spec ->
+ spec.from commonResourcesDir
+ spec.into outputDir
+ spec.include '**'
}
- project.copy {
- from "$docsDir/$docName/resources"
- into outputDir
- include '**'
+ project.copy { CopySpec spec ->
+ spec.from "$docsDir/$docName/resources"
+ spec.into outputDir
+ spec.include '**'
}
- project.exec {
+ project.exec { ExecSpec spec ->
def xsltFile = "$docsDir/$docName/xsl/chunked.xsl"
def outputPath = relativePath( project.projectDir, outputDir ) + '/'
- executable = 'xsltproc'
- args = [
+ spec.executable = 'xsltproc'
+ spec.args = [
'--nonet',
'--noout',
'--output', outputPath,
@@ -210,11 +221,11 @@ class Documentation extends DefaultTask
def void generateSingleHtml()
{
- project.exec {
+ project.exec { ExecSpec spec ->
// XML_CATALOG_FILES=
String xsltFile = "$xslDir/xhtml.xsl"
- executable = 'xsltproc'
- args = [
+ spec.executable = 'xsltproc'
+ spec.args = [
'--nonet',
'--noout',
'--output', "$outputDir/${docName}.html",
@@ -228,19 +239,19 @@ class Documentation extends DefaultTask
{
// $ xsltproc --nonet ../docbook-xsl/fo.xsl article.xml > article.fo
// $ fop article.fo article.pdf
- project.exec {
+ project.exec { ExecSpec spec ->
String xsltFile = "$xslDir/fo.xsl"
- executable = 'xsltproc'
- args = [
+ spec.executable = 'xsltproc'
+ spec.args = [
'--nonet',
'--output', "$tempDir/${docName}.fo",
xsltFile,
"$tempDir/xdoc-temp.xml"
]
}
- project.exec {
- executable = 'fop'
- args = [
+ project.exec { ExecSpec spec ->
+ spec.executable = 'fop'
+ spec.args = [
"$tempDir/${docName}.fo",
"$outputDir/${docName}.pdf"
]
[12/16] zest-java git commit: build: remove unused project extra
property
Posted by pa...@apache.org.
build: remove unused project extra property
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/11e8235b
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/11e8235b
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/11e8235b
Branch: refs/heads/develop
Commit: 11e8235bc2057f4bc81aaed5f959712100e7fc4c
Parents: 07c6ca3
Author: Paul Merlin <pa...@apache.org>
Authored: Thu Nov 3 19:30:01 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Nov 3 19:30:01 2016 +0100
----------------------------------------------------------------------
build.gradle | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/11e8235b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 1a15bbc..5b4401b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,6 @@ import org.apache.tools.ant.filters.ReplaceTokens
project.ext {
title = "Apache Zest\u2122 (Java Edition) SDK"
description = "Apache Zest\u2122 (Java Edition) is a framework for domain centric application development, including evolved concepts from AOP, DI and DDD."
- mainClassName = 'org.apache.zest.container.Main'
}
buildscript {