Accepting request 755230 from Java:packages

Allow buildign with Java 11

OBS-URL: https://build.opensuse.org/request/show/755230
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gradle-bootstrap?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2019-12-09 20:36:08 +00:00 committed by Git OBS Bridge
commit 6939d87607
5 changed files with 114 additions and 75 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:2f6902e9f53379996e200acf072295827e5d56088d9f34ce9181fde0243105c7 oid sha256:f88f713504bb6b45477de1d6e1a79d0a4a895c9e42a72faa91b062e313c441b2
size 633259 size 634127

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:55d35382ff60d5433b2e4cbad45d76b511db28253c7514fb8c4096e6516feca8 oid sha256:b23cacaad6dba98561f99c12519c3cdb425345826a5cf74f558ebb9a3fb7d2a9
size 50077852 size 50188228

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Dec 9 12:18:31 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Regenerate to account for groovy upgrade to 2.4.16 and for
changes allowing to use gradle with java 11
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 28 08:46:33 UTC 2019 - Fridrich Strba <fstrba@suse.com> Thu Nov 28 08:46:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -18,7 +18,7 @@
%global short_name gradle %global short_name gradle
%global gradle_version 4.4.1 %global gradle_version 4.4.1
%global groovy_version 2.4.8 %global groovy_version 2.4.16
%global gpars_version 1.2.1 %global gpars_version 1.2.1
Name: %{short_name}-bootstrap Name: %{short_name}-bootstrap
Version: %{gradle_version} Version: %{gradle_version}

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId> <artifactId>groovy-all</artifactId>
<version>2.4.8</version> <version>2.4.16</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Apache Groovy</name> <name>Apache Groovy</name>
<description>Groovy: A powerful, dynamic language for the JVM</description> <description>Groovy: A powerful, dynamic language for the JVM</description>
@ -20,21 +20,11 @@
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
<mailingLists>
<mailingList>
<name>Groovy Developer List</name>
<archive>http://mail-archives.apache.org/mod_mbox/groovy-dev/</archive>
</mailingList>
<mailingList>
<name>Groovy User List</name>
<archive>http://mail-archives.apache.org/mod_mbox/groovy-users/</archive>
</mailingList>
</mailingLists>
<developers> <developers>
<developer> <developer>
<id>glaforge</id> <id>glaforge</id>
<name>Guillaume Laforge</name> <name>Guillaume Laforge</name>
<organization>org.apache.maven.model.Organization@239556d2</organization> <organization>org.apache.maven.model.Organization@1b374774</organization>
<roles> <roles>
<role>Project Manager</role> <role>Project Manager</role>
<role>Despot</role> <role>Despot</role>
@ -45,7 +35,7 @@
<id>bob</id> <id>bob</id>
<name>bob mcwhirter</name> <name>bob mcwhirter</name>
<email>bob@werken.com</email> <email>bob@werken.com</email>
<organization>org.apache.maven.model.Organization@4e6ce75d</organization> <organization>org.apache.maven.model.Organization@4ef55508</organization>
<roles> <roles>
<role>Founder</role> <role>Founder</role>
</roles> </roles>
@ -54,7 +44,7 @@
<id>jstrachan</id> <id>jstrachan</id>
<name>James Strachan</name> <name>James Strachan</name>
<email>james@coredevelopers.com</email> <email>james@coredevelopers.com</email>
<organization>org.apache.maven.model.Organization@4fe62df6</organization> <organization>org.apache.maven.model.Organization@66984649</organization>
<roles> <roles>
<role>Founder</role> <role>Founder</role>
</roles> </roles>
@ -62,7 +52,7 @@
<developer> <developer>
<id>joe</id> <id>joe</id>
<name>Joe Walnes</name> <name>Joe Walnes</name>
<organization>org.apache.maven.model.Organization@de11305</organization> <organization>org.apache.maven.model.Organization@1f1fde0f</organization>
<roles> <roles>
<role>Developer Emeritus</role> <role>Developer Emeritus</role>
</roles> </roles>
@ -70,7 +60,7 @@
<developer> <developer>
<id>skizz</id> <id>skizz</id>
<name>Chris Stevenson</name> <name>Chris Stevenson</name>
<organization>org.apache.maven.model.Organization@537b56c0</organization> <organization>org.apache.maven.model.Organization@51e7beff</organization>
<roles> <roles>
<role>Developer Emeritus</role> <role>Developer Emeritus</role>
</roles> </roles>
@ -78,7 +68,7 @@
<developer> <developer>
<id>jamiemc</id> <id>jamiemc</id>
<name>Jamie McCrindle</name> <name>Jamie McCrindle</name>
<organization>org.apache.maven.model.Organization@b90883</organization> <organization>org.apache.maven.model.Organization@7f4b3afd</organization>
<roles> <roles>
<role>Developer Emeritus</role> <role>Developer Emeritus</role>
</roles> </roles>
@ -86,7 +76,7 @@
<developer> <developer>
<id>mattf</id> <id>mattf</id>
<name>Matt Foemmel</name> <name>Matt Foemmel</name>
<organization>org.apache.maven.model.Organization@4606b967</organization> <organization>org.apache.maven.model.Organization@2ec31e53</organization>
<roles> <roles>
<role>Developer Emeritus</role> <role>Developer Emeritus</role>
</roles> </roles>
@ -138,7 +128,7 @@
<id>jwilson</id> <id>jwilson</id>
<name>John Wilson</name> <name>John Wilson</name>
<email>tug@wilson.co.uk</email> <email>tug@wilson.co.uk</email>
<organization>org.apache.maven.model.Organization@6a83e630</organization> <organization>org.apache.maven.model.Organization@4c9bd035</organization>
<roles> <roles>
<role>Developer Emeritus</role> <role>Developer Emeritus</role>
</roles> </roles>
@ -155,7 +145,7 @@
<id>ckl</id> <id>ckl</id>
<name>Christiaan ten Klooster</name> <name>Christiaan ten Klooster</name>
<email>ckl@dacelo.nl</email> <email>ckl@dacelo.nl</email>
<organization>org.apache.maven.model.Organization@6323304f</organization> <organization>org.apache.maven.model.Organization@5c8288b8</organization>
<roles> <roles>
<role>Developer Emeritus</role> <role>Developer Emeritus</role>
</roles> </roles>
@ -164,7 +154,7 @@
<id>goetze</id> <id>goetze</id>
<name>Steve Goetze</name> <name>Steve Goetze</name>
<email>goetze@dovetail.com</email> <email>goetze@dovetail.com</email>
<organization>org.apache.maven.model.Organization@5905025</organization> <organization>org.apache.maven.model.Organization@563ed1ff</organization>
<roles> <roles>
<role>Developer Emeritus</role> <role>Developer Emeritus</role>
</roles> </roles>
@ -173,7 +163,7 @@
<id>bran</id> <id>bran</id>
<name>Bing Ran</name> <name>Bing Ran</name>
<email>b55r@sina.com</email> <email>b55r@sina.com</email>
<organization>org.apache.maven.model.Organization@2903fbf0</organization> <organization>org.apache.maven.model.Organization@5b26cb82</organization>
<roles> <roles>
<role>Developer Emeritus</role> <role>Developer Emeritus</role>
</roles> </roles>
@ -182,7 +172,7 @@
<id>jez</id> <id>jez</id>
<name>Jeremy Rayner</name> <name>Jeremy Rayner</name>
<email>jeremy.rayner@gmail.com</email> <email>jeremy.rayner@gmail.com</email>
<organization>org.apache.maven.model.Organization@1f0323f2</organization> <organization>org.apache.maven.model.Organization@622f08db</organization>
<roles> <roles>
<role>Developer Emeritus</role> <role>Developer Emeritus</role>
</roles> </roles>
@ -208,7 +198,7 @@
<id>russel</id> <id>russel</id>
<name>Russel Winder</name> <name>Russel Winder</name>
<email>russel@russel.org.uk</email> <email>russel@russel.org.uk</email>
<organization>org.apache.maven.model.Organization@e16b27c</organization> <organization>org.apache.maven.model.Organization@7ac15e93</organization>
<roles> <roles>
<role>Developer</role> <role>Developer</role>
<role>Founder of Gant</role> <role>Founder of Gant</role>
@ -226,7 +216,7 @@
<id>cstein</id> <id>cstein</id>
<name>Christian Stein</name> <name>Christian Stein</name>
<email>sormuras@gmx.de</email> <email>sormuras@gmx.de</email>
<organization>org.apache.maven.model.Organization@5aa9f2d</organization> <organization>org.apache.maven.model.Organization@5dae96f4</organization>
<roles> <roles>
<role>Developer Emeritus</role> <role>Developer Emeritus</role>
</roles> </roles>
@ -235,7 +225,7 @@
<id>mittie</id> <id>mittie</id>
<name>Dierk Koenig</name> <name>Dierk Koenig</name>
<email>dierk.koenig@canoo.com</email> <email>dierk.koenig@canoo.com</email>
<organization>org.apache.maven.model.Organization@655941d0</organization> <organization>org.apache.maven.model.Organization@387c3f98</organization>
<roles> <roles>
<role>Developer</role> <role>Developer</role>
</roles> </roles>
@ -244,7 +234,7 @@
<id>paulk</id> <id>paulk</id>
<name>Paul King</name> <name>Paul King</name>
<email>paulk@asert.com.au</email> <email>paulk@asert.com.au</email>
<organization>org.apache.maven.model.Organization@25ff91b5</organization> <organization>org.apache.maven.model.Organization@45b5e01</organization>
<roles> <roles>
<role>Developer</role> <role>Developer</role>
<role>Despot</role> <role>Despot</role>
@ -307,7 +297,7 @@
<id>jimwhite</id> <id>jimwhite</id>
<name>Jim White</name> <name>Jim White</name>
<email>jim@pagesmiths.com</email> <email>jim@pagesmiths.com</email>
<organization>org.apache.maven.model.Organization@7106c88b</organization> <organization>org.apache.maven.model.Organization@705ea75a</organization>
<roles> <roles>
<role>Developer</role> <role>Developer</role>
</roles> </roles>
@ -351,6 +341,15 @@
<role>Developer</role> <role>Developer</role>
</roles> </roles>
</developer> </developer>
<developer>
<id>sunlan</id>
<name>Daniel Sun</name>
<email>realbluesun@hotmail.com</email>
<roles>
<role>Developer</role>
<role>Despot</role>
</roles>
</developer>
</developers> </developers>
<contributors> <contributors>
<contributor> <contributor>
@ -538,6 +537,12 @@
<contributor> <contributor>
<name>Thibault Kruse</name> <name>Thibault Kruse</name>
</contributor> </contributor>
<contributor>
<name>Tim Tiemens</name>
</contributor>
<contributor>
<name>Mike Spille</name>
</contributor>
<contributor> <contributor>
<name>Paolo Di Tommaso</name> <name>Paolo Di Tommaso</name>
</contributor> </contributor>
@ -574,29 +579,44 @@
<contributor> <contributor>
<name>Alan Green</name> <name>Alan Green</name>
</contributor> </contributor>
<contributor>
<name>Alex Popescu</name>
</contributor>
<contributor>
<name>Martin Kempf</name>
</contributor>
<contributor>
<name>Stephane Landelle</name>
</contributor>
<contributor>
<name>Vladimir Vivien</name>
</contributor>
</contributors> </contributors>
<issueManagement> <mailingLists>
<system>jira</system> <mailingList>
<url>http://issues.apache.org/jira/browse/GROOVY</url> <name>Groovy Developer List</name>
</issueManagement> <archive>http://mail-archives.apache.org/mod_mbox/groovy-dev/</archive>
</mailingList>
<mailingList>
<name>Groovy User List</name>
<archive>http://mail-archives.apache.org/mod_mbox/groovy-users/</archive>
</mailingList>
</mailingLists>
<scm> <scm>
<connection>scm:git:https://github.com/apache/groovy.git</connection> <connection>scm:git:https://github.com/apache/groovy.git</connection>
<developerConnection>scm:git:https://github.com/apache/groovy.git</developerConnection> <developerConnection>scm:git:https://github.com/apache/groovy.git</developerConnection>
<url>https://github.com/apache/groovy.git</url> <url>https://github.com/apache/groovy.git</url>
</scm> </scm>
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/jira/browse/GROOVY</url>
</issueManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId> <artifactId>ant</artifactId>
<version>1.9.4</version> <version>1.9.4</version>
<scope>runtime</scope> <scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-antlr</artifactId>
<version>1.9.4</version>
<scope>runtime</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
@ -614,9 +634,16 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId> <artifactId>ant-launcher</artifactId>
<version>1.9.4</version> <version>1.9.4</version>
<scope>compile</scope> <scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-antlr</artifactId>
<version>1.9.4</version>
<scope>runtime</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
@ -661,15 +688,15 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId> <artifactId>servlet-api</artifactId>
<version>2.0</version> <version>2.4</version>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>jsp-api</artifactId>
<version>2.4</version> <version>2.0</version>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@ -705,29 +732,16 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.fusesource.jansi</groupId> <groupId>org.apache.ant</groupId>
<artifactId>jansi</artifactId> <artifactId>ant</artifactId>
<version>1.11</version> <version>1.9.4</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.gpars</groupId>
<artifactId>gpars</artifactId>
<version>1.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>groovy-all</artifactId>
<groupId>org.codehaus.groovy</groupId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId> <artifactId>xstream</artifactId>
<version>1.4.7</version> <version>1.4.10</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -746,17 +760,36 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.ivy</groupId> <groupId>org.fusesource.jansi</groupId>
<artifactId>ivy</artifactId> <artifactId>jansi</artifactId>
<version>2.4.0</version> <version>1.11</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ivy</groupId>
<artifactId>ant</artifactId> <artifactId>ivy</artifactId>
<version>1.9.4</version> <version>2.4.0</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.codehaus.gpars</groupId>
<artifactId>gpars</artifactId>
<version>1.2.1</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>groovy-all</artifactId>
<groupId>org.codehaus.groovy</groupId>
</exclusion>
</exclusions>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>