You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by GitBox <gi...@apache.org> on 2017/11/02 07:17:55 UTC

[GitHub] geertjanw closed pull request #215: Disabling check for maven coordinates in RatReportTask.

geertjanw closed pull request #215: Disabling check for maven coordinates in RatReportTask.
URL: https://github.com/apache/incubator-netbeans/pull/215
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java b/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java
index b22b2fea7..72b6b28a0 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java
@@ -166,7 +166,6 @@ public void execute() throws BuildException {
         } catch (ParserConfigurationException | SAXException | IOException | XPathExpressionException ex) {
             throw new BuildException("Cannot parse Rat report ", ex);
         }
-        doCheckExternal(moduleRATInfo);
 
         for (String clusterName : clusterList) {
             // create a report file by cluster
@@ -237,35 +236,6 @@ private void doPopulateApproved(Map<String, ModuleInfo> moduleRATInfo, Element r
         }
     }
 
-    private void doCheckExternal(Map<String, ModuleInfo> moduleRATInfo) {
-        for (Map.Entry<String, ModuleInfo> minfo : moduleRATInfo.entrySet()) {
-            File binaryList = new File(minfo.getValue().getFolder(), File.separator + "external" + File.separator + "binaries-list");
-            if (binaryList.exists()) {
-                try (BufferedReader br = new BufferedReader(new FileReader(binaryList))) {
-                    String line = br.readLine();
-                    while (line != null) {
-                        if (line.trim().startsWith("#") || line.trim().isEmpty()) {
-                            // comment
-                        } else {
-                            String[] splitedExternalInfo = line.split(" ");
-
-                            String[] mavenizedExternal = splitedExternalInfo[1].split(":");
-                            if (mavenizedExternal.length != 3) {
-                                minfo.getValue().addInvalidExternal(splitedExternalInfo[1]);
-                            }
-                        }
-                        line = br.readLine();
-                    }
-                } catch (FileNotFoundException ex) {
-                    Logger.getLogger(RatReportTask.class.getName()).log(Level.SEVERE, null, ex);
-                } catch (IOException ex) {
-                    Logger.getLogger(RatReportTask.class.getName()).log(Level.SEVERE, null, ex);
-                }
-
-            }
-        }
-    }
-
     private String getModuleName(String resource) {
         String moduleName;
         if (!resource.contains(File.separator)) {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services