Merge pull request #4698 from senivam/3x_merged

merge of actual master into 3.x

examples/groovy/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
 
  This program and the accompanying materials are made available under the
  terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -26,10 +26,10 @@
 
  <dependencies>
  <dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
  <artifactId>groovy-all</artifactId>
  <type>pom</type>
- <version>3.0.2</version>
+ <version>4.0.0-alpha-2</version>
  </dependency>
  <dependency>
  <groupId>org.glassfish.jersey.test-framework.providers</groupId>
@@ -78,7 +78,7 @@
  <plugin>
  <groupId>org.codehaus.gmavenplus</groupId>
  <artifactId>gmavenplus-plugin</artifactId>
- <version>1.6</version>
+ <version>1.12.1</version>
  <executions>
  <execution>
  <id>1</id>