You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2015/07/08 11:43:11 UTC
[08/11] zest-qi4j git commit: Merge branch 'DocUpdate' into develop
Merge branch 'DocUpdate' into develop
Conflicts:
libraries/lang-scala/build.gradle
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/ee299296
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/ee299296
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/ee299296
Branch: refs/heads/develop
Commit: ee299296f7010f29ec6a66c4b67fc7a926526988
Parents: f6c764e 92ee90f
Author: Niclas Hedhman <he...@betfair.com>
Authored: Wed Jul 8 12:16:44 2015 +0300
Committer: Niclas Hedhman <he...@betfair.com>
Committed: Wed Jul 8 12:16:44 2015 +0300
----------------------------------------------------------------------
NOTICE.txt | 2 +-
README.txt | 22 ++++++++++----------
build.gradle | 14 ++++++-------
buildSrc/src/javadoc/overview.html | 6 +++---
core/api/build.gradle | 2 +-
core/bootstrap/build.gradle | 2 +-
core/functional/build.gradle | 2 +-
core/io/build.gradle | 2 +-
core/runtime/build.gradle | 2 +-
core/spi/build.gradle | 2 +-
core/testsupport/build.gradle | 2 +-
extensions/cache-ehcache/build.gradle | 4 ++--
extensions/cache-memcache/build.gradle | 4 ++--
extensions/entitystore-file/build.gradle | 2 +-
extensions/entitystore-hazelcast/build.gradle | 4 ++--
extensions/entitystore-jclouds/build.gradle | 4 ++--
extensions/entitystore-jdbm/build.gradle | 4 ++--
extensions/entitystore-leveldb/build.gradle | 4 ++--
extensions/entitystore-memory/build.gradle | 2 +-
extensions/entitystore-mongodb/build.gradle | 4 ++--
extensions/entitystore-preferences/build.gradle | 4 ++--
extensions/entitystore-redis/build.gradle | 4 ++--
extensions/entitystore-riak/build.gradle | 4 ++--
extensions/entitystore-sql/build.gradle | 4 ++--
extensions/entitystore-voldemort/build.gradle | 4 ++--
extensions/indexing-elasticsearch/build.gradle | 4 ++--
extensions/indexing-rdf/build.gradle | 4 ++--
extensions/indexing-solr/build.gradle | 4 ++--
extensions/indexing-sql/build.gradle | 4 ++--
extensions/metrics-yammer/build.gradle | 4 ++--
extensions/migration/build.gradle | 4 ++--
extensions/reindexer/build.gradle | 2 +-
.../valueserialization-jackson/build.gradle | 4 ++--
.../valueserialization-orgjson/build.gradle | 4 ++--
extensions/valueserialization-stax/build.gradle | 4 ++--
libraries/alarm/build.gradle | 4 ++--
libraries/circuitbreaker/build.gradle | 4 ++--
libraries/constraints/build.gradle | 4 ++--
libraries/conversion/build.gradle | 4 ++--
libraries/eventsourcing-jdbm/build.gradle | 4 ++--
libraries/eventsourcing-rest/build.gradle | 4 ++--
libraries/eventsourcing/build.gradle | 4 ++--
libraries/fileconfig/build.gradle | 4 ++--
libraries/http/build.gradle | 4 ++--
libraries/invocation-cache/build.gradle | 4 ++--
libraries/jmx/build.gradle | 4 ++--
libraries/lang-groovy/build.gradle | 4 ++--
libraries/lang-javascript/build.gradle | 4 ++--
libraries/lang-scala/build.gradle | 4 ++--
libraries/locking/build.gradle | 4 ++--
libraries/logging/build.gradle | 4 ++--
libraries/metrics/build.gradle | 4 ++--
libraries/osgi/build.gradle | 4 ++--
libraries/rdf/build.gradle | 4 ++--
libraries/rest-client/build.gradle | 4 ++--
libraries/rest-common/build.gradle | 4 ++--
libraries/rest-server/build.gradle | 4 ++--
libraries/rest/build.gradle | 4 ++--
libraries/scheduler/build.gradle | 4 ++--
libraries/scripting/build.gradle | 4 ++--
libraries/servlet/build.gradle | 4 ++--
libraries/shiro-core/build.gradle | 4 ++--
libraries/shiro-web/build.gradle | 4 ++--
libraries/spring/build.gradle | 4 ++--
libraries/sql-bonecp/build.gradle | 4 ++--
libraries/sql-dbcp/build.gradle | 4 ++--
libraries/sql-liquibase/build.gradle | 4 ++--
libraries/sql/build.gradle | 4 ++--
libraries/uid/build.gradle | 4 ++--
libraries/uowfile/build.gradle | 4 ++--
manual/build.gradle | 2 +-
samples/dci-cargo/dcisample_a/build.gradle | 4 ++--
samples/dci-cargo/dcisample_b/build.gradle | 4 ++--
samples/dci/build.gradle | 4 ++--
samples/forum/build.gradle | 2 +-
samples/rental/build.gradle | 2 +-
samples/sql-support/build.gradle | 2 +-
samples/swing/build.gradle | 2 +-
src/bin-dist/NOTICE.txt | 2 +-
src/bin-dist/README.txt | 18 ++++++++--------
tests/performance/build.gradle | 4 ++--
tests/regression/build.gradle | 4 ++--
tools/envisage/build.gradle | 4 ++--
tools/model-detail/build.gradle | 4 ++--
tools/qidea/build.gradle | 4 ++--
tools/shell/build.gradle | 4 ++--
tutorials/cargo/build.gradle | 4 ++--
tutorials/composites/build.gradle | 4 ++--
tutorials/hello/build.gradle | 4 ++--
tutorials/introduction/build.gradle | 4 ++--
tutorials/introduction/tenminutes/build.gradle | 4 ++--
.../introduction/thirtyminutes/build.gradle | 4 ++--
tutorials/introduction/twominutes/build.gradle | 4 ++--
tutorials/services/build.gradle | 4 ++--
94 files changed, 193 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/extensions/entitystore-jclouds/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/extensions/entitystore-voldemort/build.gradle
----------------------------------------------------------------------
diff --cc extensions/entitystore-voldemort/build.gradle
index cd24061,f0f2b0a..385bd62
--- a/extensions/entitystore-voldemort/build.gradle
+++ b/extensions/entitystore-voldemort/build.gradle
@@@ -17,10 -17,15 +17,10 @@@
* under the License.
*/
- description = "Qi4j Voldemort EntityStore Extension"
+ description = "Apache Zest™ Voldemort EntityStore Extension"
- jar { manifest { name = "Qi4j Extension - EntityStore - Voldemort" }}
+ jar { manifest { name = "Apache Zest™ Extension - EntityStore - Voldemort" }}
-repositories {
- maven { name 'clojars-repo'; url 'http://clojars.org/repo' }
- maven { name 'oracle-repo'; url 'http://download.oracle.com/maven' }
-}
-
dependencies {
compile project(":org.qi4j.core:org.qi4j.core.bootstrap")
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/libraries/lang-scala/build.gradle
----------------------------------------------------------------------
diff --cc libraries/lang-scala/build.gradle
index ee3b012,2a13857..962aa93
--- a/libraries/lang-scala/build.gradle
+++ b/libraries/lang-scala/build.gradle
@@@ -17,12 -17,10 +17,12 @@@
* under the License.
*/
- description = "Qi4j Scala Library allows for Mixins to be implemented in Scala."
+ description = "Apache Zest™ Scala Library allows for Mixins to be implemented in Scala."
- jar { manifest { name = "Qi4j Library - Scripting - Scala" }}
+ jar { manifest { name = "Apache Zest™ Library - Scripting - Scala" }}
+apply plugin: 'scala'
+
dependencies {
compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
compile(libraries.scala)
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/libraries/sql-liquibase/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/libraries/sql/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/manual/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/ee299296/samples/sql-support/build.gradle
----------------------------------------------------------------------