[tika] 02/03: Upgraded Groovy to the latest that can be used for Plugin and removed use of Field annotation to avoid module scoping errors in Java 17

[dm...@apache.org]

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

dmeikle pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 6ae79ce8cb0c178a75a26181c3525b05b79d49d0
Author: David Meikle <dm...@apache.org>
AuthorDate: Sat Oct 9 13:49:04 2021 +0100

    Upgraded Groovy to the latest that can be used for Plugin and removed use of Field annotation to avoid module scoping errors in Java 17
---
 tika-parsers/pom.xml                               |  2 +-
 .../tika/parser/ner/opennlp/ModelGetter.groovy     | 37 ++++++++++------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index b440bda..6fcbb5b 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -1084,7 +1084,7 @@
               <dependency>
                 <groupId>org.codehaus.groovy</groupId>
                 <artifactId>groovy-all</artifactId>
-                <version>2.4.4</version>
+                <version>2.4.9</version>
               </dependency>
             </dependencies>
             <executions>
diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy b/tika-parsers/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy
index 7560ee7..13793c8 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy
+++ b/tika-parsers/src/test/resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy
@@ -22,24 +22,6 @@
 
 import org.apache.maven.settings.Proxy as MvnProxy
 import java.net.Proxy as JDKProxy
-import groovy.transform.Field
-
-//BEGIN: Global context ; ${settings} is injected by the plugin
-List<MvnProxy> mvnProxies = settings.getProxies()?.findAll{it.isActive()}
-@Field JDKProxy proxy = null
-if (mvnProxies && mvnProxies.size() > 0) {
-    mvnProxy = mvnProxies.get(0)
-    println "Using the first Proxy setting : ${mvnProxy.username}@ ${mvnProxy.host} : ${mvnProxy.port} "
-    proxy = new JDKProxy(JDKProxy.Type.HTTP, new InetSocketAddress(mvnProxy.host, mvnProxy.port))
-    Authenticator.setDefault(new Authenticator(){
-        @Override
-        protected PasswordAuthentication getPasswordAuthentication(){
-            return new PasswordAuthentication(mvnProxy.username, mvnProxy.password?.toCharArray())
-        }
-    })
-    println "Proxy is configured"
-}
-//END : Global Context
 
 /**
  * Copies input stream to output stream, additionally printing the progress.
@@ -75,7 +57,7 @@ def copyWithProgress(InputStream inStr, OutputStream outStr, long totalLength){
  * @param file path to store file
  * @return
  */
-def downloadFile(String urlStr, File file) {
+def downloadFile(String urlStr, File file, Proxy proxy) {
     println "GET : $urlStr -> $file (Using proxy? ${proxy != null})"
     url = new URL(urlStr)
     try {
@@ -95,6 +77,21 @@ def downloadFile(String urlStr, File file) {
     }
 }
 
+def proxy = null
+def mvnProxies = settings.getProxies()?.findAll{it.isActive()}
+if (mvnProxies && mvnProxies.size() > 0) {
+    mvnProxy = mvnProxies.get(0)
+    println "Using the first Proxy setting : ${mvnProxy.username}@ ${mvnProxy.host} : ${mvnProxy.port} "
+    proxy = new JDKProxy(JDKProxy.Type.HTTP, new InetSocketAddress(mvnProxy.host, mvnProxy.port))
+    Authenticator.setDefault(new Authenticator(){
+        @Override
+        protected PasswordAuthentication getPasswordAuthentication(){
+            return new PasswordAuthentication(mvnProxy.username, mvnProxy.password?.toCharArray())
+        }
+    })
+    println "Proxy is configured"
+}
+
 def urlPrefix = "http://opennlp.sourceforge.net/models-1.5"
 def prefixPath = "src/test/resources/org/apache/tika/parser/ner/opennlp/"
 def ageUrlPrefix = "https://raw.githubusercontent.com/USCDataScience/AgePredictor/master/model"
@@ -121,6 +118,6 @@ def modelFiles = //filePath : url
 for (def entry : modelFiles) {
     File file = new File(entry.key)
     if (!file.exists()) {
-        downloadFile(entry.value, file)
+        downloadFile(entry.value, file, proxy)
     }
 }
\ No newline at end of file