msrb pushed to groovy (master). "Update to upstream release 2.4.3"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 10 11:48:00 UTC 2015
>From c69f05defc4526b8ce7b2db38001c09864ac2d96 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Fri, 10 Apr 2015 13:46:19 +0200
Subject: Update to upstream release 2.4.3
diff --git a/.gitignore b/.gitignore
index 84633a9..ba8e45d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ groovy-src-1.7.10.zip
/GROOVY_2_4_0.tar.gz
/GROOVY_2_4_1.tar.gz
/GROOVY_2_4_2.tar.gz
+/GROOVY_2_4_3.tar.gz
diff --git a/0002-Gradle-local-mode.patch b/0002-Gradle-local-mode.patch
index 4728730..8dae703 100644
--- a/0002-Gradle-local-mode.patch
+++ b/0002-Gradle-local-mode.patch
@@ -1,9 +1,8 @@
diff --git a/build.gradle b/build.gradle
-index c28bf4e..6741f33 100644
+index b749570..900f146 100644
--- a/build.gradle
+++ b/build.gradle
-@@ -7,18 +7,13 @@ if (JavaVersion.current().java6Compatible) {
-
+@@ -1,17 +1,12 @@
buildscript {
repositories {
+ xmvn()
@@ -17,12 +16,12 @@ index c28bf4e..6741f33 100644
- dependencies {
- classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.2'
- classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.3'
-- classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.0'
+- //classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.1'
- }
}
- File javaHome = new File(System.getProperty('java.home'))
-@@ -38,14 +33,12 @@ allprojects {
+ plugins {
+@@ -39,14 +34,12 @@ allprojects {
group = 'org.codehaus.groovy'
version = groovyVersion
repositories {
@@ -38,7 +37,7 @@ index c28bf4e..6741f33 100644
}
// todo: use the conventional "resources" directory for classpath resources
-@@ -83,6 +76,7 @@ subprojects {
+@@ -84,6 +77,7 @@ subprojects {
}
repositories {
@@ -59,14 +58,23 @@ index 66a6208..5684566 100644
}
dependencies {
diff --git a/gradle/quality.gradle b/gradle/quality.gradle
-index 12d4eaa..704f784 100644
+index 312eee1..3b5f749 100644
--- a/gradle/quality.gradle
+++ b/gradle/quality.gradle
-@@ -87,4 +87,3 @@ allprojects {
+@@ -20,7 +20,6 @@ import groovy.text.markup.TemplateConfiguration
+ allprojects {
+ //apply plugin: "com.github.hierynomus.license"
+ apply plugin: 'checkstyle'
+- apply plugin: 'codenarc'
+
+ // license {
+ // header rootProject.file('gradle/LICENSE.txt')
+@@ -111,5 +110,3 @@ allprojects {
}
apply from: 'gradle/jacoco/jacoco.gradle'
--apply from: 'gradle/binarycompatibility.gradle'
+-// Temporarily disabled because of conflict
+-//apply from: 'gradle/binarycompatibility.gradle'
diff --git a/gradle/utils.gradle b/gradle/utils.gradle
index 4360092..cee1425 100644
--- a/gradle/utils.gradle
diff --git a/0003-Bintray.patch b/0003-Bintray.patch
index 24981fb..72e6c14 100644
--- a/0003-Bintray.patch
+++ b/0003-Bintray.patch
@@ -1,30 +1,16 @@
-From 04afa9d5271338a05ca7d6b168b3ed7dd301292e Mon Sep 17 00:00:00 2001
-From: Michal Srb <msrb at redhat.com>
-Date: Thu, 22 Jan 2015 13:42:54 +0100
-Subject: [PATCH 3/5] Bintray
-
----
- build.gradle | 17 -----------------
- gradle/docs.gradle | 16 +---------------
- gradle/upload.gradle | 12 +++---------
- 3 files changed, 4 insertions(+), 41 deletions(-)
-
diff --git a/build.gradle b/build.gradle
-index 28c93e8..c359151 100644
+index 900f146..fa91b1b 100644
--- a/build.gradle
+++ b/build.gradle
-@@ -1,10 +1,6 @@
+@@ -15,7 +15,6 @@ plugins {
+
apply from: 'gradle/filter.gradle'
apply from: 'gradle/indy.gradle'
+-apply from: 'gradle/bintray.gradle'
--if (JavaVersion.current().java6Compatible) {
-- apply from: 'gradle/bintray.gradle'
--}
--
- buildscript {
- repositories {
- xmvn()
-@@ -114,7 +110,6 @@ ext {
+ File javaHome = new File(System.getProperty('java.home'))
+ logger.lifecycle "Using Java from $javaHome (version ${System.getProperty('java.version')})"
+@@ -115,7 +114,6 @@ ext {
luceneVersion = '4.7.2'
openejbVersion = '1.0'
qdoxVersion = '1.12.1'
@@ -32,7 +18,7 @@ index 28c93e8..c359151 100644
slf4jVersion = '1.7.6'
xmlunitVersion = '1.5'
xstreamVersion = '1.4.7'
-@@ -155,15 +150,6 @@ dependencies {
+@@ -156,15 +154,6 @@ dependencies {
testCompile "com.thoughtworks.qdox:qdox:$qdoxVersion"
tools "com.googlecode.jarjar:jarjar:$jarjarVersion"
@@ -48,7 +34,7 @@ index 28c93e8..c359151 100644
tools "org.ow2.asm:asm-all:$asmVersion"
tools "com.thoughtworks.qdox:qdox:$qdoxVersion"
tools "biz.aQute:bnd:$bndVersion"
-@@ -417,9 +403,6 @@ apply from: 'gradle/groovydoc.gradle'
+@@ -423,9 +412,6 @@ apply from: 'gradle/groovydoc.gradle'
apply from: 'gradle/docs.gradle'
apply from: 'gradle/assemble.gradle'
apply from: 'gradle/upload.gradle'
@@ -136,6 +122,3 @@ index 15c8952..204dd19 100644
project.artifacts.add('archives', distBin)
tasks.withType(Jar).matching { it.name.startsWith('backport') }.each { t ->
project.artifacts.add('archives', t.archivePath) {
---
-2.1.0
-
diff --git a/groovy.spec b/groovy.spec
index b15c2cf..6d55074 100644
--- a/groovy.spec
+++ b/groovy.spec
@@ -3,7 +3,7 @@
# the Requires list.
Name: groovy
-Version: 2.4.2
+Version: 2.4.3
Release: 1%{?dist}
Summary: Dynamic language for the Java Platform
@@ -14,12 +14,11 @@ Summary: Dynamic language for the Java Platform
License: ASL 2.0 and BSD and EPL and Public Domain and CC-BY
URL: http://groovy-lang.org
-Source0: http://github.com/groovy/groovy-core/archive/GROOVY_2_4_2.tar.gz
+Source0: http://github.com/groovy/groovy-core/archive/GROOVY_2_4_3.tar.gz
Source1: groovy-script.sh
Source3: groovy.desktop
Source4: cpl-v10.txt
Source5: epl-v10.txt
-Source6: http://www.apache.org/licenses/LICENSE-2.0.txt
Patch0: 0001-Port-to-Servlet-API-3.1.patch
Patch1: 0002-Gradle-local-mode.patch
@@ -91,8 +90,8 @@ This package contains Groovy JAR artifact.
%prep
-%setup -q -n groovy-core-GROOVY_2_4_2
-cp %{SOURCE4} %{SOURCE5} %{SOURCE6} .
+%setup -q -n groovy-core-GROOVY_2_4_3
+cp %{SOURCE4} %{SOURCE5} .
# Remove bundled JARs and classes
find \( -name *.jar -o -name *.class \) -delete
@@ -236,9 +235,12 @@ EOF
%config(noreplace) %{_sysconfdir}/*
%files lib -f .mfiles
-%doc LICENSE.txt NOTICE.txt README.adoc
+%doc LICENSE NOTICE README.adoc
%changelog
+* Fri Apr 10 2015 Michal Srb <msrb at redhat.com> - 2.4.3-1
+- Update to upstream release 2.4.3
+
* Fri Apr 10 2015 Michal Srb <msrb at redhat.com> - 2.4.2-1
- Update to upstream release 2.4.2
diff --git a/sources b/sources
index 7f1cd7d..ef0afba 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
-8e3bd25d19f8a263fc5480b74b8dbda1 GROOVY_2_4_2.tar.gz
+94c1c4e0307ae78bb20401ef184dbcbe GROOVY_2_4_3.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/groovy.git/commit/?h=master&id=c69f05defc4526b8ce7b2db38001c09864ac2d96
More information about the scm-commits
mailing list