This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 32ac21a Update used groovy libraries to 2.5.11. Fixes NETBEANS-4172
new 0dc75ef Merge pull request #2077 from svenreimers/issue/NETBEANS-4172
32ac21a is described below
commit 32ac21af13fdf2ced71fa15cff47219fc4f8b21b
Author: Sven Reimers <sven.reim...@gmail.com>
AuthorDate: Tue Apr 14 22:06:02 2020 +0200
Update used groovy libraries to 2.5.11. Fixes NETBEANS-4172
---
groovy/libs.groovy/external/binaries-list | 4 ++--
.../external/{groovy-2.5.10-license.txt => groovy-2.5.11-license.txt} | 4 ++--
.../external/{groovy-2.5.10-notice.txt => groovy-2.5.11-notice.txt} | 0
groovy/libs.groovy/nbproject/project.properties | 4 ++--
groovy/libs.groovy/nbproject/project.xml | 4 ++--
.../src/org/netbeans/modules/libs/groovy/Bundle.properties | 4 ++--
.../libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/groovy/libs.groovy/external/binaries-list
b/groovy/libs.groovy/external/binaries-list
index cb4952c..2fd5d12 100644
--- a/groovy/libs.groovy/external/binaries-list
+++ b/groovy/libs.groovy/external/binaries-list
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-E02047A2DE591492CB19E82C9A72BD9D24B25235 org.codehaus.groovy:groovy:2.5.10
-15DF77F6AB36DB7F8C5A60CDD12D5680193C25F9 org.codehaus.groovy:groovy-ant:2.5.10
+4D8F25C5DA08AF46FB204FD493EC894699A3F4E8 org.codehaus.groovy:groovy:2.5.11
+90B3F8BF9DCFA499271A8B760E71DF7E364659A6 org.codehaus.groovy:groovy-ant:2.5.11
diff --git a/groovy/libs.groovy/external/groovy-2.5.10-license.txt
b/groovy/libs.groovy/external/groovy-2.5.11-license.txt
similarity index 99%
rename from groovy/libs.groovy/external/groovy-2.5.10-license.txt
rename to groovy/libs.groovy/external/groovy-2.5.11-license.txt
index 823c7eb..64a6664 100644
--- a/groovy/libs.groovy/external/groovy-2.5.10-license.txt
+++ b/groovy/libs.groovy/external/groovy-2.5.11-license.txt
@@ -1,6 +1,6 @@
Name: Groovy
-Version: 2.5.10
-Files: groovy-2.5.10.jar groovy-ant-2.5.10.jar
+Version: 2.5.11
+Files: groovy-2.5.11.jar groovy-ant-2.5.11.jar
Description: Groovy Language distribution.
License: Apache-2.0-groovy
Origin: http://groovy-lang.org/
diff --git a/groovy/libs.groovy/external/groovy-2.5.10-notice.txt
b/groovy/libs.groovy/external/groovy-2.5.11-notice.txt
similarity index 100%
rename from groovy/libs.groovy/external/groovy-2.5.10-notice.txt
rename to groovy/libs.groovy/external/groovy-2.5.11-notice.txt
diff --git a/groovy/libs.groovy/nbproject/project.properties
b/groovy/libs.groovy/nbproject/project.properties
index 3842e6b..b5c77bb 100644
--- a/groovy/libs.groovy/nbproject/project.properties
+++ b/groovy/libs.groovy/nbproject/project.properties
@@ -24,5 +24,5 @@ javac.compilerargs=-Xlint -Xlint:-serial
sigtest.gen.fail.on.error=false
#cp.extra=external/groovy-all-2.1.7.jar
-release.external/groovy-2.5.10.jar=modules/ext/groovy.jar
-release.external/groovy-ant-2.5.10.jar=modules/ext/groovy-ant.jar
+release.external/groovy-2.5.11.jar=modules/ext/groovy.jar
+release.external/groovy-ant-2.5.11.jar=modules/ext/groovy-ant.jar
diff --git a/groovy/libs.groovy/nbproject/project.xml
b/groovy/libs.groovy/nbproject/project.xml
index 1474620..f925f36 100644
--- a/groovy/libs.groovy/nbproject/project.xml
+++ b/groovy/libs.groovy/nbproject/project.xml
@@ -51,11 +51,11 @@
</friend-packages>
<class-path-extension>
<runtime-relative-path>ext/groovy.jar</runtime-relative-path>
- <binary-origin>external/groovy-2.5.10.jar</binary-origin>
+ <binary-origin>external/groovy-2.5.11.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/groovy-ant.jar</runtime-relative-path>
- <binary-origin>external/groovy-ant-2.5.10.jar</binary-origin>
+ <binary-origin>external/groovy-ant-2.5.11.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git
a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties
b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties
index 8cb84e4..d3a0a08 100644
--- a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties
+++ b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties
@@ -16,5 +16,5 @@
# under the License.
OpenIDE-Module-Name=Groovy Binaries
-groovy=Groovy 2.5.10
-groovy-ant=Groovy Ant 2.5.10
+groovy=Groovy 2.5.11
+groovy-ant=Groovy Ant 2.5.11
diff --git
a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml
b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml
index df8aa52..a95fa3b 100644
--- a/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml
+++ b/groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml
@@ -34,8 +34,8 @@
<property>
<name>maven-dependencies</name>
<value>
- org.codehaus.groovy:groovy:2.5.10:jar
- org.codehaus.groovy:groovy-ant:2.5.10:jar
+ org.codehaus.groovy:groovy:2.5.11:jar
+ org.codehaus.groovy:groovy-ant:2.5.11:jar
</value>
</property>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
