msrb pushed to groovy (master). "Update to upstream release 2.4.2"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 10 09:41:13 UTC 2015
>From 12e0969b779239c41881e503727bff55b23ce8bb Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Fri, 10 Apr 2015 11:40:31 +0200
Subject: Update to upstream release 2.4.2
diff --git a/.gitignore b/.gitignore
index f48511e..84633a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ groovy-src-1.7.10.zip
/GROOVY_2_3_7.tar.gz
/GROOVY_2_4_0.tar.gz
/GROOVY_2_4_1.tar.gz
+/GROOVY_2_4_2.tar.gz
diff --git a/0002-Gradle-local-mode.patch b/0002-Gradle-local-mode.patch
index dd5dfd3..4728730 100644
--- a/0002-Gradle-local-mode.patch
+++ b/0002-Gradle-local-mode.patch
@@ -1,17 +1,5 @@
-From 6548032f9a87c3662788aa309cd7ee3be84c21e6 Mon Sep 17 00:00:00 2001
-From: Michal Srb <msrb at redhat.com>
-Date: Thu, 22 Jan 2015 13:35:59 +0100
-Subject: [PATCH 2/5] Gradle local mode
-
----
- build.gradle | 12 +++---------
- gradle/codehaus.gradle | 1 +
- gradle/quality.gradle | 1 -
- gradle/utils.gradle | 1 +
- 4 files changed, 5 insertions(+), 10 deletions(-)
-
diff --git a/build.gradle b/build.gradle
-index dabd498..28c93e8 100644
+index c28bf4e..6741f33 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,18 +7,13 @@ if (JavaVersion.current().java6Compatible) {
@@ -27,7 +15,7 @@ index dabd498..28c93e8 100644
}
-
- dependencies {
-- classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.0'
+- 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'
- }
@@ -91,6 +79,3 @@ index 4360092..cee1425 100644
mavenCentral()
}
dependencies {
---
-2.1.0
-
diff --git a/0005-Port-to-QDox-2.0.patch b/0005-Port-to-QDox-2.0.patch
index 8e1f274..68c8432 100644
--- a/0005-Port-to-QDox-2.0.patch
+++ b/0005-Port-to-QDox-2.0.patch
@@ -1,30 +1,23 @@
-From 6b5b2d584a5602f9185f13207740825000326ff2 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk at redhat.com>
-Date: Wed, 19 Nov 2014 09:30:33 +0100
-Subject: [PATCH 5/5] Port to QDox 2.0
-
----
- .../main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
diff --git a/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy b/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy
-index 06c4cdb..c2a2c29 100644
+index cbc9bfd..499a293 100644
--- a/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy
+++ b/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy
-@@ -15,11 +15,10 @@
+@@ -15,11 +15,12 @@
*/
package org.codehaus.groovy.tools
-import com.thoughtworks.qdox.JavaDocBuilder
+import com.thoughtworks.qdox.JavaProjectBuilder
++import com.thoughtworks.qdox.model.impl.DefaultJavaType
import com.thoughtworks.qdox.model.JavaClass
import com.thoughtworks.qdox.model.JavaMethod
import com.thoughtworks.qdox.model.JavaParameter
-import com.thoughtworks.qdox.model.Type
++import com.thoughtworks.qdox.model.JavaType
import groovy.text.SimpleTemplateEngine
import groovy.text.Template
import groovy.text.TemplateEngine
-@@ -57,7 +56,7 @@ class DocGenerator {
+@@ -57,7 +58,7 @@ class DocGenerator {
* with its methods, javadoc comments and tags.
*/
private static DocSource parseSource(List<File> sourceFiles) {
@@ -33,33 +26,39 @@ index 06c4cdb..c2a2c29 100644
sourceFiles.each {
if (it.exists()) {
builder.addSource(it.newReader())
-@@ -263,7 +262,7 @@ class DocGenerator {
+@@ -80,7 +81,7 @@ class DocGenerator {
+ }
+
+ def firstParam = method.parameters[0]
+- def firstParamType = firstParam.resolvedValue.isEmpty() ? firstParam.type : new Type(firstParam.resolvedValue, 0, firstParam.parentClass)
++ def firstParamType = firstParam.resolvedValue.isEmpty() ? firstParam.type : new DefaultJavaType(firstParam.resolvedValue, 0, firstParam.parentClass)
+ docSource.add(firstParamType, method)
+ }
+ docSource.populateInheritedMethods()
+@@ -262,7 +263,7 @@ class DocGenerator {
private static class DocSource {
SortedSet<DocPackage> packages = new TreeSet<DocPackage>(SORT_KEY_COMPARATOR)
- void add(Type type, JavaMethod javaMethod) {
-+ void add(JavaClass type, JavaMethod javaMethod) {
++ void add(JavaType type, JavaMethod javaMethod) {
DocType tempDocType = new DocType(type: type)
DocPackage aPackage = packages.find { it.name == tempDocType.packageName }
-@@ -286,7 +285,7 @@ class DocGenerator {
+@@ -285,7 +286,7 @@ class DocGenerator {
def allTypes = allDocTypes.collectEntries{ [it.fullyQualifiedClassName, it] }
allTypes.each { name, docType ->
if (name.endsWith('[]') || name.startsWith('primitive-types')) return
- Type next = docType.javaClass.superClass
-+ JavaClass next = docType.javaClass.superClass
++ JavaType next = docType.javaClass.superClass
while (next != null) {
if (allTypes.keySet().contains(next.value)) {
docType.inheritedMethods[allTypes[next.value]] = allTypes[next.value].docMethods
-@@ -326,7 +325,7 @@ class DocGenerator {
+@@ -325,7 +326,7 @@ class DocGenerator {
}
private static class DocType {
- private Type type
-+ private JavaClass type
++ private JavaType type
final String shortComment = "" // empty because cannot get a comment of JDK
SortedSet<DocMethod> docMethods = new TreeSet<DocMethod>(SORT_KEY_COMPARATOR)
Map<String, List<DocMethod>> inheritedMethods = new LinkedHashMap<String, List<DocMethod>>()
---
-2.1.0
-
diff --git a/groovy.spec b/groovy.spec
index d2f6dee..b15c2cf 100644
--- a/groovy.spec
+++ b/groovy.spec
@@ -3,8 +3,8 @@
# the Requires list.
Name: groovy
-Version: 2.4.1
-Release: 3%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
Summary: Dynamic language for the Java Platform
# Some of the files are licensed under BSD and CPL terms, but the CPL has been superceded
@@ -14,7 +14,7 @@ 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_1.tar.gz
+Source0: http://github.com/groovy/groovy-core/archive/GROOVY_2_4_2.tar.gz
Source1: groovy-script.sh
Source3: groovy.desktop
Source4: cpl-v10.txt
@@ -66,6 +66,12 @@ Requires: glassfish-servlet-api
# FIXME: this dependency is missing in generated POM files from some reason...
Requires: apache-commons-cli
+# optional in pom.xml, but present in upstream binary tarball
+Requires: xstream
+Requires: xpp3
+Requires: gpars
+Requires: apache-ivy
+
BuildArch: noarch
%description
@@ -85,7 +91,7 @@ This package contains Groovy JAR artifact.
%prep
-%setup -q -n groovy-core-GROOVY_2_4_1
+%setup -q -n groovy-core-GROOVY_2_4_2
cp %{SOURCE4} %{SOURCE5} %{SOURCE6} .
# Remove bundled JARs and classes
find \( -name *.jar -o -name *.class \) -delete
@@ -233,6 +239,9 @@ EOF
%doc LICENSE.txt NOTICE.txt README.adoc
%changelog
+* Fri Apr 10 2015 Michal Srb <msrb at redhat.com> - 2.4.2-1
+- Update to upstream release 2.4.2
+
* Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 2.4.1-3
- Add an AppData file for the software center
diff --git a/sources b/sources
index b05606d..7f1cd7d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
-7406c8872cfdba72946c57d2e26470ba GROOVY_2_4_1.tar.gz
+8e3bd25d19f8a263fc5480b74b8dbda1 GROOVY_2_4_2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/groovy.git/commit/?h=master&id=12e0969b779239c41881e503727bff55b23ce8bb
More information about the scm-commits
mailing list