polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [42/50] [abbrv] zest-qi4j git commit: Build System: upgraded Gradle to 1.5
Date Fri, 17 Apr 2015 16:06:02 GMT
Build System: upgraded Gradle to 1.5


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

Branch: refs/heads/master
Commit: 44adc5e52af89dc012a3df395ebc93c010ec9ec0
Parents: 9a170ed
Author: Paul Merlin <paul@nosphere.org>
Authored: Sun Apr 14 00:43:42 2013 +0200
Committer: Paul Merlin <paul@nosphere.org>
Committed: Sun Apr 14 00:43:42 2013 +0200

----------------------------------------------------------------------
 build.gradle                             |  32 ++++++++++++++------------
 gradle/wrapper/gradle-wrapper.jar        | Bin 46707 -> 46742 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 3 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/44adc5e5/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index f454525..7d02e86 100644
--- a/build.gradle
+++ b/build.gradle
@@ -60,6 +60,16 @@ idea.project.ipr {
 
 // 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
+def repos_urls = [
+  mavenCentral: "http://repo1.maven.org/maven2/",
+  ops4j: "http://repository.ops4j.org/maven2/",
+  aduna: "http://repo.aduna-software.org/maven2/releases/",
+  restlet: 'http://maven.restlet.org',
+  javanet: "http://download.java.net/maven/2",
+]
 
 allprojects {
 
@@ -80,10 +90,10 @@ allprojects {
 
   repositories {
     mavenCentral()
-    mavenRepo name: 'ops4j-repo', url: "http://repository.ops4j.org/maven2/"
-    mavenRepo name: 'aduna-repo', url: "http://repo.aduna-software.org/maven2/releases/"
-    mavenRepo name: 'restlet-repo', url: 'http://maven.restlet.org'
-    mavenRepo name: 'maven2-repository.dev.java.net', url: "http://download.java.net/maven/2"
+    mavenRepo name: 'ops4j-repo', url: repos_urls.ops4j
+    mavenRepo name: 'aduna-repo', url: repos_urls.aduna
+    mavenRepo name: 'restlet-repo', url: repos_urls.restlet
+    mavenRepo name: 'maven2-repository.dev.java.net', url: repos_urls.javanet
   }
 
   // Artifact upload global configuration BEGIN -----------------------------
@@ -415,20 +425,12 @@ buildAll.doLast {
     runtimeDepsMetalink = runtimeDepsMetalink + " <version>${version}</version>\n"
     def handledGavPaths = []
     releaseApprovedProjects.each { p ->
-      def m2roots = []
-      p.repositories.each { repo ->
-        def resolver = repo.createResolver()
-        if( !resolver.m2compatible ) {
-          throw new GradleException( "Cannot build SDK dependencies metalink because a repository
is not m2compatible: ${resolver.root}" )
-        }
-        m2roots << resolver.root
-      }
       p.configurations.runtime.allDependencies.each { dep ->
         def gavpath = dep.group.replace(".","/") + "/" + dep.name + "/" + dep.version + "/"
+ dep.name + "-" + dep.version + ".jar"
         if( !dep.group.startsWith("org.qi4j") && !handledGavPaths.contains( gavpath
) ) {
           runtimeDepsMetalink = runtimeDepsMetalink + "  <file name=\"${dep.group}-${dep.name}-${dep.version}.jar\">\n"
-          m2roots.each { m2root ->
-            runtimeDepsMetalink = runtimeDepsMetalink + "    <url>" + m2root + dep.group.replace(".","/")
+ "/" + dep.name + "/" + dep.version + "/" + dep.name + "-" + dep.version + ".jar" + "</url>\n"
+          repos_urls.each { repo_url ->
+            runtimeDepsMetalink = runtimeDepsMetalink + "    <url>" + repo_url.value
+ dep.group.replace(".","/") + "/" + dep.name + "/" + dep.version + "/" + dep.name + "-" +
dep.version + ".jar" + "</url>\n"
           }
           runtimeDepsMetalink = runtimeDepsMetalink + "  </file>\n\n"
           handledGavPaths << gavpath
@@ -572,5 +574,5 @@ task release {
 //  2) /gradlew.bat which is the windows bat script for for executing builds
 //  3) /wrapper which is a directory named by the "jarPath" config which contains other needed
files.
 task wrapper( type: Wrapper ) {
-  gradleVersion = '1.4'
+  gradleVersion = '1.5'
 }

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/44adc5e5/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b6b646b..faa569a 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/44adc5e5/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 67b3265..df24bc7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Feb 13 18:11:49 CET 2013
+#Sat Apr 13 18:40:21 CEST 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.4-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.5-bin.zip


Mime
View raw message