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/06/15 02:37:44 UTC

[4/5] zest-qi4j git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/zest-qi4j into develop

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/zest-qi4j into develop


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/d31b13c2
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/d31b13c2
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/d31b13c2

Branch: refs/heads/develop
Commit: d31b13c25b33a77a7f6ea34fbaff24ce5b7405ff
Parents: 060bb35 e44fb65
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Mon Jun 15 07:42:25 2015 +0800
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Mon Jun 15 07:42:25 2015 +0800

----------------------------------------------------------------------
 LICENSE.txt                              | 42 ++++++++++++++++++++++
 build.gradle                             | 29 +++++++++++++---
 etc/qi4j-api-checkstyle.xml              | 21 +++++++++++
 etc/qi4j-runtime-checkstyle.xml          | 21 +++++++++++
 etc/qi4j-tests-checkstyle.xml            | 21 +++++++++++
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 libraries.gradle                         | 19 ++++++++++
 maven-compat.gradle                      | 50 ++++++++++++++++++++++-----
 settings.gradle                          | 19 ++++++++++
 9 files changed, 210 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d31b13c2/libraries.gradle
----------------------------------------------------------------------
diff --cc libraries.gradle
index 008bf80,59a0047..b9e8d50
--- a/libraries.gradle
+++ b/libraries.gradle
@@@ -1,5 -1,25 +1,24 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  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.  See the License for the
+  * specific language governing permissions and limitations
+  * under the License.
+  */
+ 
  // Versions of Dependencies;
  def asmVersion = '5.0.3'
 -def beanshellVersion = '2.0b4'
  def bonecpVersion = '0.8.0.RELEASE'
  def bouncyVersion = '1.50'
  def c3p0Version = '0.9.1.2'

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d31b13c2/settings.gradle
----------------------------------------------------------------------