[openwebbeans] 02/02: [OWB-1345] based on hwaastad PR, upgrade webbeans-gradle shadow version to 6.0.0

[rmannibucau]

This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git

commit 2f9f0325ed104c2d58f9e020baffdf7f3805ed00
Author: Romain Manni-Bucau <rmannibu...@gmail.com>
AuthorDate: Mon Aug 3 11:57:47 2020 +0200

    [OWB-1345] based on hwaastad PR, upgrade webbeans-gradle shadow version to 
6.0.0
---
 webbeans-gradle/pom.xml                            | 23 ++++++++-------
 .../shadow/OpenWebBeansPropertiesTransformer.java  | 34 ++++++++++++----------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/webbeans-gradle/pom.xml b/webbeans-gradle/pom.xml
index aad850b..618c01f 100644
--- a/webbeans-gradle/pom.xml
+++ b/webbeans-gradle/pom.xml
@@ -17,7 +17,8 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" 
http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation=" http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>openwebbeans</artifactId>
     <groupId>org.apache.openwebbeans</groupId>
@@ -38,26 +39,28 @@
     <dependency>
       <groupId>com.github.jengelman.gradle.plugins</groupId>
       <artifactId>shadow</artifactId>
-      <version>5.2.0</version>
+      <version>6.0.0</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.groovy</groupId>
+          <artifactId>groovy-backports-compat23</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
-      <version>2.4.7</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jdom</groupId>
-      <artifactId>jdom2</artifactId>
-      <version>2.0.6</version>
+      <version>2.4.19</version>
       <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.11.0</version>
+      <version>2.13.3</version>
       <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <!-- no openwebbeans-impl there please to not pollute gradle buildscript 
classpath -->
   </dependencies>
diff --git 
a/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java
 
b/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java
index 135f9b2..a1d479a 100644
--- 
a/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java
+++ 
b/webbeans-gradle/src/main/java/org/apache/openwebbeans/gradle/shadow/OpenWebBeansPropertiesTransformer.java
@@ -40,22 +40,22 @@ public class OpenWebBeansPropertiesTransformer implements 
Transformer
     private boolean reverseOrder;
 
     @Override
-    public boolean canTransformResource(FileTreeElement s)
+    public boolean canTransformResource(final FileTreeElement s)
     {
         String path = s.getRelativePath().getPathString();
-        if (resource != null && resource.equalsIgnoreCase(path)) {
-            return true;
-        }
-
-        return false;
+        return resource != null && resource.equalsIgnoreCase(path);
     }
 
     @Override
-    public void transform(TransformerContext transformerContext) {
+    public void transform(final TransformerContext transformerContext)
+    {
         Properties p = new Properties();
-        try {
+        try
+        {
             p.load(transformerContext.getIs());
-        } catch (IOException e) {
+        }
+        catch (final IOException e)
+        {
             throw new IllegalStateException(e);
         }
         configurations.add(p);
@@ -68,13 +68,17 @@ public class OpenWebBeansPropertiesTransformer implements 
Transformer
     }
 
     @Override
-    public void modifyOutputStream(ZipOutputStream zipOutputStream, boolean 
preserveFileTimestamps) {
+    public void modifyOutputStream(final ZipOutputStream zipOutputStream, 
final boolean preserveFileTimestamps)
+    {
         Properties out = mergeProperties(sortProperties(configurations));
-        try {
+        try
+        {
             zipOutputStream.putNextEntry(new 
shadow.org.apache.tools.zip.ZipEntry(resource));
             out.store(zipOutputStream, "# gradle " + resource + " merge");
             zipOutputStream.closeEntry();
-        } catch (IOException ioe) {
+        }
+        catch (final IOException ioe)
+        {
             throw new IllegalStateException(ioe);
         }
     }
@@ -95,17 +99,17 @@ public class OpenWebBeansPropertiesTransformer implements 
Transformer
         return resource;
     }
 
-    public void setOrdinalKey(String ordinalKey)
+    public void setOrdinalKey(final String ordinalKey)
     {
         this.ordinalKey = ordinalKey;
     }
 
-    public void setDefaultOrdinal(int defaultOrdinal)
+    public void setDefaultOrdinal(final int defaultOrdinal)
     {
         this.defaultOrdinal = defaultOrdinal;
     }
 
-    private List<Properties> sortProperties(List<Properties> allProperties)
+    private List<Properties> sortProperties(final List<Properties> 
allProperties)
     {
         List<Properties> sortedProperties = new ArrayList<>();
         for (Properties p : allProperties)