From e083994ce944800ec2c33fdc0e62f1484b5ea72c Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Sat, 15 Jan 2022 20:45:06 -0800 Subject: [PATCH 01/55] NUTCH-2936 Early registration of URL stream handlers provided by plugins may fail Hadoop jobs running in distributed mode --- .../org/apache/nutch/parse/ParserChecker.java | 48 +++--- .../org/apache/nutch/plugin/Extension.java | 12 +- .../apache/nutch/plugin/ExtensionPoint.java | 18 +-- .../nutch/plugin/PluginManifestParser.java | 3 +- .../apache/nutch/plugin/PluginRepository.java | 55 +++---- .../nutch/plugin/URLStreamHandlerFactory.java | 13 +- .../nutch/protocol/http/api/HttpBase.java | 140 +++++++++--------- src/plugin/protocol-foo/plugin.xml | 2 +- src/plugin/protocol-okhttp/ivy.xml | 4 +- src/plugin/protocol-okhttp/plugin.xml | 12 +- .../apache/nutch/protocol/okhttp/OkHttp.java | 48 +++--- .../nutch/protocol/okhttp/OkHttpResponse.java | 26 ++-- 12 files changed, 194 insertions(+), 187 deletions(-) diff --git a/src/java/org/apache/nutch/parse/ParserChecker.java b/src/java/org/apache/nutch/parse/ParserChecker.java index 6c82a516be..5da023fdc4 100644 --- a/src/java/org/apache/nutch/parse/ParserChecker.java +++ b/src/java/org/apache/nutch/parse/ParserChecker.java @@ -114,15 +114,15 @@ public int run(String[] args) throws Exception { int numConsumed; for (int i = 0; i < args.length; i++) { if (args[i].equals("-normalize")) { - normalizers = new URLNormalizers(getConf(), URLNormalizers.SCOPE_DEFAULT); + this.normalizers = new URLNormalizers(getConf(), URLNormalizers.SCOPE_DEFAULT); } else if (args[i].equals("-followRedirects")) { - followRedirects = true; + this.followRedirects = true; } else if (args[i].equals("-checkRobotsTxt")) { - checkRobotsTxt = true; + this.checkRobotsTxt = true; } else if (args[i].equals("-forceAs")) { - forceAsContentType = args[++i]; + this.forceAsContentType = args[++i]; } else if (args[i].equals("-dumpText")) { - dumpText = true; + this.dumpText = true; } else if (args[i].equals("-md")) { String k = null, v = null; String nextOne = args[++i]; @@ -132,7 +132,7 @@ public int run(String[] args) throws Exception { v = nextOne.substring(firstEquals + 1); } else k = nextOne; - metadata.put(k, v); + this.metadata.put(k, v); } else if ((numConsumed = super.parseArgs(args, i)) > 0) { i += numConsumed - 1; } else if (i != args.length - 1) { @@ -144,7 +144,7 @@ public int run(String[] args) throws Exception { } } - scfilters = new ScoringFilters(getConf()); + this.scfilters = new ScoringFilters(getConf()); if (url != null) { return super.processSingle(url); @@ -155,25 +155,25 @@ public int run(String[] args) throws Exception { } protected int process(String url, StringBuilder output) throws Exception { - if (normalizers != null) { - url = normalizers.normalize(url, URLNormalizers.SCOPE_DEFAULT); + if (this.normalizers != null) { + url = this.normalizers.normalize(url, URLNormalizers.SCOPE_DEFAULT); } LOG.info("fetching: " + url); CrawlDatum datum = new CrawlDatum(); - Iterator iter = metadata.keySet().iterator(); + Iterator iter = this.metadata.keySet().iterator(); while (iter.hasNext()) { String key = iter.next(); - String value = metadata.get(key); + String value = this.metadata.get(key); if (value == null) value = ""; datum.getMetaData().put(new Text(key), new Text(value)); } int maxRedirects = getConf().getInt("http.redirect.max", 3); - if (followRedirects) { + if (this.followRedirects) { if (maxRedirects == 0) { LOG.info("Following max. 3 redirects (ignored http.redirect.max == 0)"); maxRedirects = 3; @@ -183,30 +183,30 @@ protected int process(String url, StringBuilder output) throws Exception { } ProtocolOutput protocolOutput = getProtocolOutput(url, datum, - checkRobotsTxt); + this.checkRobotsTxt); Text turl = new Text(url); // Following redirects and not reached maxRedirects? int numRedirects = 0; while (protocolOutput != null && !protocolOutput.getStatus().isSuccess() - && followRedirects && protocolOutput.getStatus().isRedirect() + && this.followRedirects && protocolOutput.getStatus().isRedirect() && maxRedirects >= numRedirects) { String[] stuff = protocolOutput.getStatus().getArgs(); url = stuff[0]; LOG.info("Follow redirect to {}", url); - if (normalizers != null) { - url = normalizers.normalize(url, URLNormalizers.SCOPE_DEFAULT); + if (this.normalizers != null) { + url = this.normalizers.normalize(url, URLNormalizers.SCOPE_DEFAULT); } turl.set(url); // try again - protocolOutput = getProtocolOutput(url, datum, checkRobotsTxt); + protocolOutput = getProtocolOutput(url, datum, this.checkRobotsTxt); numRedirects++; } - if (checkRobotsTxt && protocolOutput == null) { + if (this.checkRobotsTxt && protocolOutput == null) { System.err.println("Fetch disallowed by robots.txt"); return -1; } @@ -231,9 +231,9 @@ protected int process(String url, StringBuilder output) throws Exception { } String contentType; - if (forceAsContentType != null) { - content.setContentType(forceAsContentType); - contentType = forceAsContentType; + if (this.forceAsContentType != null) { + content.setContentType(this.forceAsContentType); + contentType = this.forceAsContentType; } else { contentType = content.getContentType(); } @@ -253,7 +253,7 @@ protected int process(String url, StringBuilder output) throws Exception { // call the scoring filters try { - scfilters.passScoreBeforeParsing(turl, datum, content); + this.scfilters.passScoreBeforeParsing(turl, datum, content); } catch (Exception e) { if (LOG.isWarnEnabled()) { LOG.warn("Couldn't pass score before parsing, url " + turl + " (" + e @@ -284,7 +284,7 @@ protected int process(String url, StringBuilder output) throws Exception { Parse parse = entry.getValue(); // call the scoring filters try { - scfilters.passScoreAfterParsing(turl, content, parse); + this.scfilters.passScoreAfterParsing(turl, content, parse); } catch (Exception e) { if (LOG.isWarnEnabled()) { LOG.warn("Couldn't pass score after parsing, url " + turl + " (" + e @@ -295,7 +295,7 @@ protected int process(String url, StringBuilder output) throws Exception { output.append(turl).append("\n"); output.append(parse.getData()).append("\n"); - if (dumpText) { + if (this.dumpText) { output.append(parse.getText()); } } diff --git a/src/java/org/apache/nutch/plugin/Extension.java b/src/java/org/apache/nutch/plugin/Extension.java index ab65bb82fe..246e8ff7bb 100644 --- a/src/java/org/apache/nutch/plugin/Extension.java +++ b/src/java/org/apache/nutch/plugin/Extension.java @@ -140,13 +140,15 @@ public String getTargetPoint() { } /** - * Return an instance of the extension implementatio. Before we create a + * Return an instance of the extension implementation. Before we create a * extension instance we startup the plugin if it is not already done. The * plugin instance and the extension instance use the same - * PluginClassLoader. Each Plugin use its own classloader. The - * PluginClassLoader knows only own Plugin runtime libraries setuped - * in the plugin manifest file and exported libraries of the depenedend - * plugins. + * {@link org.apache.nutch.plugin.PluginClassLoader}. + * Each Plugin use its own classloader. The + * {@link org.apache.nutch.plugin.PluginClassLoader} knows only its own + * plugin runtime libraries defined + * in the plugin.xml manifest file and exported libraries + * of the dependent plugins. * * @return Object An instance of the extension implementation * @throws PluginRuntimeException if there is a fatal runtime error diff --git a/src/java/org/apache/nutch/plugin/ExtensionPoint.java b/src/java/org/apache/nutch/plugin/ExtensionPoint.java index 58422046b2..92ddfd8155 100644 --- a/src/java/org/apache/nutch/plugin/ExtensionPoint.java +++ b/src/java/org/apache/nutch/plugin/ExtensionPoint.java @@ -44,7 +44,7 @@ public ExtensionPoint(String pId, String pName, String pSchema) { setId(pId); setName(pName); setSchema(pSchema); - fExtensions = new ArrayList<>(); + this.fExtensions = new ArrayList<>(); } /** @@ -53,7 +53,7 @@ public ExtensionPoint(String pId, String pName, String pSchema) { * @return String */ public String getId() { - return ftId; + return this.ftId; } /** @@ -62,7 +62,7 @@ public String getId() { * @return String */ public String getName() { - return fName; + return this.fName; } /** @@ -71,7 +71,7 @@ public String getName() { * @return String */ public String getSchema() { - return fSchema; + return this.fSchema; } /** @@ -81,7 +81,7 @@ public String getSchema() { * extension point id */ private void setId(String pId) { - ftId = pId; + this.ftId = pId; } /** @@ -90,7 +90,7 @@ private void setId(String pId) { * @param pName */ private void setName(String pName) { - fName = pName; + this.fName = pName; } /** @@ -99,7 +99,7 @@ private void setName(String pName) { * @param pSchema */ private void setSchema(String pSchema) { - fSchema = pSchema; + this.fSchema = pSchema; } /** @@ -109,7 +109,7 @@ private void setSchema(String pSchema) { * to install */ public void addExtension(Extension extension) { - fExtensions.add(extension); + this.fExtensions.add(extension); } /** @@ -118,7 +118,7 @@ public void addExtension(Extension extension) { * @return Extension[] */ public Extension[] getExtensions() { - return fExtensions.toArray(new Extension[fExtensions.size()]); + return this.fExtensions.toArray(new Extension[this.fExtensions.size()]); } } diff --git a/src/java/org/apache/nutch/plugin/PluginManifestParser.java b/src/java/org/apache/nutch/plugin/PluginManifestParser.java index 4c845b4308..ccae5827d4 100644 --- a/src/java/org/apache/nutch/plugin/PluginManifestParser.java +++ b/src/java/org/apache/nutch/plugin/PluginManifestParser.java @@ -19,6 +19,7 @@ import java.io.File; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.net.URL; import java.net.URLDecoder; @@ -50,7 +51,7 @@ public class PluginManifestParser { private static final String ATTR_CLASS = "class"; private static final String ATTR_ID = "id"; - protected static final Logger LOG = LoggerFactory.getLogger(PluginManifestParser.class); + protected static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private static final boolean WINDOWS = System.getProperty("os.name").startsWith("Windows"); diff --git a/src/java/org/apache/nutch/plugin/PluginRepository.java b/src/java/org/apache/nutch/plugin/PluginRepository.java index 726da4566b..99f0f1a5e6 100644 --- a/src/java/org/apache/nutch/plugin/PluginRepository.java +++ b/src/java/org/apache/nutch/plugin/PluginRepository.java @@ -64,6 +64,7 @@ public class PluginRepository implements URLStreamHandlerFactory { private HashMap fActivatedPlugins; + @SuppressWarnings("rawtypes") private static final Map> CLASS_CACHE = new HashMap<>(); private Configuration conf; @@ -75,8 +76,8 @@ public class PluginRepository implements URLStreamHandlerFactory { * @throws RuntimeException if a fatal runtime error is encountered */ public PluginRepository(Configuration conf) throws RuntimeException { - fActivatedPlugins = new HashMap<>(); - fExtensionPoints = new HashMap<>(); + this.fActivatedPlugins = new HashMap<>(); + this.fExtensionPoints = new HashMap<>(); this.conf = new Configuration(conf); this.auto = conf.getBoolean("plugin.auto-activation", true); String[] pluginFolders = conf.getStrings("plugin.folders"); @@ -92,11 +93,11 @@ public PluginRepository(Configuration conf) throws RuntimeException { Pattern includes = Pattern.compile(conf.get("plugin.includes", "")); Map filteredPlugins = filter(excludes, includes, allPlugins); - fRegisteredPlugins = getDependencyCheckedPlugins(filteredPlugins, + this.fRegisteredPlugins = getDependencyCheckedPlugins(filteredPlugins, this.auto ? allPlugins : filteredPlugins); - installExtensionPoints(fRegisteredPlugins); + installExtensionPoints(this.fRegisteredPlugins); try { - installExtensions(fRegisteredPlugins); + installExtensions(this.fRegisteredPlugins); } catch (PluginRuntimeException e) { LOG.error("Could not install extensions.", e.toString()); throw new RuntimeException(e.getMessage()); @@ -134,7 +135,7 @@ private void installExtensionPoints(List plugins) { for (ExtensionPoint point : plugin.getExtenstionPoints()) { String xpId = point.getId(); LOG.debug("Adding extension point {}", xpId); - fExtensionPoints.put(xpId, point); + this.fExtensionPoints.put(xpId, point); } } } @@ -236,8 +237,8 @@ private List getDependencyCheckedPlugins( * @return PluginDescriptor[] */ public PluginDescriptor[] getPluginDescriptors() { - return fRegisteredPlugins - .toArray(new PluginDescriptor[fRegisteredPlugins.size()]); + return this.fRegisteredPlugins + .toArray(new PluginDescriptor[this.fRegisteredPlugins.size()]); } /** @@ -248,7 +249,7 @@ public PluginDescriptor[] getPluginDescriptors() { */ public PluginDescriptor getPluginDescriptor(String pPluginId) { - for (PluginDescriptor descriptor : fRegisteredPlugins) { + for (PluginDescriptor descriptor : this.fRegisteredPlugins) { if (descriptor.getPluginId().equals(pPluginId)) return descriptor; } @@ -282,8 +283,8 @@ public ExtensionPoint getExtensionPoint(String pXpId) { */ public Plugin getPluginInstance(PluginDescriptor pDescriptor) throws PluginRuntimeException { - if (fActivatedPlugins.containsKey(pDescriptor.getPluginId())) - return fActivatedPlugins.get(pDescriptor.getPluginId()); + if (this.fActivatedPlugins.containsKey(pDescriptor.getPluginId())) + return this.fActivatedPlugins.get(pDescriptor.getPluginId()); try { // Must synchronize here to make sure creation and initialization // of a plugin instance are done by one and only one thread. @@ -297,7 +298,7 @@ public Plugin getPluginInstance(PluginDescriptor pDescriptor) Plugin plugin = (Plugin) constructor .newInstance(new Object[] { pDescriptor, this.conf }); plugin.startUp(); - fActivatedPlugins.put(pDescriptor.getPluginId(), plugin); + this.fActivatedPlugins.put(pDescriptor.getPluginId(), plugin); return plugin; } } catch (ClassNotFoundException e) { @@ -318,6 +319,7 @@ public Plugin getPluginInstance(PluginDescriptor pDescriptor) * @deprecated * @see JEP 421: Deprecate Finalization for Removal * @see java.lang.Object#finalize() + * @deprecated */ @Deprecated public void finalize() throws Throwable { @@ -330,12 +332,13 @@ public void finalize() throws Throwable { * @throws PluginRuntimeException */ private void shutDownActivatedPlugins() throws PluginRuntimeException { - for (Plugin plugin : fActivatedPlugins.values()) { + for (Plugin plugin : this.fActivatedPlugins.values()) { plugin.shutDown(); } } - public Class getCachedClass(PluginDescriptor pDescriptor, String className) + @SuppressWarnings("rawtypes") + public static Class getCachedClass(PluginDescriptor pDescriptor, String className) throws ClassNotFoundException { Map descMap = CLASS_CACHE.get(className); if (descMap == null) { @@ -355,19 +358,19 @@ private void displayStatus() { LOG.info("Plugin Auto-activation mode: [{}]", this.auto); LOG.info("Registered Plugins:"); - if ((fRegisteredPlugins == null) || (fRegisteredPlugins.size() == 0)) { + if ((this.fRegisteredPlugins == null) || (this.fRegisteredPlugins.size() == 0)) { LOG.info("\tNONE"); } else { - for (PluginDescriptor plugin : fRegisteredPlugins) { + for (PluginDescriptor plugin : this.fRegisteredPlugins) { LOG.info("\t{} ({})", plugin.getName(), plugin.getPluginId()); } } LOG.info("Registered Extension-Points:"); - if ((fExtensionPoints == null) || (fExtensionPoints.size() == 0)) { + if ((this.fExtensionPoints == null) || (this.fExtensionPoints.size() == 0)) { LOG.info("\tNONE"); } else { - for (ExtensionPoint ep : fExtensionPoints.values()) { + for (ExtensionPoint ep : this.fExtensionPoints.values()) { LOG.info("\t ({})", ep.getName(), ep.getId()); } } @@ -384,7 +387,7 @@ private void displayStatus() { * Map of plugins * @return map of plugins matching the configuration */ - private Map filter(Pattern excludes, + private static Map filter(Pattern excludes, Pattern includes, Map plugins) { Map map = new HashMap<>(); @@ -434,11 +437,11 @@ private Map filter(Pattern excludes, public synchronized Object[] getOrderedPlugins(Class clazz, String xPointId, String orderProperty) { Object[] filters; - ObjectCache objectCache = ObjectCache.get(conf); + ObjectCache objectCache = ObjectCache.get(this.conf); filters = (Object[]) objectCache.getObject(clazz.getName()); if (filters == null) { - String order = conf.get(orderProperty); + String order = this.conf.get(orderProperty); List orderOfFilters = new ArrayList<>(); boolean userDefinedOrder = false; if (order != null && !order.trim().isEmpty()) { @@ -447,7 +450,7 @@ public synchronized Object[] getOrderedPlugins(Class clazz, } try { - ExtensionPoint point = PluginRepository.get(conf) + ExtensionPoint point = PluginRepository.get(this.conf) .getExtensionPoint(xPointId); if (point == null) throw new RuntimeException(xPointId + " not found."); @@ -579,8 +582,8 @@ private void registerURLStreamHandlerFactory() { public URLStreamHandler createURLStreamHandler(String protocol) { LOG.debug("Creating URLStreamHandler for protocol: {}", protocol); - if (fExtensionPoints != null) { - ExtensionPoint ep = fExtensionPoints + if (this.fExtensionPoints != null) { + ExtensionPoint ep = this.fExtensionPoints .get("org.apache.nutch.protocol.Protocol"); if (ep != null) { Extension[] extensions = ep.getExtensions(); @@ -622,11 +625,11 @@ public URLStreamHandler createURLStreamHandler(String protocol) { } } - LOG.debug("suitable protocol extension found that did not declare a handler"); + LOG.debug("Suitable protocol extension found that did not declare a handler"); return null; } } - LOG.debug("No suitable protocol extensions registered"); + LOG.debug("No suitable protocol extensions registered for protocol: {}", protocol); } else { LOG.debug("No protocol extensions registered?"); } diff --git a/src/java/org/apache/nutch/plugin/URLStreamHandlerFactory.java b/src/java/org/apache/nutch/plugin/URLStreamHandlerFactory.java index a64454c5f2..5aed76a351 100644 --- a/src/java/org/apache/nutch/plugin/URLStreamHandlerFactory.java +++ b/src/java/org/apache/nutch/plugin/URLStreamHandlerFactory.java @@ -59,7 +59,7 @@ public class URLStreamHandlerFactory } private URLStreamHandlerFactory() { - prs = new ArrayList<>(); + this.prs = new ArrayList<>(); } /** @@ -75,7 +75,7 @@ public static URLStreamHandlerFactory getInstance() { * @param pr The PluginRepository to be registered. */ public void registerPluginRepository(PluginRepository pr) { - prs.add(new WeakReference(pr)); + this.prs.add(new WeakReference(pr)); removeInvalidRefs(); } @@ -88,7 +88,7 @@ public URLStreamHandler createURLStreamHandler(String protocol) { // find the 'correct' PluginRepository. For now we simply take the first. // then ask it to return the URLStreamHandler - for(WeakReference ref: prs) { + for(WeakReference ref: this.prs) { PluginRepository pr = ref.get(); if(pr != null) { // found PluginRepository. Let's get the URLStreamHandler... @@ -103,13 +103,12 @@ public URLStreamHandler createURLStreamHandler(String protocol) { * garbage collected meanwhile. */ private void removeInvalidRefs() { - LOG.debug("removeInvalidRefs()"); - ArrayList> copy = new ArrayList<>(prs); + ArrayList> copy = new ArrayList<>(this.prs); for(WeakReference ref: copy) { if(ref.get() == null) { - prs.remove(ref); + this.prs.remove(ref); } } - LOG.debug("Removed the following invalid references: '{}' Remaining: '{}'", copy.size()-prs.size(), prs.size()); + LOG.debug("Removed '{}' invalid references. '{}' remaining.", copy.size()-this.prs.size(), this.prs.size()); } } diff --git a/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java b/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java index ce999b374b..1438754cea 100644 --- a/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java +++ b/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java @@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory; import org.apache.nutch.crawl.CrawlDatum; +import org.apache.nutch.metadata.HttpHeaders; import org.apache.nutch.metadata.Nutch; import org.apache.nutch.net.protocols.ProtocolLogUtil; import org.apache.nutch.net.protocols.Response; @@ -200,7 +201,7 @@ public HttpBase(Logger logger) { if (logger != null) { this.logger = logger; } - robots = new HttpRobotRulesParser(); + this.robots = new HttpRobotRulesParser(); } @Override @@ -211,7 +212,7 @@ public void setConf(Configuration conf) { this.proxyType = Proxy.Type.valueOf(conf.get("http.proxy.type", "HTTP")); this.proxyException = arrayToMap( conf.getStrings("http.proxy.exception.list")); - this.useProxy = (proxyHost != null && proxyHost.length() > 0); + this.useProxy = (this.proxyHost != null && this.proxyHost.length() > 0); this.timeout = conf.getInt("http.timeout", 10000); this.maxContent = conf.getInt("http.content.limit", 1024 * 1024); this.maxDuration = conf.getInt("http.time.limit", -1); @@ -219,10 +220,10 @@ public void setConf(Configuration conf) { this.userAgent = getAgentString(conf.get("http.agent.name"), conf.get("http.agent.version"), conf.get("http.agent.description"), conf.get("http.agent.url"), conf.get("http.agent.email")); - this.acceptLanguage = conf.get("http.accept.language", acceptLanguage) + this.acceptLanguage = conf.get("http.accept.language", this.acceptLanguage) .trim(); - this.acceptCharset = conf.get("http.accept.charset", acceptCharset).trim(); - this.accept = conf.get("http.accept", accept).trim(); + this.acceptCharset = conf.get("http.accept.charset", this.acceptCharset).trim(); + this.accept = conf.get("http.accept", this.accept).trim(); this.mimeTypes = new MimeUtil(conf); // backward-compatible default setting this.useHttp11 = conf.getBoolean("http.useHttp11", true); @@ -244,27 +245,28 @@ public void setConf(Configuration conf) { // NUTCH-1941: read list of alternating agent names if (conf.getBoolean("http.agent.rotate", false)) { String agentsFile = conf.get("http.agent.rotate.file", "agents.txt"); + @SuppressWarnings("resource") BufferedReader br = null; try { Reader reader = conf.getConfResourceAsReader(agentsFile); br = new BufferedReader(reader); - userAgentNames = new ArrayList(); + this.userAgentNames = new ArrayList(); String word = ""; while ((word = br.readLine()) != null) { if (!word.trim().isEmpty()) - userAgentNames.add(word.trim()); + this.userAgentNames.add(word.trim()); } - if (userAgentNames.size() == 0) { - logger.warn("Empty list of user agents in http.agent.rotate.file {}", + if (this.userAgentNames.size() == 0) { + this.logger.warn("Empty list of user agents in http.agent.rotate.file {}", agentsFile); - userAgentNames = null; + this.userAgentNames = null; } } catch (Exception e) { - logger.warn("Failed to read http.agent.rotate.file {}: {}", agentsFile, + this.logger.warn("Failed to read http.agent.rotate.file {}: {}", agentsFile, StringUtils.stringifyException(e)); - userAgentNames = null; + this.userAgentNames = null; } finally { if (br != null) { try { @@ -274,28 +276,29 @@ public void setConf(Configuration conf) { } } } - if (userAgentNames == null) { - logger.warn( + if (this.userAgentNames == null) { + this.logger.warn( "Falling back to fixed user agent set via property http.agent.name"); } } // If cookies are enabled, try to load a per-host cookie file - if (enableCookieHeader) { + if (this.enableCookieHeader) { String cookieFile = conf.get("http.agent.host.cookie.file", "cookies.txt"); + @SuppressWarnings("resource") BufferedReader br = null; try { Reader reader = conf.getConfResourceAsReader(cookieFile); br = new BufferedReader(reader); - hostCookies = new HashMap(); + this.hostCookies = new HashMap(); String word = ""; while ((word = br.readLine()) != null) { if (!word.trim().isEmpty()) { if (word.indexOf("#") == -1) { // skip comment String[] parts = word.split("\t"); if (parts.length == 2) { - hostCookies.put(parts[0], parts[1]); + this.hostCookies.put(parts[0], parts[1]); } else { LOG.warn("Unable to parse cookie file correctly at: " + word); } @@ -303,9 +306,9 @@ public void setConf(Configuration conf) { } } } catch (Exception e) { - logger.warn("Failed to read http.agent.host.cookie.file {}: {}", + this.logger.warn("Failed to read http.agent.host.cookie.file {}: {}", cookieFile, StringUtils.stringifyException(e)); - hostCookies = null; + this.hostCookies = null; } finally { if (br != null) { try { @@ -368,8 +371,8 @@ public void setConf(Configuration conf) { "TLS_CHACHA20_POLY1305_SHA256", "TLS_AES_128_GCM_SHA256", "TLS_AES_128_CCM_8_SHA256", "TLS_AES_128_CCM_SHA256"); - tlsPreferredProtocols = new HashSet(Arrays.asList(protocols)); - tlsPreferredCipherSuites = new HashSet(Arrays.asList(ciphers)); + this.tlsPreferredProtocols = new HashSet(Arrays.asList(protocols)); + this.tlsPreferredCipherSuites = new HashSet(Arrays.asList(ciphers)); logConf(); } @@ -401,7 +404,7 @@ public ProtocolOutput getProtocolOutput(Text url, CrawlDatum datum) { byte[] content = response.getContent(); Content c = new Content(u.toString(), u.toString(), (content == null ? EMPTY_CONTENT : content), - response.getHeader("Content-Type"), response.getHeaders(), mimeTypes); + response.getHeader("Content-Type"), response.getHeaders(), this.mimeTypes); if (code == 200) { // got a good response return new ProtocolOutput(c); // return it @@ -437,15 +440,15 @@ public ProtocolOutput getProtocolOutput(Text url, CrawlDatum datum) { // handle this in the higher layer. return new ProtocolOutput(c, new ProtocolStatus(protocolStatusCode, u)); } else if (code == 400) { // bad request, mark as GONE - if (logger.isTraceEnabled()) { - logger.trace("400 Bad request: " + u); + if (this.logger.isTraceEnabled()) { + this.logger.trace("400 Bad request: " + u); } return new ProtocolOutput(c, new ProtocolStatus(ProtocolStatus.GONE, u)); } else if (code == 401) { // requires authorization, but no valid auth // provided. - if (logger.isTraceEnabled()) { - logger.trace("401 Authentication Required"); + if (this.logger.isTraceEnabled()) { + this.logger.trace("401 Authentication Required"); } return new ProtocolOutput(c, new ProtocolStatus(ProtocolStatus.ACCESS_DENIED, @@ -461,10 +464,10 @@ public ProtocolOutput getProtocolOutput(Text url, CrawlDatum datum) { ProtocolStatus.EXCEPTION, "Http code=" + code + ", url=" + u)); } } catch (Throwable e) { - if (logger.isDebugEnabled() || !logUtil.logShort(e)) { - logger.error("Failed to get protocol output", e); + if (this.logger.isDebugEnabled() || !this.logUtil.logShort(e)) { + this.logger.error("Failed to get protocol output", e); } else { - logger.error("Failed to get protocol output: {}", + this.logger.error("Failed to get protocol output: {}", e.getClass().getName()); } return new ProtocolOutput(null, new ProtocolStatus(e)); @@ -477,11 +480,11 @@ public ProtocolOutput getProtocolOutput(Text url, CrawlDatum datum) { */ public String getProxyHost() { - return proxyHost; + return this.proxyHost; } public int getProxyPort() { - return proxyPort; + return this.proxyPort; } public boolean useProxy(URL url) { @@ -493,38 +496,38 @@ public boolean useProxy(URI uri) { } public boolean useProxy(String host) { - if (useProxy && proxyException.containsKey(host)) { + if (this.useProxy && this.proxyException.containsKey(host)) { return false; } - return useProxy; + return this.useProxy; } public int getTimeout() { - return timeout; + return this.timeout; } public boolean isIfModifiedSinceEnabled() { - return enableIfModifiedsinceHeader; + return this.enableIfModifiedsinceHeader; } public boolean isCookieEnabled() { - return enableCookieHeader; + return this.enableCookieHeader; } public boolean isStoreIPAddress() { - return storeIPAddress; + return this.storeIPAddress; } public boolean isStoreHttpRequest() { - return storeHttpRequest; + return this.storeHttpRequest; } public boolean isStoreHttpHeaders() { - return storeHttpHeaders; + return this.storeHttpHeaders; } public int getMaxContent() { - return maxContent; + return this.maxContent; } /** @@ -533,7 +536,7 @@ public int getMaxContent() { * @return the maximum duration */ public int getMaxDuration() { - return maxDuration; + return this.maxDuration; } /** @@ -542,15 +545,15 @@ public int getMaxDuration() { * @return true if partially fetched truncated content is stored */ public boolean isStorePartialAsTruncated() { - return partialAsTruncated; + return this.partialAsTruncated; } public String getUserAgent() { - if (userAgentNames != null) { - return userAgentNames - .get(ThreadLocalRandom.current().nextInt(userAgentNames.size())); + if (this.userAgentNames != null) { + return this.userAgentNames + .get(ThreadLocalRandom.current().nextInt(this.userAgentNames.size())); } - return userAgent; + return this.userAgent; } /** @@ -562,8 +565,8 @@ public String getUserAgent() { * @return the cookie or null */ public String getCookie(URL url) { - if (hostCookies != null) { - return hostCookies.get(url.getHost()); + if (this.hostCookies != null) { + return this.hostCookies.get(url.getHost()); } return null; @@ -575,38 +578,37 @@ public String getCookie(URL url) { * @return The value of the header "Accept-Language" header. */ public String getAcceptLanguage() { - return acceptLanguage; + return this.acceptLanguage; } public String getAcceptCharset() { - return acceptCharset; + return this.acceptCharset; } public String getAccept() { - return accept; + return this.accept; } public boolean getUseHttp11() { - return useHttp11; + return this.useHttp11; } public boolean isTlsCheckCertificates() { - return tlsCheckCertificate; + return this.tlsCheckCertificate; } public Set getTlsPreferredCipherSuites() { - return tlsPreferredCipherSuites; + return this.tlsPreferredCipherSuites; } public Set getTlsPreferredProtocols() { - return tlsPreferredProtocols; + return this.tlsPreferredProtocols; } private static String getAgentString(String agentName, String agentVersion, String agentDesc, String agentURL, String agentEmail) { if ((agentName == null) || (agentName.trim().length() == 0)) { - // TODO : NUTCH-258 if (LOG.isErrorEnabled()) { LOG.error("No User-Agent string set (http.agent.name)!"); } @@ -645,16 +647,16 @@ private static String getAgentString(String agentName, String agentVersion, } protected void logConf() { - if (logger.isInfoEnabled()) { - logger.info("http.proxy.host = " + proxyHost); - logger.info("http.proxy.port = " + proxyPort); - logger.info("http.proxy.exception.list = " + useProxy); - logger.info("http.timeout = " + timeout); - logger.info("http.content.limit = " + maxContent); - logger.info("http.agent = " + userAgent); - logger.info("http.accept.language = " + acceptLanguage); - logger.info("http.accept = " + accept); - logger.info("http.enable.cookie.header = " + isCookieEnabled()); + if (this.logger.isInfoEnabled()) { + this.logger.info("http.proxy.host = " + this.proxyHost); + this.logger.info("http.proxy.port = " + this.proxyPort); + this.logger.info("http.proxy.exception.list = " + this.useProxy); + this.logger.info("http.timeout = " + this.timeout); + this.logger.info("http.content.limit = " + this.maxContent); + this.logger.info("http.agent = " + this.userAgent); + this.logger.info("http.accept.language = " + this.acceptLanguage); + this.logger.info("http.accept = " + this.accept); + this.logger.info("http.enable.cookie.header = " + isCookieEnabled()); } } @@ -748,7 +750,7 @@ protected static void main(HttpBase http, String[] args) throws Exception { if (content != null) { System.out.println("Content Type: " + content.getContentType()); System.out.println("Content Length: " - + content.getMetadata().get(Response.CONTENT_LENGTH)); + + content.getMetadata().get(HttpHeaders.CONTENT_LENGTH)); System.out.println("Content:"); String text = new String(content.getContent()); System.out.println(text); @@ -761,7 +763,7 @@ protected abstract Response getResponse(URL url, CrawlDatum datum, @Override public BaseRobotRules getRobotRules(Text url, CrawlDatum datum, List robotsTxtContent) { - return robots.getRobotRulesSet(this, url, robotsTxtContent); + return this.robots.getRobotRulesSet(this, url, robotsTxtContent); } /** @@ -771,7 +773,7 @@ public BaseRobotRules getRobotRules(Text url, CrawlDatum datum, * String[] * @return a new HashMap */ - private HashMap arrayToMap(String[] input) { + private static HashMap arrayToMap(String[] input) { if (input == null || input.length == 0) { return new HashMap(); } diff --git a/src/plugin/protocol-foo/plugin.xml b/src/plugin/protocol-foo/plugin.xml index 850afe33f1..d34f6242a9 100755 --- a/src/plugin/protocol-foo/plugin.xml +++ b/src/plugin/protocol-foo/plugin.xml @@ -40,7 +40,7 @@ - + diff --git a/src/plugin/protocol-okhttp/ivy.xml b/src/plugin/protocol-okhttp/ivy.xml index 36befcf455..ead8232474 100644 --- a/src/plugin/protocol-okhttp/ivy.xml +++ b/src/plugin/protocol-okhttp/ivy.xml @@ -36,8 +36,8 @@ - - + + diff --git a/src/plugin/protocol-okhttp/plugin.xml b/src/plugin/protocol-okhttp/plugin.xml index 5138a155e0..e2183d2b50 100755 --- a/src/plugin/protocol-okhttp/plugin.xml +++ b/src/plugin/protocol-okhttp/plugin.xml @@ -26,15 +26,15 @@ - - - + + - - + + + @@ -54,7 +54,7 @@ - + diff --git a/src/plugin/protocol-okhttp/src/java/org/apache/nutch/protocol/okhttp/OkHttp.java b/src/plugin/protocol-okhttp/src/java/org/apache/nutch/protocol/okhttp/OkHttp.java index 65cb2d394c..d5ab77ec52 100644 --- a/src/plugin/protocol-okhttp/src/java/org/apache/nutch/protocol/okhttp/OkHttp.java +++ b/src/plugin/protocol-okhttp/src/java/org/apache/nutch/protocol/okhttp/OkHttp.java @@ -112,7 +112,7 @@ public void setConf(Configuration conf) { // protocols in order of preference List protocols = new ArrayList<>(); - if (useHttp2) { + if (this.useHttp2) { protocols.add(okhttp3.Protocol.HTTP_2); } protocols.add(okhttp3.Protocol.HTTP_1_1); @@ -121,11 +121,11 @@ public void setConf(Configuration conf) { .protocols(protocols) // .retryOnConnectionFailure(true) // .followRedirects(false) // - .connectTimeout(timeout, TimeUnit.MILLISECONDS) - .writeTimeout(timeout, TimeUnit.MILLISECONDS) - .readTimeout(timeout, TimeUnit.MILLISECONDS); + .connectTimeout(this.timeout, TimeUnit.MILLISECONDS) + .writeTimeout(this.timeout, TimeUnit.MILLISECONDS) + .readTimeout(this.timeout, TimeUnit.MILLISECONDS); - if (!tlsCheckCertificate) { + if (!this.tlsCheckCertificate) { builder.sslSocketFactory(trustAllSslSocketFactory, (X509TrustManager) trustAllCerts[0]); builder.hostnameVerifier(new HostnameVerifier() { @@ -136,23 +136,23 @@ public boolean verify(String hostname, SSLSession session) { }); } - if (!accept.isEmpty()) { - getCustomRequestHeaders().add(new String[] { "Accept", accept }); + if (!this.accept.isEmpty()) { + getCustomRequestHeaders().add(new String[] { "Accept", this.accept }); } - if (!acceptLanguage.isEmpty()) { + if (!this.acceptLanguage.isEmpty()) { getCustomRequestHeaders() - .add(new String[] { "Accept-Language", acceptLanguage }); + .add(new String[] { "Accept-Language", this.acceptLanguage }); } - if (!acceptCharset.isEmpty()) { + if (!this.acceptCharset.isEmpty()) { getCustomRequestHeaders() - .add(new String[] { "Accept-Charset", acceptCharset }); + .add(new String[] { "Accept-Charset", this.acceptCharset }); } - if (useProxy) { - Proxy proxy = new Proxy(proxyType, - new InetSocketAddress(proxyHost, proxyPort)); + if (this.useProxy) { + Proxy proxy = new Proxy(this.proxyType, + new InetSocketAddress(this.proxyHost, this.proxyPort)); String proxyUsername = conf.get("http.proxy.username"); if (proxyUsername == null) { ProxySelector selector = new ProxySelector() { @@ -172,9 +172,9 @@ public boolean verify(String hostname, SSLSession session) { @Override public List select(URI uri) { if (useProxy(uri)) { - return proxyList; + return this.proxyList; } - return noProxyList; + return this.noProxyList; } @Override @@ -192,7 +192,7 @@ public void connectFailed(URI uri, SocketAddress sa, * ProxySelector class with proxy auth. If a proxy username is present, * the configured proxy will be used for ALL requests. */ - if (proxyException.size() > 0) { + if (this.proxyException.size() > 0) { LOG.warn( "protocol-okhttp does not respect 'http.proxy.exception.list' setting when " + "'http.proxy.username' is set. This is a limitation of the current okhttp3 " @@ -214,14 +214,14 @@ public Request authenticate(okhttp3.Route route, } } - if (storeIPAddress || storeHttpHeaders || storeHttpRequest) { + if (this.storeIPAddress || this.storeHttpHeaders || this.storeHttpRequest) { builder.addNetworkInterceptor(new HTTPHeadersInterceptor()); } // enable support for Brotli compression (Content-Encoding) builder.addInterceptor(BrotliInterceptor.INSTANCE); - client = builder.build(); + this.client = builder.build(); } class HTTPHeadersInterceptor implements Interceptor { @@ -241,7 +241,7 @@ public okhttp3.Response intercept(Interceptor.Chain chain) Connection connection = chain.connection(); String ipAddress = null; - if (storeIPAddress) { + if (OkHttp.this.storeIPAddress) { InetAddress address = connection.socket().getInetAddress(); ipAddress = address.getHostAddress(); } @@ -252,7 +252,7 @@ public okhttp3.Response intercept(Interceptor.Chain chain) StringBuilder requestverbatim = null; StringBuilder responseverbatim = null; - if (storeHttpRequest) { + if (OkHttp.this.storeHttpRequest) { requestverbatim = new StringBuilder(); requestverbatim.append(request.method()).append(' '); @@ -277,7 +277,7 @@ public okhttp3.Response intercept(Interceptor.Chain chain) requestverbatim.append("\r\n"); } - if (storeHttpHeaders) { + if (OkHttp.this.storeHttpHeaders) { responseverbatim = new StringBuilder(); responseverbatim.append(getNormalizedProtocolName(response.protocol())) @@ -322,11 +322,11 @@ public okhttp3.Response intercept(Interceptor.Chain chain) } protected List getCustomRequestHeaders() { - return customRequestHeaders; + return this.customRequestHeaders; } protected OkHttpClient getClient() { - return client; + return this.client; } @Override diff --git a/src/plugin/protocol-okhttp/src/java/org/apache/nutch/protocol/okhttp/OkHttpResponse.java b/src/plugin/protocol-okhttp/src/java/org/apache/nutch/protocol/okhttp/OkHttpResponse.java index 54675e3b20..6dcbe16ede 100644 --- a/src/plugin/protocol-okhttp/src/java/org/apache/nutch/protocol/okhttp/OkHttpResponse.java +++ b/src/plugin/protocol-okhttp/src/java/org/apache/nutch/protocol/okhttp/OkHttpResponse.java @@ -55,15 +55,15 @@ public TruncatedContent() { } public void setReason(TruncatedContentReason val) { - value = val; + this.value = val; } public TruncatedContentReason getReason() { - return value; + return this.value; } public boolean booleanValue() { - return value != TruncatedContentReason.NOT_TRUNCATED; + return this.value != TruncatedContentReason.NOT_TRUNCATED; } } @@ -123,7 +123,7 @@ public OkHttpResponse(OkHttp okhttp, URL url, CrawlDatum datum) response.message()); TruncatedContent truncated = new TruncatedContent(); - content = toByteArray(response.body(), truncated, okhttp.getMaxContent(), + this.content = toByteArray(response.body(), truncated, okhttp.getMaxContent(), okhttp.getMaxDuration(), okhttp.isStorePartialAsTruncated()); responsemetadata.add(FETCH_TIME, Long.toString(System.currentTimeMillis())); @@ -135,11 +135,11 @@ public OkHttpResponse(OkHttp okhttp, URL url, CrawlDatum datum) responsemetadata.set(TRUNCATED_CONTENT_REASON, truncated.getReason().toString().toLowerCase(Locale.ROOT)); LOG.debug("HTTP content truncated to {} bytes (reason: {})", - content.length, truncated.getReason()); + this.content.length, truncated.getReason()); } - code = response.code(); - headers = responsemetadata; + this.code = response.code(); + this.headers = responsemetadata; } } @@ -179,7 +179,7 @@ private final byte[] toByteArray(final ResponseBody responseBody, if (partialAsTruncated && source.getBuffer().size() > 0) { // treat already fetched content as truncated truncated.setReason(TruncatedContentReason.DISCONNECT); - LOG.info("Truncated content for {}, partial fetch caused by:", url, + LOG.info("Truncated content for {}, partial fetch caused by:", this.url, e); } else { throw e; @@ -222,23 +222,23 @@ private final byte[] toByteArray(final ResponseBody responseBody, } public URL getUrl() { - return url; + return this.url; } public int getCode() { - return code; + return this.code; } public String getHeader(String name) { - return headers.get(name); + return this.headers.get(name); } public Metadata getHeaders() { - return headers; + return this.headers; } public byte[] getContent() { - return content; + return this.content; } } From ab3a6dc48e56ccc3b7b3014baad2a3c32c0c38c9 Mon Sep 17 00:00:00 2001 From: AzureTriple <77744272+AzureTriple@users.noreply.github.com> Date: Sun, 20 Feb 2022 16:19:35 -0800 Subject: [PATCH 02/55] NUTCH-2940 Develop Gradle Core Build for Apache Nutch --- .gitattributes | 6 + .gitignore | 6 + build.gradle.kts | 57 +++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 185 +++++++++++++++++++++++ gradlew.bat | 89 +++++++++++ settings.gradle.kts | 11 ++ 8 files changed, 359 insertions(+) create mode 100644 .gitattributes create mode 100644 build.gradle.kts create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..00a51aff5e --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# These are explicitly windows files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore index 0612a99c23..cf55635307 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,9 @@ naivebayes-model csvindexwriter lib/spotbugs-* ivy/dependency-check-ant/* + +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000000..907a96469c --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,57 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Java application project to get you started. + * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle + * User Manual available at https://docs.gradle.org/7.0.2/userguide/building_java_projects.html + */ + +plugins { + // Apply the application plugin to add support for building a CLI application in Java. + `maven-publish` + application +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +dependencies { + // Use JUnit test framework. + testImplementation("junit:junit:4.13.1") + + // This dependency is used by the application. + implementation("com.google.guava:guava:30.0-jre") +} + +application { + // Define the main class for the application. + //mainClass.set("nutch.App") +} + +publishing { + publications { + create("maven") { + groupId = "org.apache.nutch" + artifactId = "nutch" + version = "1.18" + + from(components["java"]) + } + } + repositories { + maven { + url = uri("https://repository.apache.org/service/local/staging/deploy/maven2") + } + + } +} + +ant.importBuild("build.xml") {old ->"ant-${old}"} + + +tasks.register("clean-default-lib") +{ + delete("build/lib") +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 zcma&O1CT9Y(k9%tZQHhO+qUh#ZQHhO+qmuS+qP|E@9xZO?0h@l{(r>DQ>P;GjjD{w zH}lENr;dU&FbEU?00aa80D$0M0RRB{U*7-#kbjS|qAG&4l5%47zyJ#WrfA#1$1Ctx zf&Z_d{GW=lf^w2#qRJ|CvSJUi(^E3iv~=^Z(zH}F)3Z%V3`@+rNB7gTVU{Bb~90p|f+0(v;nz01EG7yDMX9@S~__vVgv%rS$+?IH+oZ03D5zYrv|^ zC1J)SruYHmCki$jLBlTaE5&dFG9-kq3!^i>^UQL`%gn6)jz54$WDmeYdsBE9;PqZ_ zoGd=P4+|(-u4U1dbAVQrFWoNgNd;0nrghPFbQrJctO>nwDdI`Q^i0XJDUYm|T|RWc zZ3^Qgo_Qk$%Fvjj-G}1NB#ZJqIkh;kX%V{THPqOyiq)d)0+(r9o(qKlSp*hmK#iIY zA^)Vr$-Hz<#SF=0@tL@;dCQsm`V9s1vYNq}K1B)!XSK?=I1)tX+bUV52$YQu*0%fnWEukW>mxkz+%3-S!oguE8u#MGzST8_Dy^#U?fA@S#K$S@9msUiX!gd_ow>08w5)nX{-KxqMOo7d?k2&?Vf z&diGDtZr(0cwPe9z9FAUSD9KC)7(n^lMWuayCfxzy8EZsns%OEblHFSzP=cL6}?J| z0U$H!4S_TVjj<`6dy^2j`V`)mC;cB%* z8{>_%E1^FH!*{>4a7*C1v>~1*@TMcLK{7nEQ!_igZC}ikJ$*<$yHy>7)oy79A~#xE zWavoJOIOC$5b6*q*F_qN1>2#MY)AXVyr$6x4b=$x^*aqF*L?vmj>Mgv+|ITnw_BoW zO?jwHvNy^prH{9$rrik1#fhyU^MpFqF2fYEt(;4`Q&XWOGDH8k6M=%@fics4ajI;st# zCU^r1CK&|jzUhRMv;+W~6N;u<;#DI6cCw-otsc@IsN3MoSD^O`eNflIoR~l4*&-%RBYk@gb^|-JXs&~KuSEmMxB}xSb z@K76cXD=Y|=I&SNC2E+>Zg?R6E%DGCH5J1nU!A|@eX9oS(WPaMm==k2s_ueCqdZw| z&hqHp)47`c{BgwgvY2{xz%OIkY1xDwkw!<0veB#yF4ZKJyabhyyVS`gZepcFIk%e2 zTcrmt2@-8`7i-@5Nz>oQWFuMC_KlroCl(PLSodswHqJ3fn<;gxg9=}~3x_L3P`9Sn zChIf}8vCHvTriz~T2~FamRi?rh?>3bX1j}%bLH+uFX+p&+^aXbOK7clZxdU~6Uxgy z8R=obwO4dL%pmVo*Ktf=lH6hnlz_5k3cG;m8lgaPp~?eD!Yn2kf)tU6PF{kLyn|oI@eQ`F z3IF7~Blqg8-uwUuWZScRKn%c2_}dXB6Dx_&xR*n9M9LXasJhtZdr$vBY!rP{c@=)& z#!?L$2UrkvClwQO>U*fSMs67oSj2mxiJ$t;E|>q%Kh_GzzWWO&3;ufU%2z%ucBU8H z3WIwr$n)cfCXR&>tyB7BcSInK>=ByZA%;cVEJhcg<#6N{aZC4>K41XF>ZgjG`z_u& zGY?;Ad?-sgiOnI`oppF1o1Gurqbi*;#x2>+SSV6|1^G@ooVy@fg?wyf@0Y!UZ4!}nGuLeC^l)6pwkh|oRY`s1Pm$>zZ3u-83T|9 zGaKJIV3_x+u1>cRibsaJpJqhcm%?0-L;2 zitBrdRxNmb0OO2J%Y&Ym(6*`_P3&&5Bw157{o7LFguvxC$4&zTy#U=W*l&(Q2MNO} zfaUwYm{XtILD$3864IA_nn34oVa_g^FRuHL5wdUd)+W-p-iWCKe8m_cMHk+=? zeKX)M?Dt(|{r5t7IenkAXo%&EXIb-i^w+0CX0D=xApC=|Xy(`xy+QG^UyFe z+#J6h_&T5i#sV)hj3D4WN%z;2+jJcZxcI3*CHXGmOF3^)JD5j&wfX)e?-|V0GPuA+ zQFot%aEqGNJJHn$!_}#PaAvQ^{3-Ye7b}rWwrUmX53(|~i0v{}G_sI9uDch_brX&6 zWl5Ndj-AYg(W9CGfQf<6!YmY>Ey)+uYd_JNXH=>|`OH-CDCmcH(0%iD_aLlNHKH z7bcW-^5+QV$jK?R*)wZ>r9t}loM@XN&M-Pw=F#xn(;u3!(3SXXY^@=aoj70;_=QE9 zGghsG3ekq#N||u{4We_25U=y#T*S{4I{++Ku)> zQ!DZW;pVcn>b;&g2;YE#+V`v*Bl&Y-i@X6D*OpNA{G@JAXho&aOk(_j^weW{#3X5Y z%$q_wpb07EYPdmyH(1^09i$ca{O<}7) zRWncXdSPgBE%BM#by!E>tdnc$8RwUJg1*x($6$}ae$e9Knj8gvVZe#bLi!<+&BkFj zg@nOpDneyc+hU9P-;jmOSMN|*H#>^Ez#?;%C3hg_65leSUm;iz)UkW)jX#p)e&S&M z1|a?wDzV5NVnlhRBCd_;F87wp>6c<&nkgvC+!@KGiIqWY4l}=&1w7|r6{oBN8xyzh zG$b#2=RJp_iq6)#t5%yLkKx(0@D=C3w+oiXtSuaQ%I1WIb-eiE$d~!)b@|4XLy!CZ z9p=t=%3ad@Ep+<9003D2KZ5VyP~_n$=;~r&YUg5UZ0KVD&tR1DHy9x)qWtKJp#Kq# zP*8p#W(8JJ_*h_3W}FlvRam?<4Z+-H77^$Lvi+#vmhL9J zJ<1SV45xi;SrO2f=-OB(7#iNA5)x1uNC-yNxUw|!00vcW2PufRm>e~toH;M0Q85MQLWd?3O{i8H+5VkR@l9Dg-ma ze2fZ%>G(u5(k9EHj2L6!;(KZ8%8|*-1V|B#EagbF(rc+5iL_5;Eu)L4Z-V;0HfK4d z*{utLse_rvHZeQ>V5H=f78M3Ntg1BPxFCVD{HbNA6?9*^YIq;B-DJd{Ca2L#)qWP? zvX^NhFmX?CTWw&Ns}lgs;r3i+Bq@y}Ul+U%pzOS0Fcv9~aB(0!>GT0)NO?p=25LjN z2bh>6RhgqD7bQj#k-KOm@JLgMa6>%-ok1WpOe)FS^XOU{c?d5shG(lIn3GiVBxmg`u%-j=)^v&pX1JecJics3&jvPI)mDut52? z3jEA)DM%}BYbxxKrizVYwq?(P&19EXlwD9^-6J+4!}9{ywR9Gk42jjAURAF&EO|~N z)?s>$Da@ikI4|^z0e{r`J8zIs>SpM~Vn^{3fArRu;?+43>lD+^XtUcY1HidJwnR6+ z!;oG2=B6Z_=M%*{z-RaHc(n|1RTKQdNjjV!Pn9lFt^4w|AeN06*j}ZyhqZ^!-=cyGP_ShV1rGxkx8t zB;8`h!S{LD%ot``700d0@Grql(DTt4Awgmi+Yr0@#jbe=2#UkK%rv=OLqF)9D7D1j z!~McAwMYkeaL$~kI~90)5vBhBzWYc3Cj1WI0RS`z000R8-@ET0dA~*r(gSiCJmQMN&4%1D zyVNf0?}sBH8zNbBLn>~(W{d3%@kL_eQ6jEcR{l>C|JK z(R-fA!z|TTRG40|zv}7E@PqCAXP3n`;%|SCQ|ZS%ym$I{`}t3KPL&^l5`3>yah4*6 zifO#{VNz3)?ZL$be;NEaAk9b#{tV?V7 zP|wf5YA*1;s<)9A4~l3BHzG&HH`1xNr#%){4xZ!jq%o=7nN*wMuXlFV{HaiQLJ`5G zBhDi#D(m`Q1pLh@Tq+L;OwuC52RdW7b8}~60WCOK5iYMUad9}7aWBuILb({5=z~YF zt?*Jr5NG+WadM{mDL>GyiByCuR)hd zA=HM?J6l1Xv0Dl+LW@w$OTcEoOda^nFCw*Sy^I@$sSuneMl{4ys)|RY#9&NxW4S)9 zq|%83IpslTLoz~&vTo!Ga@?rj_kw{|k{nv+w&Ku?fyk4Ki4I?);M|5Axm)t+BaE)D zm(`AQ#k^DWrjbuXoJf2{Aj^KT zFb1zMSqxq|vceV+Mf-)$oPflsO$@*A0n0Z!R{&(xh8s}=;t(lIy zv$S8x>m;vQNHuRzoaOo?eiWFe{0;$s`Bc+Osz~}Van${u;g(su`3lJ^TEfo~nERfP z)?aFzpDgnLYiERsKPu|0tq4l2wT)Atr6Qb%m-AUn6HnCue*yWICp7TjW$@sO zm5rm4aTcPQ(rfi7a`xP7cKCFrJD}*&_~xgLyr^-bmsL}y;A5P|al8J3WUoBSjqu%v zxC;mK!g(7r6RRJ852Z~feoC&sD3(6}^5-uLK8o)9{8L_%%rItZK9C){UxB|;G>JbP zsRRtS4-3B*5c+K2kvmgZK8472%l>3cntWUOVHxB|{Ay~aOg5RN;{PJgeVD*H%ac+y!h#wi%o2bF2Ca8IyMyH{>4#{E_8u^@+l-+n=V}Sq?$O z{091@v%Bd*3pk0^2UtiF9Z+(a@wy6 zUdw8J*ze$K#=$48IBi1U%;hmhO>lu!uU;+RS}p&6@rQila7WftH->*A4=5W|Fmtze z)7E}jh@cbmr9iup^i%*(uF%LG&!+Fyl@LFA-}Ca#bxRfDJAiR2dt6644TaYw1Ma79 zt8&DYj31j^5WPNf5P&{)J?WlCe@<3u^78wnd(Ja4^a>{^Tw}W>|Cjt^If|7l^l)^Q zbz|7~CF(k_9~n|h;ysZ+jHzkXf(*O*@5m zLzUmbHp=x!Q|!9NVXyipZ3)^GuIG$k;D)EK!a5=8MFLI_lpf`HPKl=-Ww%z8H_0$j ztJ||IfFG1lE9nmQ0+jPQy zCBdKkjArH@K7jVcMNz);Q(Q^R{d5G?-kk;Uu_IXSyWB)~KGIizZL(^&qF;|1PI7!E zTP`%l)gpX|OFn&)M%txpQ2F!hdA~hX1Cm5)IrdljqzRg!f{mN%G~H1&oqe`5eJCIF zHdD7O;AX-{XEV(a`gBFJ9ews#CVS2y!&>Cm_dm3C8*n3MA*e67(WC?uP@8TXuMroq z{#w$%z@CBIkRM7?}Xib+>hRjy?%G!fiw8! z8(gB+8J~KOU}yO7UGm&1g_MDJ$IXS!`+*b*QW2x)9>K~Y*E&bYMnjl6h!{17_8d!%&9D`a7r&LKZjC<&XOvTRaKJ1 zUY@hl5^R&kZl3lU3njk`3dPzxj$2foOL26r(9zsVF3n_F#v)s5vv3@dgs|lP#eylq62{<-vczqP!RpVBTgI>@O6&sU>W|do17+#OzQ7o5A$ICH z?GqwqnK^n2%LR;$^oZM;)+>$X3s2n}2jZ7CdWIW0lnGK-b#EG01)P@aU`pg}th&J-TrU`tIpb5t((0eu|!u zQz+3ZiOQ^?RxxK4;zs=l8q!-n7X{@jSwK(iqNFiRColuEOg}!7cyZi`iBX4g1pNBj zAPzL?P^Ljhn;1$r8?bc=#n|Ed7wB&oHcw()&*k#SS#h}jO?ZB246EGItsz*;^&tzp zu^YJ0=lwsi`eP_pU8}6JA7MS;9pfD;DsSsLo~ogzMNP70@@;Fm8f0^;>$Z>~}GWRw!W5J3tNX*^2+1f3hz{~rIzJo z6W%J(H!g-eI_J1>0juX$X4Cl6i+3wbc~k146UIX&G22}WE>0ga#WLsn9tY(&29zBvH1$`iWtTe zG2jYl@P!P)eb<5DsR72BdI7-zP&cZNI{7q3e@?N8IKc4DE#UVr->|-ryuJXk^u^>4 z$3wE~=q390;XuOQP~TNoDR?#|NSPJ%sTMInA6*rJ%go|=YjGe!B>z6u$IhgQSwoV* zjy3F2#I>uK{42{&IqP59)Y(1*Z>>#W8rCf4_eVsH)`v!P#^;BgzKDR`ARGEZzkNX+ zJUQu=*-ol=Xqqt5=`=pA@BIn@6a9G8C{c&`i^(i+BxQO9?YZ3iu%$$da&Kb?2kCCo zo7t$UpSFWqmydXf@l3bVJ=%K?SSw)|?srhJ-1ZdFu*5QhL$~-IQS!K1s@XzAtv6*Y zl8@(5BlWYLt1yAWy?rMD&bwze8bC3-GfNH=p zynNFCdxyX?K&G(ZZ)afguQ2|r;XoV^=^(;Cku#qYn4Lus`UeKt6rAlFo_rU`|Rq z&G?~iWMBio<78of-2X(ZYHx~=U0Vz4btyXkctMKdc9UM!vYr~B-(>)(Hc|D zMzkN4!PBg%tZoh+=Gba!0++d193gbMk2&krfDgcbx0jI92cq?FFESVg0D$>F+bil} zY~$)|>1HZsX=5sAZ2WgPB5P=8X#TI+NQ(M~GqyVB53c6IdX=k>Wu@A0Svf5#?uHaF zsYn|koIi3$(%GZ2+G+7Fv^lHTb#5b8sAHSTnL^qWZLM<(1|9|QFw9pnRU{svj}_Al zL)b9>fN{QiA($8peNEJyy`(a{&uh-T4_kdZFIVsKKVM(?05}76EEz?#W za^fiZOAd14IJ4zLX-n7Lq0qlQ^lW8Cvz4UKkV9~P}>sq0?xD3vg+$4vLm~C(+ zM{-3Z#qnZ09bJ>}j?6ry^h+@PfaD7*jZxBEY4)UG&daWb??6)TP+|3#Z&?GL?1i+280CFsE|vIXQbm| zM}Pk!U`U5NsNbyKzkrul-DzwB{X?n3E6?TUHr{M&+R*2%yOiXdW-_2Yd6?38M9Vy^ z*lE%gA{wwoSR~vN0=no}tP2Ul5Gk5M(Xq`$nw#ndFk`tcpd5A=Idue`XZ!FS>Q zG^0w#>P4pPG+*NC9gLP4x2m=cKP}YuS!l^?sHSFftZy{4CoQrb_ z^20(NnG`wAhMI=eq)SsIE~&Gp9Ne0nD4%Xiu|0Fj1UFk?6avDqjdXz{O1nKao*46y zT8~iA%Exu=G#{x=KD;_C&M+Zx4+n`sHT>^>=-1YM;H<72k>$py1?F3#T1*ef9mLZw z5naLQr?n7K;2l+{_uIw*_1nsTn~I|kkCgrn;|G~##hM;9l7Jy$yJfmk+&}W@JeKcF zx@@Woiz8qdi|D%aH3XTx5*wDlbs?dC1_nrFpm^QbG@wM=i2?Zg;$VK!c^Dp8<}BTI zyRhAq@#%2pGV49*Y5_mV4+OICP|%I(dQ7x=6Ob}>EjnB_-_18*xrY?b%-yEDT(wrO z9RY2QT0`_OpGfMObKHV;QLVnrK%mc?$WAdIT`kJQT^n%GuzE7|9@k3ci5fYOh(287 zuIbg!GB3xLg$YN=n)^pHGB0jH+_iIiC=nUcD;G6LuJsjn2VI1cyZx=a?ShCsF==QK z;q~*m&}L<-cb+mDDXzvvrRsybcgQ;Vg21P(uLv5I+eGc7o7tc6`;OA9{soHFOz zT~2?>Ts}gprIX$wRBb4yE>ot<8+*Bv`qbSDv*VtRi|cyWS>)Fjs>fkNOH-+PX&4(~ z&)T8Zam2L6puQl?;5zg9h<}k4#|yH9czHw;1jw-pwBM*O2hUR6yvHATrI%^mvs9q_ z&ccT0>f#eDG<^WG^q@oVqlJrhxH)dcq2cty@l3~|5#UDdExyXUmLQ}f4#;6fI{f^t zDCsgIJ~0`af%YR%Ma5VQq-p21k`vaBu6WE?66+5=XUd%Ay%D$irN>5LhluRWt7 zov-=f>QbMk*G##&DTQyou$s7UqjjW@k6=!I@!k+S{pP8R(2=e@io;N8E`EOB;OGoI zw6Q+{X1_I{OO0HPpBz!X!@`5YQ2)t{+!?M_iH25X(d~-Zx~cXnS9z>u?+If|iNJbx zyFU2d1!ITX64D|lE0Z{dLRqL1Ajj=CCMfC4lD3&mYR_R_VZ>_7_~|<^o*%_&jevU+ zQ4|qzci=0}Jydw|LXLCrOl1_P6Xf@c0$ieK2^7@A9UbF{@V_0p%lqW|L?5k>bVM8|p5v&2g;~r>B8uo<4N+`B zH{J)h;SYiIVx@#jI&p-v3dwL5QNV1oxPr8J%ooezTnLW>i*3Isb49%5i!&ac_dEXv zvXmVUck^QHmyrF8>CGXijC_R-y(Qr{3Zt~EmW)-nC!tiH`wlw5D*W7Pip;T?&j%kX z6DkZX4&}iw>hE(boLyjOoupf6JpvBG8}jIh!!VhnD0>}KSMMo{1#uU6kiFcA04~|7 zVO8eI&x1`g4CZ<2cYUI(n#wz2MtVFHx47yE5eL~8bot~>EHbevSt}LLMQX?odD{Ux zJMnam{d)W4da{l7&y-JrgiU~qY3$~}_F#G7|MxT)e;G{U`In&?`j<5D->}cb{}{T(4DF0BOk-=1195KB-E*o@c?`>y#4=dMtYtSY=&L{!TAjFVcq0y@AH`vH! z$41+u!Ld&}F^COPgL(EE{0X7LY&%D7-(?!kjFF7=qw<;`V{nwWBq<)1QiGJgUc^Vz ztMUlq1bZqKn17|6x6iAHbWc~l1HcmAxr%$Puv!znW)!JiukwIrqQ00|H$Z)OmGG@= zv%A8*4cq}(?qn4rN6o`$Y))(MyXr8R<2S^J+v(wmFmtac!%VOfN?&(8Nr!T@kV`N; z*Q33V3t`^rN&aBiHet)18wy{*wi1=W!B%B-Q6}SCrUl$~Hl{@!95ydml@FK8P=u4s z4e*7gV2s=YxEvskw2Ju!2%{8h01rx-3`NCPc(O zH&J0VH5etNB2KY6k4R@2Wvl^Ck$MoR3=)|SEclT2ccJ!RI9Nuter7u9@;sWf-%um;GfI!=eEIQ2l2p_YWUd{|6EG ze{yO6;lMc>;2tPrsNdi@&1K6(1;|$xe8vLgiouj%QD%gYk`4p{Ktv9|j+!OF-P?@p z;}SV|oIK)iwlBs+`ROXkhd&NK zzo__r!B>tOXpBJMDcv!Mq54P+n4(@dijL^EpO1wdg~q+!DT3lB<>9AANSe!T1XgC=J^)IP0XEZ()_vpu!!3HQyJhwh?r`Ae%Yr~b% zO*NY9t9#qWa@GCPYOF9aron7thfWT`eujS4`t2uG6)~JRTI;f(ZuoRQwjZjp5Pg34 z)rp$)Kr?R+KdJ;IO;pM{$6|2y=k_siqvp%)2||cHTe|b5Ht8&A{wazGNca zX$Ol?H)E_R@SDi~4{d-|8nGFhZPW;Cts1;08TwUvLLv&_2$O6Vt=M)X;g%HUr$&06 zISZb(6)Q3%?;3r~*3~USIg=HcJhFtHhIV(siOwV&QkQe#J%H9&E21!C*d@ln3E@J* zVqRO^<)V^ky-R|%{(9`l-(JXq9J)1r$`uQ8a}$vr9E^nNiI*thK8=&UZ0dsFN_eSl z(q~lnD?EymWLsNa3|1{CRPW60>DSkY9YQ;$4o3W7Ms&@&lv9eH!tk~N&dhqX&>K@} zi1g~GqglxkZ5pEFkllJ)Ta1I^c&Bt6#r(QLQ02yHTaJB~- zCcE=5tmi`UA>@P=1LBfBiqk)HB4t8D?02;9eXj~kVPwv?m{5&!&TFYhu>3=_ zsGmYZ^mo*-j69-42y&Jj0cBLLEulNRZ9vXE)8~mt9C#;tZs;=#M=1*hebkS;7(aGf zcs7zH(I8Eui9UU4L--))yy`&d&$In&VA2?DAEss4LAPCLd>-$i?lpXvn!gu^JJ$(DoUlc6wE98VLZ*z`QGQov5l4Fm_h?V-;mHLYDVOwKz7>e4+%AzeO>P6v}ndPW| zM>m#6Tnp7K?0mbK=>gV}=@k*0Mr_PVAgGMu$j+pWxzq4MAa&jpCDU&-5eH27Iz>m^ zax1?*HhG%pJ((tkR(V(O(L%7v7L%!_X->IjS3H5kuXQT2!ow(;%FDE>16&3r){!ex zhf==oJ!}YU89C9@mfDq!P3S4yx$aGB?rbtVH?sHpg?J5C->!_FHM%Hl3#D4eplxzQ zRA+<@LD%LKSkTk2NyWCg7u=$%F#;SIL44~S_OGR}JqX}X+=bc@swpiClB`Zbz|f!4 z7Ysah7OkR8liXfI`}IIwtEoL}(URrGe;IM8%{>b1SsqXh)~w}P>yiFRaE>}rEnNkT z!HXZUtxUp1NmFm)Dm@-{FI^aRQqpSkz}ZSyKR%Y}YHNzBk)ZIp} zMtS=aMvkgWKm9&oTcU0?S|L~CDqA+sHpOxwnswF-fEG)cXCzUR?ps@tZa$=O)=L+5 zf%m58cq8g_o}3?Bhh+c!w4(7AjxwQ3>WnVi<{{38g7yFboo>q|+7qs<$8CPXUFAN< zG&}BHbbyQ5n|qqSr?U~GY{@GJ{(Jny{bMaOG{|IkUj7tj^9pa9|FB_<+KHLxSxR;@ zHpS$4V)PP+tx}22fWx(Ku9y+}Ap;VZqD0AZW4gCDTPCG=zgJmF{|x;(rvdM|2|9a}cex6xrMkERnkE;}jvU-kmzd%_J50$M`lIPCKf+^*zL=@LW`1SaEc%=m zQ+lT06Gw+wVwvQ9fZ~#qd430v2HndFsBa9WjD0P}K(rZYdAt^5WQIvb%D^Q|pkVE^ zte$&#~zmULFACGfS#g=2OLOnIf2Of-k!(BIHjs77nr!5Q1*I9 z1%?=~#Oss!rV~?-6Gm~BWJiA4mJ5TY&iPm_$)H1_rTltuU1F3I(qTQ^U$S>%$l z)Wx1}R?ij0idp@8w-p!Oz{&*W;v*IA;JFHA9%nUvVDy7Q8woheC#|8QuDZb-L_5@R zOqHwrh|mVL9b=+$nJxM`3eE{O$sCt$UK^2@L$R(r^-_+z?lOo+me-VW=Zw z-Bn>$4ovfWd%SPY`ab-u9{INc*k2h+yH%toDHIyqQ zO68=u`N}RIIs7lsn1D){)~%>ByF<>i@qFb<-axvu(Z+6t7v<^z&gm9McRB~BIaDn$ z#xSGT!rzgad8o>~kyj#h1?7g96tOcCJniQ+*#=b7wPio>|6a1Z?_(TS{)KrPe}(8j z!#&A=k(&Pj^F;r)CI=Z{LVu>uj!_W1q4b`N1}E(i%;BWjbEcnD=mv$FL$l?zS6bW!{$7j1GR5ocn94P2u{ z70tAAcpqtQo<@cXw~@i-@6B23;317|l~S>CB?hR5qJ%J3EFgyBdJd^fHZu7AzHF(BQ!tyAz^L0`X z23S4Fe{2X$W0$zu9gm%rg~A>ijaE#GlYlrF9$ds^QtaszE#4M(OLVP2O-;XdT(XIC zatwzF*)1c+t~c{L=fMG8Z=k5lv>U0;C{caN1NItnuSMp)6G3mbahu>E#sj&oy94KC zpH}8oEw{G@N3pvHhp{^-YaZeH;K+T_1AUv;IKD<=mv^&Ueegrb!yf`4VlRl$M?wsl zZyFol(2|_QM`e_2lYSABpKR{{NlxlDSYQNkS;J66aT#MSiTx~;tUmvs-b*CrR4w=f z8+0;*th6kfZ3|5!Icx3RV11sp=?`0Jy3Fs0N4GZQMN=8HmT6%x9@{Dza)k}UwL6JT zHRDh;%!XwXr6yuuy`4;Xsn0zlR$k%r%9abS1;_v?`HX_hI|+EibVnlyE@3aL5vhQq zlIG?tN^w@0(v9M*&L+{_+RQZw=o|&BRPGB>e5=ys7H`nc8nx)|-g;s7mRc7hg{GJC zAe^vCIJhajmm7C6g! zL&!WAQ~5d_5)00?w_*|*H>3$loHrvFbitw#WvLB!JASO?#5Ig5$Ys10n>e4|3d;tS zELJ0|R4n3Az(Fl3-r^QiV_C;)lQ1_CW{5bKS15U|E9?ZgLec@%kXr84>5jV2a5v=w z?pB1GPdxD$IQL4)G||B_lI+A=08MUFFR4MxfGOu07vfIm+j=z9tp~5i_6jb`tR>qV z$#`=BQ*jpCjm$F0+F)L%xRlnS%#&gro6PiRfu^l!EVan|r3y}AHJQOORGx4~ z&<)3=K-tx518DZyp%|!EqpU!+X3Et7n2AaC5(AtrkW>_57i}$eqs$rupubg0a1+WO zGHZKLN2L0D;ab%{_S1Plm|hx8R?O14*w*f&2&bB050n!R2by zw!@XOQx$SqZ5I<(Qu$V6g>o#A!JVwErWv#(Pjx=KeS0@hxr4?13zj#oWwPS(7Ro|v z>Mp@Kmxo79q|}!5qtX2-O@U&&@6s~!I&)1WQIl?lTnh6UdKT_1R640S4~f=_xoN3- zI+O)$R@RjV$F=>Ti7BlnG1-cFKCC(t|Qjm{SalS~V-tX#+2ekRhwmN zZr`8{QF6y~Z!D|{=1*2D-JUa<(1Z=;!Ei!KiRNH?o{p5o3crFF=_pX9O-YyJchr$~ zRC`+G+8kx~fD2k*ZIiiIGR<8r&M@3H?%JVOfE>)})7ScOd&?OjgAGT@WVNSCZ8N(p zuQG~76GE3%(%h1*vUXg$vH{ua0b`sQ4f0*y=u~lgyb^!#CcPJa2mkSEHGLsnO^kb$ zru5_l#nu=Y{rSMWiYx?nO{8I!gH+?wEj~UM?IrG}E|bRIBUM>UlY<`T1EHpRr36vv zBi&dG8oxS|J$!zoaq{+JpJy+O^W(nt*|#g32bd&K^w-t>!Vu9N!k9eA8r!Xc{utY> zg9aZ(D2E0gL#W0MdjwES-7~Wa8iubPrd?8-$C4BP?*wok&O8+ykOx{P=Izx+G~hM8 z*9?BYz!T8~dzcZr#ux8kS7u7r@A#DogBH8km8Ry4slyie^n|GrTbO|cLhpqgMdsjX zJ_LdmM#I&4LqqsOUIXK8gW;V0B(7^$y#h3h>J0k^WJfAMeYek%Y-Dcb_+0zPJez!GM zAmJ1u;*rK=FNM0Nf}Y!!P9c4)HIkMnq^b;JFd!S3?_Qi2G#LIQ)TF|iHl~WKK6JmK zbv7rPE6VkYr_%_BT}CK8h=?%pk@3cz(UrZ{@h40%XgThP*-Oeo`T0eq9 zA8BnWZKzCy5e&&_GEsU4*;_k}(8l_&al5K-V*BFM=O~;MgRkYsOs%9eOY6s6AtE*<7GQAR2ulC3RAJrG_P1iQK5Z~&B z&f8X<>yJV6)oDGIlS$Y*D^Rj(cszTy5c81a5IwBr`BtnC6_e`ArI8CaTX_%rx7;cn zR-0?J_LFg*?(#n~G8cXut(1nVF0Oka$A$1FGcERU<^ggx;p@CZc?3UB41RY+wLS`LWFNSs~YP zuw1@DNN3lTd|jDL7gjBsd9}wIw}4xT2+8dBQzI00m<@?c2L%>}QLfK5%r!a-iII`p zX@`VEUH)uj^$;7jVUYdADQ2k*!1O3WdfgF?OMtUXNpQ1}QINamBTKDuv19^{$`8A1 zeq%q*O0mi@(%sZU>Xdb0Ru96CFqk9-L3pzLVsMQ`Xpa~N6CR{9Rm2)A|CI21L(%GW zh&)Y$BNHa=FD+=mBw3{qTgw)j0b!Eahs!rZnpu)z!!E$*eXE~##yaXz`KE5(nQM`s zD!$vW9XH)iMxu9R>r$VlLk9oIR%HxpUiW=BK@4U)|1WNQ=mz9a z^!KkO=>GaJ!GBXm{KJj^;kh-MkUlEQ%lza`-G&}C5y1>La1sR6hT=d*NeCnuK%_LV zOXt$}iP6(YJKc9j-Fxq~*ItVUqljQ8?oaysB-EYtFQp9oxZ|5m0^Hq(qV!S+hq#g( z?|i*H2MIr^Kxgz+3vIljQ*Feejy6S4v~jKEPTF~Qhq!(ms5>NGtRgO5vfPPc4Z^AM zTj!`5xEreIN)vaNxa|q6qWdg>+T`Ol0Uz)ckXBXEGvPNEL3R8hB3=C5`@=SYgAju1 z!)UBr{2~=~xa{b8>x2@C7weRAEuatC)3pkRhT#pMPTpSbA|tan%U7NGMvzmF?c!V8 z=pEWxbdXbTAGtWTyI?Fml%lEr-^AE}w#l(<7OIw;ctw}imYax&vR4UYNJZK6P7ZOd zP87XfhnUHxCUHhM@b*NbTi#(-8|wcv%3BGNs#zRCVV(W?1Qj6^PPQa<{yaBwZ`+<`w|;rqUY_C z&AeyKwwf*q#OW-F()lir=T^<^wjK65Lif$puuU5+tk$;e_EJ;Lu+pH>=-8=PDhkBg z8cWt%@$Sc#C6F$Vd+0507;{OOyT7Hs%nKS88q-W!$f~9*WGBpHGgNp}=C*7!RiZ5s zn1L_DbKF@B8kwhDiLKRB@lsXVVLK|ph=w%_`#owlf@s@V(pa`GY$8h%;-#h@TsO|Y8V=n@*!Rog7<7Cid%apR|x zOjhHCyfbIt%+*PCveTEcuiDi%Wx;O;+K=W?OFUV%)%~6;gl?<0%)?snDDqIvkHF{ zyI02)+lI9ov42^hL>ZRrh*HhjF9B$A@=H94iaBESBF=eC_KT$8A@uB^6$~o?3Wm5t1OIaqF^~><2?4e3c&)@wKn9bD? zoeCs;H>b8DL^F&>Xw-xjZEUFFTv>JD^O#1E#)CMBaG4DX9bD(Wtc8Rzq}9soQ8`jf zeSnHOL}<+WVSKp4kkq&?SbETjq6yr@4%SAqOG=9E(3YeLG9dtV+8vmzq+6PFPk{L; z(&d++iu=^F%b+ea$i2UeTC{R*0Isk;vFK!no<;L+(`y`3&H-~VTdKROkdyowo1iqR zbVW(3`+(PQ2>TKY>N!jGmGo7oeoB8O|P_!Ic@ zZ^;3dnuXo;WJ?S+)%P>{Hcg!Jz#2SI(s&dY4QAy_vRlmOh)QHvs_7c&zkJCmJGVvV zX;Mtb>QE+xp`KyciG$Cn*0?AK%-a|=o!+7x&&yzHQOS>8=B*R=niSnta^Pxp1`=md z#;$pS$4WCT?mbiCYU?FcHGZ#)kHVJTTBt^%XE(Q};aaO=Zik0UgLcc0I(tUpt(>|& zcxB_|fxCF7>&~5eJ=Dpn&5Aj{A^cV^^}(7w#p;HG&Q)EaN~~EqrE1qKrMAc&WXIE;>@<&)5;gD2?={Xf@Mvn@OJKw=8Mgn z!JUFMwD+s==JpjhroT&d{$kQAy%+d`a*XxDEVxy3`NHzmITrE`o!;5ClXNPb4t*8P zzAivdr{j_v!=9!^?T3y?gzmqDWX6mkzhIzJ-3S{T5bcCFMr&RPDryMcdwbBuZbsgN zGrp@^i?rcfN7v0NKGzDPGE#4yszxu=I_`MI%Z|10nFjU-UjQXXA?k8Pk|OE<(?ae) zE%vG#eZAlj*E7_3dx#Zz4kMLj>H^;}33UAankJiDy5ZvEhrjr`!9eMD8COp}U*hP+ zF}KIYx@pkccIgyxFm#LNw~G&`;o&5)2`5aogs`1~7cMZQ7zj!%L4E`2yzlQN6REX20&O<9 zKV6fyr)TScJPPzNTC2gL+0x#=u>(({{D7j)c-%tvqls3#Y?Z1m zV5WUE)zdJ{$p>yX;^P!UcXP?UD~YM;IRa#Rs5~l+*$&nO(;Ers`G=0D!twR(0GF@c zHl9E5DQI}Oz74n zfKP>&$q0($T4y$6w(p=ERAFh+>n%iaeRA%!T%<^+pg?M)@ucY<&59$x9M#n+V&>}=nO9wCV{O~lg&v#+jcUj(tQ z`0u1YH)-`U$15a{pBkGyPL0THv1P|4e@pf@3IBZS4dVJPo#H>pWq%Lr0YS-SeWash z8R7=jb28KPMI|_lo#GEO|5B?N_e``H*23{~a!AmUJ+fb4HX-%QI@lSEUxKlGV7z7Q zSKw@-TR>@1RL%w{x}dW#k1NgW+q4yt2Xf1J62Bx*O^WG8OJ|FqI4&@d3_o8Id@*)4 zYrk=>@!wv~mh7YWv*bZhxqSmFh2Xq)o=m;%n$I?GSz49l1$xRpPu_^N(vZ>*>Z<04 z2+rP70oM=NDysd!@fQdM2OcyT?3T^Eb@lIC-UG=Bw{BjQ&P`KCv$AcJ;?`vdZ4){d z&gkoUK{$!$$K`3*O-jyM1~p-7T*qb)Ys>Myt^;#1&a%O@x8A+E>! zY8=eD`ZG)LVagDLBeHg>=atOG?Kr%h4B%E6m@J^C+U|y)XX@f z8oyJDW|9g=<#f<{JRr{y#~euMnv)`7j=%cHWLc}ngjq~7k**6%4u>Px&W%4D94(r* z+akunK}O0DC2A%Xo9jyF;DobX?!1I(7%}@7F>i%&nk*LMO)bMGg2N+1iqtg+r(70q zF5{Msgsm5GS7DT`kBsjMvOrkx&|EU!{{~gL4d2MWrAT=KBQ-^zQCUq{5PD1orxlIL zq;CvlWx#f1NWvh`hg011I%?T_s!e38l*lWVt|~z-PO4~~1g)SrJ|>*tXh=QfXT)%( z+ex+inPvD&O4Ur;JGz>$sUOnWdpSLcm1X%aQDw4{dB!cnj`^muI$CJ2%p&-kULVCE z>$eMR36kN$wCPR+OFDM3-U(VOrp9k3)lI&YVFqd;Kpz~K)@Fa&FRw}L(SoD z9B4a+hQzZT-BnVltst&=kq6Y(f^S4hIGNKYBgMxGJ^;2yrO}P3;r)(-I-CZ)26Y6? z&rzHI_1GCvGkgy-t1E;r^3Le30|%$ebDRu2+gdLG)r=A~Qz`}~&L@aGJ{}vVs_GE* zVUjFnzHiXfKQbpv&bR&}l2bzIjAooB)=-XNcYmrGmBh(&iu@o!^hn0^#}m2yZZUK8 zufVm7Gq0y`Mj;9b>`c?&PZkU0j4>IL=UL&-Lp3j&47B5pAW4JceG{!XCA)kT<%2nqCxj<)uy6XR_uws~>_MEKPOpAQ!H zkn>FKh)<9DwwS*|Y(q?$^N!6(51O0 z^JM~Ax{AI1Oj$fs-S5d4T7Z_i1?{%0SsIuQ&r8#(JA=2iLcTN+?>wOL532%&dMYkT z*T5xepC+V6zxhS@vNbMoi|i)=rpli@R9~P!39tWbSSb904ekv7D#quKbgFEMTb48P zuq(VJ+&L8aWU(_FCD$3^uD!YM%O^K(dvy~Wm2hUuh6bD|#(I39Xt>N1Y{ZqXL`Fg6 zKQ?T2htHN!(Bx;tV2bfTtIj7e)liN-29s1kew>v(D^@)#v;}C4-G=7x#;-dM4yRWm zyY`cS21ulzMK{PoaQ6xChEZ}o_#}X-o}<&0)$1#3we?+QeLt;aVCjeA)hn!}UaKt< zat1fHEx13y-rXNMvpUUmCVzocPmN~-Y4(YJvQ#db)4|%B!rBsgAe+*yor~}FrNH08 z3V!97S}D7d$zbSD{$z;@IYMxM6aHdypIuS*pr_U6;#Y!_?0i|&yU*@16l z*dcMqDQgfNBf}?quiu4e>H)yTVfsp#f+Du0@=Kc41QockXkCkvu>FBd6Q+@FL!(Yx z2`YuX#eMEiLEDhp+9uFqME_E^faV&~9qjBHJkIp~%$x^bN=N)K@kvSVEMdDuzA0sn z88CBG?`RX1@#hQNd`o^V{37)!w|nA)QfiYBE^m=yQKv-fQF+UCMcuEe1d4BH7$?>b zJl-r9@0^Ie=)guO1vOd=i$_4sz>y3x^R7n4ED!5oXL3@5**h(xr%Hv)_gILarO46q+MaDOF%ChaymKoI6JU5Pg;7#2n9-18|S1;AK+ zgsn6;k6-%!QD>D?cFy}8F;r@z8H9xN1jsOBw2vQONVqBVEbkiNUqgw~*!^##ht>w0 zUOykwH=$LwX2j&nLy=@{hr)2O&-wm-NyjW7n~Zs9UlH;P7iP3 zI}S(r0YFVYacnKH(+{*)Tbw)@;6>%=&Th=+Z6NHo_tR|JCI8TJiXv2N7ei7M^Q+RM z?9o`meH$5Yi;@9XaNR#jIK^&{N|DYNNbtdb)XW1Lv2k{E>;?F`#Pq|&_;gm~&~Zc9 zf+6ZE%{x4|{YdtE?a^gKyzr}dA>OxQv+pq|@IXL%WS0CiX!V zm$fCePA%lU{%pTKD7|5NJHeXg=I0jL@$tOF@K*MI$)f?om)D63K*M|r`gb9edD1~Y zc|w7N)Y%do7=0{RC|AziW7#am$)9jciRJ?IWl9PE{G3U+$%FcyKs_0Cgq`=K3@ttV z9g;M!3z~f_?P%y3-ph%vBMeS@p7P&Ea8M@97+%XEj*(1E6vHj==d zjsoviB>j^$_^OI_DEPvFkVo(BGRo%cJeD){6Uckei=~1}>sp299|IRjhXe)%?uP0I zF5+>?0#Ye}T^Y$u_rc4=lPcq4K^D(TZG-w30-YiEM=dcK+4#o*>lJ8&JLi+3UcpZk z!^?95S^C0ja^jwP`|{<+3cBVog$(mRdQmadS+Vh~z zS@|P}=|z3P6uS+&@QsMp0no9Od&27O&14zHXGAOEy zh~OKpymK5C%;LLb467@KgIiVwYbYd6wFxI{0-~MOGfTq$nBTB!{SrWmL9Hs}C&l&l#m?s*{tA?BHS4mVKHAVMqm63H<|c5n0~k)-kbg zXidai&9ZUy0~WFYYKT;oe~rytRk?)r8bptITsWj(@HLI;@=v5|XUnSls7$uaxFRL+ zRVMGuL3w}NbV1`^=Pw*0?>bm8+xfeY(1PikW*PB>>Tq(FR`91N0c2&>lL2sZo5=VD zQY{>7dh_TX98L2)n{2OV=T10~*YzX27i2Q7W86M4$?gZIXZaBq#sA*{PH8){|GUi;oM>e?ua7eF4WFuFYZSG| zze?srg|5Ti8Og{O zeFxuw9!U+zhyk?@w zjsA6(oKD=Ka;A>Ca)oPORxK+kxH#O@zhC!!XS4@=swnuMk>t+JmLmFiE^1aX3f<)D@`%K0FGK^gg1a1j>zi z2KhV>sjU7AX3F$SEqrXSC}fRx64GDoc%!u2Yag68Lw@w9v;xOONf@o)Lc|Uh3<21ctTYu-mFZuHk*+R{GjXHIGq3p)tFtQp%TYqD=j1&y)>@zxoxUJ!G@ zgI0XKmP6MNzw>nRxK$-Gbzs}dyfFzt>#5;f6oR27ql!%+{tr+(`(>%51|k`ML} zY4eE)Lxq|JMas(;JibNQds1bUB&r}ydMQXBY4x(^&fY_&LlQC)3hylc$~8&~|06-D z#T+%66rYbHX%^KuqJED_wuGB+=h`nWA!>1n0)3wZrBG3%`b^Ozv6__dNa@%V14|!D zQ?o$z5u0^8`giv%qE!BzZ!3j;BlDlJDk)h@9{nSQeEk!z9RGW) z${RSF3phEM*ce*>Xdp}585vj$|40=&S{S-GTiE?Op*vY&Lvr9}BO$XWy80IF+6@%n z5*2ueT_g@ofP#u5pxb7n*fv^Xtt7&?SRc{*2Ka-*!BuOpf}neHGCiHy$@Ka1^Dint z;DkmIL$-e)rj4o2WQV%Gy;Xg(_Bh#qeOsTM2f@KEe~4kJ8kNLQ+;(!j^bgJMcNhvklP5Z6I+9Fq@c&D~8Fb-4rmDT!MB5QC{Dsb;BharP*O;SF4& zc$wj-7Oep7#$WZN!1nznc@Vb<_Dn%ga-O#J(l=OGB`dy=Sy&$(5-n3zzu%d7E#^8`T@}V+5B;PP8J14#4cCPw-SQTdGa2gWL0*zKM z#DfSXs_iWOMt)0*+Y>Lkd=LlyoHjublNLefhKBv@JoC>P7N1_#> zv=mLWe96%EY;!ZGSQDbZWb#;tzqAGgx~uk+-$+2_8U`!ypbwXl z^2E-FkM1?lY@yt8=J3%QK+xaZ6ok=-y%=KXCD^0r!5vUneW>95PzCkOPO*t}p$;-> ze5j-BLT_;)cZQzR2CEsm@rU7GZfFtdp*a|g4wDr%8?2QkIGasRfDWT-Dvy*U{?IHT z*}wGnzdlSptl#ZF^sf)KT|BJs&kLG91^A6ls{CzFprZ6-Y!V0Xysh%9p%iMd7HLsS zN+^Un$tDV)T@i!v?3o0Fsx2qI(AX_$dDkBzQ@fRM%n zRXk6hb9Py#JXUs+7)w@eo;g%QQ95Yq!K_d=z{0dGS+pToEI6=Bo8+{k$7&Z zo4>PH(`ce8E-Ps&uv`NQ;U$%t;w~|@E3WVOCi~R4oj5wP?%<*1C%}Jq%a^q~T7u>K zML5AKfQDv6>PuT`{SrKHRAF+^&edg6+5R_#H?Lz3iGoWo#PCEd0DS;)2U({{X#zU^ zw_xv{4x7|t!S)>44J;KfA|DC?;uQ($l+5Vp7oeqf7{GBF9356nx|&B~gs+@N^gSdd zvb*>&W)|u#F{Z_b`f#GVtQ`pYv3#||N{xj1NgB<#=Odt6{eB%#9RLt5v zIi|0u70`#ai}9fJjKv7dE!9ZrOIX!3{$z_K5FBd-Kp-&e4(J$LD-)NMTp^_pB`RT; zftVVlK2g@+1Ahv2$D){@Y#cL#dUj9*&%#6 zd2m9{1NYp>)6=oAvqdCn5#cx{AJ%S8skUgMglu2*IAtd+z1>B&`MuEAS(D(<6X#Lj z?f4CFx$)M&$=7*>9v1ER4b6!SIz-m0e{o0BfkySREchp?WdVPpQCh!q$t>?rL!&Jg zd#heM;&~A}VEm8Dvy&P|J*eAV&w!&Nx6HFV&B8jJFVTmgLaswn!cx$&%JbTsloz!3 zMEz1d`k==`Ueub_JAy_&`!ogbwx27^ZXgFNAbx=g_I~5nO^r)}&myw~+yY*cJl4$I znNJ32M&K=0(2Dj_>@39`3=FX!v3nZHno_@q^!y}%(yw0PqOo=);6Y@&ylVe>nMOZ~ zd>j#QQSBn3oaWd;qy$&5(5H$Ayi)0haAYO6TH>FR?rhqHmNOO+(})NB zLI@B@v0)eq!ug`>G<@htRlp3n!EpU|n+G+AvXFrWSUsLMBfL*ZB`CRsIVHNTR&b?K zxBgsN0BjfB>UVcJ|x%=-zb%OV7lmZc& zxiupadZVF7)6QuhoY;;FK2b*qL0J-Rn-8!X4ZY$-ZSUXV5DFd7`T41c(#lAeLMoeT z4%g655v@7AqT!i@)Edt5JMbN(=Q-6{=L4iG8RA%}w;&pKmtWvI4?G9pVRp|RTw`g0 zD5c12B&A2&P6Ng~8WM2eIW=wxd?r7A*N+&!Be7PX3s|7~z=APxm=A?5 zt>xB4WG|*Td@VX{Rs)PV0|yK`oI3^xn(4c_j&vgxk_Y3o(-`_5o`V zRTghg6%l@(qodXN;dB#+OKJEEvhfcnc#BeO2|E(5df-!fKDZ!%9!^BJ_4)9P+9Dq5 zK1=(v?KmIp34r?z{NEWnLB3Px{XYwy-akun4F7xTRr2^zeYW{gcK9)>aJDdU5;w5@ zak=<+-PLH-|04pelTb%ULpuuuJC7DgyT@D|p{!V!0v3KpDnRjANN12q6SUR3mb9<- z>2r~IApQGhstZ!3*?5V z8#)hJ0TdZg0M-BK#nGFP>$i=qk82DO z7h;Ft!D5E15OgW)&%lej*?^1~2=*Z5$2VX>V{x8SC+{i10BbtUk9@I#Vi&hX)q
Q!LwySI{Bnv%Sm)yh{^sSVJ8&h_D-BJ_YZe5eCaAWU9b$O2c z$T|{vWVRtOL!xC0DTc(Qbe`ItNtt5hr<)VijD0{U;T#bUEp381_y`%ZIav?kuYG{iyYdEBPW=*xNSc;Rlt6~F4M`5G+VtOjc z*0qGzCb@gME5udTjJA-9O<&TWd~}ysBd(eVT1-H82-doyH9RST)|+Pb{o*;$j9Tjs zhU!IlsPsj8=(x3bAKJTopW3^6AKROHR^7wZ185wJGVhA~hEc|LP;k7NEz-@4p5o}F z`AD6naG3(n=NF9HTH81=F+Q|JOz$7wm9I<+#BSmB@o_cLt2GkW9|?7mM;r!JZp89l zbo!Hp8=n!XH1{GwaDU+k)pGp`C|cXkCU5%vcH)+v@0eK>%7gWxmuMu9YLlChA|_D@ zi#5zovN_!a-0?~pUV-Rj*1P)KwdU-LguR>YM&*Nen+ln8Q$?WFCJg%DY%K}2!!1FE zDv-A%Cbwo^p(lzac&_TZ-l#9kq`mhLcY3h9ZTUVCM(Ad&=EriQY5{jJv<5K&g|*Lk zgV%ILnf1%8V2B0E&;Sp4sYbYOvvMebLwYwzkRQ#F8GpTQq#uv=J`uaSJ34OWITeSGo6+-8Xw znCk*n{kdDEi)Hi&u^)~cs@iyCkFWB2SWZU|Uc%^43ZIZQ-vWNExCCtDWjqHs;;tWf$v{}0{p0Rvxkq``)*>+Akq%|Na zA`@~-Vfe|+(AIlqru+7Ceh4nsVmO9p9jc8}HX^W&ViBDXT+uXbT#R#idPn&L>+#b6 zflC-4C5-X;kUnR~L>PSLh*gvL68}RBsu#2l`s_9KjUWRhiqF`j)`y`2`YU(>3bdBj z?>iyjEhe-~$^I5!nn%B6Wh+I`FvLNvauve~eX<+Ipl&04 zT}};W&1a3%W?dJ2=N#0t?e+aK+%t}5q%jSLvp3jZ%?&F}nOOWr>+{GFIa%wO_2`et z=JzoRR~}iKuuR+azPI8;Gf9)z3kyA4EIOSl!sRR$DlW}0>&?GbgPojmjmnln;cTqCt=ADbE zZ8GAnoM+S1(5$i8^O4t`ue;vO4i}z0wz-QEIVe5_u03;}-!G1NyY8;h^}y;tzY}i5 zqQr#Ur3Fy8sSa$Q0ys+f`!`+>9WbvU_I`Sj;$4{S>O3?#inLHCrtLy~!s#WXV=oVP zeE93*Nc`PBi4q@%Ao$x4lw9vLHM!6mn3-b_cebF|n-2vt-zYVF_&sDE--J-P;2WHo z+@n2areE0o$LjvjlV2X7ZU@j+`{*8zq`JR3gKF#EW|#+{nMyo-a>nFFTg&vhyT=b} zDa8+v0(Dgx0yRL@ZXOYIlVSZ0|MFizy0VPW8;AfA5|pe!#j zX}Py^8fl5SyS4g1WSKKtnyP+_PoOwMMwu`(i@Z)diJp~U54*-miOchy7Z35eL>^M z4p<-aIxH4VUZgS783@H%M7P9hX>t{|RU7$n4T(brCG#h9e9p! z+o`i;EGGq3&pF;~5V~eBD}lC)>if$w%Vf}AFxGqO88|ApfHf&Bvu+xdG)@vuF}Yvk z)o;~k-%+0K0g+L`Wala!$=ZV|z$e%>f0%XoLib%)!R^RoS+{!#X?h-6uu zF&&KxORdZU&EwQFITIRLo(7TA3W}y6X{?Y%y2j0It!ekU#<)$qghZtpcS>L3uh`Uj z7GY;6f$9qKynP#oS3$$a{p^{D+0oJQ71`1?OAn_m8)UGZmj3l*ZI)`V-a>MKGGFG< z&^jg#Ok%(hhm>hSrZ5;Qga4u(?^i>GiW_j9%_7M>j(^|Om$#{k+^*ULnEgzW_1gCICtAD^WpC`A z{9&DXkG#01Xo)U$OC(L5Y$DQ|Q4C6CjUKk1UkPj$nXH##J{c8e#K|&{mA*;b$r0E4 zUNo0jthwA(c&N1l=PEe8Rw_8cEl|-eya9z&H3#n`B$t#+aJ03RFMzrV@gowbe8v(c zIFM60^0&lCFO10NU4w@|61xiZ4CVXeaKjd;d?sv52XM*lS8XiVjgWpRB;&U_C0g+`6B5V&w|O6B*_q zsATxL!M}+$He)1eOWECce#eS@2n^xhlB4<_Nn?yCVEQWDs(r`|@2GqLe<#(|&P0U? z$7V5IgpWf09uIf_RazRwC?qEqRaHyL?iiS05UiGesJy%^>-C{{ypTBI&B0-iUYhk> zIk<5xpsuV@g|z(AZD+C-;A!fTG=df1=<%nxy(a(IS+U{ME4ZbDEBtcD_3V=icT6*_ z)>|J?>&6%nvHhZERBtjK+s4xnut*@>GAmA5m*OTp$!^CHTr}vM4n(X1Q*;{e-Rd2BCF-u@1ZGm z!S8hJ6L=Gl4T_SDa7Xx|-{4mxveJg=ctf`BJ*fy!yF6Dz&?w(Q_6B}WQVtNI!BVBC zKfX<>7vd6C96}XAQmF-Jd?1Q4eTfRB3q7hCh0f!(JkdWT5<{iAE#dKy*Jxq&3a1@~ z8C||Dn2mFNyrUV|<-)C^_y7@8c2Fz+2jrae9deBDu;U}tJ{^xAdxCD248(k;dCJ%o z`y3sADe>U%suxwwv~8A1+R$VB=Q?%U?4joI$um;aH+eCrBqpn- z%79D_7rb;R-;-9RTrwi9dPlg8&@tfWhhZ(Vx&1PQ+6(huX`;M9x~LrW~~#3{j0Bh2kDU$}@!fFQej4VGkJv?M4rU^x!RU zEwhu$!CA_iDjFjrJa`aocySDX16?~;+wgav;}Zut6Mg%C4>}8FL?8)Kgwc(Qlj{@#2Pt0?G`$h7P#M+qoXtlV@d}%c&OzO+QYKK`kyXaK{U(O^2DyIXCZlNQjt0^8~8JzNGrIxhj}}M z&~QZlbx%t;MJ(Vux;2tgNKGlAqphLq%pd}JG9uoVHUo?|hN{pLQ6Em%r*+7t^<);X zm~6=qChlNAVXNN*Sow->*4;}T;l;D1I-5T{Bif@4_}=>l`tK;qqDdt5zvisCKhMAH z#r}`)7VW?LZqfdmXQ%zo5bJ00{Xb9^YKrk0Nf|oIW*K@(=`o2Vndz}ZDyk{!u}PVx zzd--+_WC*U{~DH3{?GI64IB+@On&@9X>EUAo&L+G{L^dozaI4C3G#2wr~hseW@K&g zKWs{uHu-9Je!3;4pE>eBltKUXb^*hG8I&413)$J&{D4N%7PcloU6bn%jPxJyQL?g* z9g+YFFEDiE`8rW^laCNzQmi7CTnPfwyg3VDHRAl>h=In6jeaVOP@!-CP60j3+#vpL zEYmh_oP0{-gTe7Or`L6x)6w?77QVi~jD8lWN@3RHcm80iV%M1A!+Y6iHM)05iC64tb$X2lV_%Txk@0l^hZqi^%Z?#- zE;LE0uFx)R08_S-#(wC=dS&}vj6P4>5ZWjhthP=*Hht&TdLtKDR;rXEX4*z0h74FA zMCINqrh3Vq;s%3MC1YL`{WjIAPkVL#3rj^9Pj9Ss7>7duy!9H0vYF%>1jh)EPqvlr6h%R%CxDsk| z!BACz7E%j?bm=pH6Eaw{+suniuY7C9Ut~1cWfOX9KW9=H><&kQlinPV3h9R>3nJvK z4L9(DRM=x;R&d#a@oFY7mB|m8h4692U5eYfcw|QKwqRsshN(q^v$4$)HgPpAJDJ`I zkqjq(8Cd!K!+wCd=d@w%~e$=gdUgD&wj$LQ1r>-E=O@c ze+Z$x{>6(JA-fNVr)X;*)40Eym1TtUZI1Pwwx1hUi+G1Jlk~vCYeXMNYtr)1?qwyg zsX_e*$h?380O00ou?0R@7-Fc59o$UvyVs4cUbujHUA>sH!}L54>`e` zHUx#Q+Hn&Og#YVOuo*niy*GU3rH;%f``nk#NN5-xrZ34NeH$l`4@t);4(+0|Z#I>Y z)~Kzs#exIAaf--65L0UHT_SvV8O2WYeD>Mq^Y6L!Xu8%vnpofG@w!}R7M28?i1*T&zp3X4^OMCY6(Dg<-! zXmcGQrRgHXGYre7GfTJ)rhl|rs%abKT_Nt24_Q``XH{88NVPW+`x4ZdrMuO0iZ0g` z%p}y};~T5gbb9SeL8BSc`SO#ixC$@QhXxZ=B}L`tP}&k?1oSPS=4%{UOHe0<_XWln zwbl5cn(j-qK`)vGHY5B5C|QZd5)W7c@{bNVXqJ!!n$^ufc?N9C-BF2QK1(kv++h!>$QbAjq)_b$$PcJdV+F7hz0Hu@ zqj+}m0qn{t^tD3DfBb~0B36|Q`bs*xs|$i^G4uNUEBl4g;op-;Wl~iThgga?+dL7s zUP(8lMO?g{GcYpDS{NM!UA8Hco?#}eNEioRBHy4`mq!Pd-9@-97|k$hpEX>xoX+dY zDr$wfm^P&}Wu{!%?)U_(%Mn79$(ywvu*kJ9r4u|MyYLI_67U7%6Gd_vb##Nerf@>& z8W11z$$~xEZt$dPG}+*IZky+os5Ju2eRi;1=rUEeIn>t-AzC_IGM-IXWK3^6QNU+2pe=MBn4I*R@A%-iLDCOHTE-O^wo$sL_h{dcPl=^muAQb`_BRm};=cy{qSkui;`WSsj9%c^+bIDQ z0`_?KX0<-=o!t{u(Ln)v>%VGL z0pC=GB7*AQ?N7N{ut*a%MH-tdtNmNC+Yf$|KS)BW(gQJ*z$d{+{j?(e&hgTy^2|AR9vx1Xre2fagGv0YXWqtNkg*v%40v?BJBt|f9wX5 z{QTlCM}b-0{mV?IG>TW_BdviUKhtosrBqdfq&Frdz>cF~yK{P@(w{Vr7z2qKFwLhc zQuogKO@~YwyS9%+d-zD7mJG~@?EFJLSn!a&mhE5$_4xBl&6QHMzL?CdzEnC~C3$X@ zvY!{_GR06ep5;<#cKCSJ%srxX=+pn?ywDwtJ2{TV;0DKBO2t++B(tIO4)Wh`rD13P z4fE$#%zkd=UzOB74gi=-*CuID&Z3zI^-`4U^S?dHxK8fP*;fE|a(KYMgMUo`THIS1f!*6dOI2 zFjC3O=-AL`6=9pp;`CYPTdVX z8(*?V&%QoipuH0>WKlL8A*zTKckD!paN@~hh zmXzm~qZhMGVdQGd=AG8&20HW0RGV8X{$9LldFZYm zE?}`Q3i?xJRz43S?VFMmqRyvWaS#(~Lempg9nTM$EFDP(Gzx#$r)W&lpFKqcAoJh-AxEw$-bjW>`_+gEi z2w`99#UbFZGiQjS8kj~@PGqpsPX`T{YOj`CaEqTFag;$jY z8_{Wzz>HXx&G*Dx<5skhpETxIdhKH?DtY@b9l8$l?UkM#J-Snmts7bd7xayKTFJ(u zyAT&@6cAYcs{PBfpqZa%sxhJ5nSZBPji?Zlf&}#L?t)vC4X5VLp%~fz2Sx<*oN<7` z?ge=k<=X7r<~F7Tvp9#HB{!mA!QWBOf%EiSJ6KIF8QZNjg&x~-%e*tflL(ji_S^sO ztmib1rp09uon}RcsFi#k)oLs@$?vs(i>5k3YN%$T(5Or(TZ5JW9mA6mIMD08=749$ z!d+l*iu{Il7^Yu}H;lgw=En1sJpCKPSqTCHy4(f&NPelr31^*l%KHq^QE>z>Ks_bH zjbD?({~8Din7IvZeJ>8Ey=e;I?thpzD=zE5UHeO|neioJwG;IyLk?xOz(yO&0DTU~ z^#)xcs|s>Flgmp;SmYJ4g(|HMu3v7#;c*Aa8iF#UZo7CvDq4>8#qLJ|YdZ!AsH%^_7N1IQjCro

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..0f80bbf516 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000000..4f906e0c81 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..107acd32c4 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000000..292a32e875 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,11 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/7.0.2/userguide/multi_project_builds.html + */ + +rootProject.name = "nutch" +include("nutch") From 64765e02382751b59c53cb611ee7f02ecaa3ede0 Mon Sep 17 00:00:00 2001 From: AzureTriple <77744272+AzureTriple@users.noreply.github.com> Date: Sat, 26 Feb 2022 10:44:36 -0800 Subject: [PATCH 03/55] NUTCH-2940 Develop Gradle Core Build for Apache Nutch --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle.kts b/build.gradle.kts index 907a96469c..9cd654e5b7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -53,5 +53,6 @@ ant.importBuild("build.xml") {old ->"ant-${old}"} tasks.register("clean-default-lib") { + description = "--> clean the project libraries directory (dependencies)" delete("build/lib") } \ No newline at end of file From 81fa6da8dec3bacedbc2a1e5818ec2700a5a1281 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sat, 26 Feb 2022 14:00:00 -0800 Subject: [PATCH 04/55] NUTCH-2940 Develop Gradle Core Build for Apache Nutch --- build.gradle.kts | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9cd654e5b7..0421cbb006 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,8 +51,32 @@ publishing { ant.importBuild("build.xml") {old ->"ant-${old}"} -tasks.register("clean-default-lib") +tasks.register("clean-default-lib") { description = "--> clean the project libraries directory (dependencies)" - delete("build/lib") + delete("./build/lib") +} + +tasks.register("clean-test-lib") +{ + description = "--> clean the project test libraries directory (dependencies)" + delete("./build/test/lib") +} + +tasks.register("clean-build") +{ + description = "--> clean the project built files" + delete("./build") +} + +tasks.register("clean-dist") +{ + description = "--> clean the project dist files" + delete("./dist") +} + +tasks.register("clean-runtime") +{ + description = "--> clean the project runtime area" + delete("./runtime") } \ No newline at end of file From c08a6b664702c880bd363f4bbc0239f9beffbca9 Mon Sep 17 00:00:00 2001 From: Lily Perry Date: Sun, 6 Mar 2022 18:36:45 -0500 Subject: [PATCH 05/55] Create Jenkinsfile_ant --- Jenkinsfile_ant | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 Jenkinsfile_ant diff --git a/Jenkinsfile_ant b/Jenkinsfile_ant new file mode 100644 index 0000000000..c8863e6e0b --- /dev/null +++ b/Jenkinsfile_ant @@ -0,0 +1,70 @@ +#!groovy + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu' +// ================================================================= +// https://cwiki.apache.org/confluence/display/INFRA/Jenkins +// https://cwiki.apache.org/confluence/display/INFRA/Multibranch+Pipeline+recipes +// ================================================================= + +// general pipeline documentation: https://jenkins.io/doc/book/pipeline/syntax/ +pipeline { + agent { + node { + label AGENT_LABEL + } + + environment { + LANG = 'C.UTF-8' +} + + stages { + stage('Build') { + steps { + withAnt(installation: 'myinstall') + { + sh "ant runtime" + } + } + + post { + success { + archiveArtifacts '**/target/*.jar' + } + } + } + + stage('Test') { + steps { + withAnt(installation: 'myinstall') + { + sh "ant test" + } + } + + post { + always { + junit testResults: '**/target/surefire-reports/TEST-*.xml', testDataPublishers: [[$class: 'StabilityTestDataPublisher']] + } + } + } + } +} From 865a1a40e5a93451081d0de0085377c41ac295d5 Mon Sep 17 00:00:00 2001 From: Lily Perry Date: Sun, 6 Mar 2022 18:38:07 -0500 Subject: [PATCH 06/55] Create Jenkinsfile --- Jenkinsfile | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..efc3b628ef --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,65 @@ +#!groovy + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu' +// ================================================================= +// https://cwiki.apache.org/confluence/display/INFRA/Jenkins +// https://cwiki.apache.org/confluence/display/INFRA/Multibranch+Pipeline+recipes +// ================================================================= + +// general pipeline documentation: https://jenkins.io/doc/book/pipeline/syntax/ +pipeline { + agent { + node { + label AGENT_LABEL + } + } + + environment { + LANG = 'C.UTF-8' +} + + stages { + stage('Build') { + steps { + sh "gradle build" + } + + post { + success { + archiveArtifacts '**/target/*.jar' + } + } + } + + stage('Test') { + steps { + sh "gradle test" + } + + post { + always { + junit testResults: '**/target/surefire-reports/TEST-*.xml', testDataPublishers: [[$class: 'StabilityTestDataPublisher']] + } + } + } + } +} From 6708c5ac69bc6932ee00922a5f85d6224fa36ea7 Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Thu, 10 Mar 2022 09:23:11 -0800 Subject: [PATCH 07/55] NUTCH-2940 Develop Gradle Core Build for Apache Nutch --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 307ead3658..4458c68a9f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Apache Nutch README =================== +hello + For the latest information about Nutch, please visit our website at: From aa5093abf18d448698179a964e889bae24591b6a Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Thu, 10 Mar 2022 09:26:11 -0800 Subject: [PATCH 08/55] NUTCH-2940 Develop Gradle Core Build for Apache Nutch --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 4458c68a9f..307ead3658 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ Apache Nutch README =================== -hello - For the latest information about Nutch, please visit our website at: From 01bb650f8d9dd0286a8efd31d68605d510e32ca4 Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Thu, 10 Mar 2022 09:26:43 -0800 Subject: [PATCH 09/55] NUTCH-2940 Develop Gradle Core Build for Apache Nutch --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 307ead3658..4458c68a9f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Apache Nutch README =================== +hello + For the latest information about Nutch, please visit our website at: From 74fd4b5ae0df890f7db25dcd5f871ec1035a2358 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Mon, 14 Mar 2022 16:46:18 -0700 Subject: [PATCH 10/55] NUTCH 2940 Develop Gradle Core Build for Apache Nutch added licenses and updated wrapper --- build.gradle.kts | 17 ++ gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 17 +- gradlew | 257 ++++++++++++++--------- settings.gradle.kts | 17 ++ 5 files changed, 203 insertions(+), 105 deletions(-) mode change 100644 => 100755 gradlew diff --git a/build.gradle.kts b/build.gradle.kts index 0421cbb006..ee476058b4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,20 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + /* * This file was generated by the Gradle 'init' task. * diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf516..07793e6163 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 4f906e0c81..1b6c787337 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/settings.gradle.kts b/settings.gradle.kts index 292a32e875..3ba5b29007 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /* * This file was generated by the Gradle 'init' task. * From 00b90297a777f4b1fb9a3a5229712fd10c1315da Mon Sep 17 00:00:00 2001 From: AzureTriple <77744272+AzureTriple@users.noreply.github.com> Date: Mon, 14 Mar 2022 17:00:38 -0700 Subject: [PATCH 11/55] Added gradlew files to ./gitignore --- .gitignore | 5 +++++ gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cf55635307..2274f8974b 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,8 @@ ivy/dependency-check-ant/* # Ignore Gradle build output directory build + +# Ignore Gradle Wrapper +gradle/ +gradlew +gradlew.bat \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf516..69a9715077 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c81..744e882ed5 100644 --- a/gradlew +++ b/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) From 4f84df4adeef0e99cbfa9a6fc2f20622f0c8335c Mon Sep 17 00:00:00 2001 From: AzureTriple <77744272+AzureTriple@users.noreply.github.com> Date: Mon, 14 Mar 2022 17:01:19 -0700 Subject: [PATCH 12/55] removed gradlew --- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 5 - gradlew | 185 ----------------------- gradlew.bat | 89 ----------- 4 files changed, 279 deletions(-) delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties delete mode 100644 gradlew delete mode 100644 gradlew.bat diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 69a9715077..0000000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100644 index 744e882ed5..0000000000 --- a/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 107acd32c4..0000000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega From 15e57003c4b2959cde1ff61090d1a219743471e0 Mon Sep 17 00:00:00 2001 From: AzureTriple <77744272+AzureTriple@users.noreply.github.com> Date: Mon, 21 Mar 2022 00:49:41 -0700 Subject: [PATCH 13/55] rebase --- .gitignore | 5 + gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 20 -- gradlew | 234 ----------------------- gradlew.bat | 89 --------- 5 files changed, 5 insertions(+), 343 deletions(-) delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties delete mode 100755 gradlew delete mode 100644 gradlew.bat diff --git a/.gitignore b/.gitignore index cf55635307..2274f8974b 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,8 @@ ivy/dependency-check-ant/* # Ignore Gradle build output directory build + +# Ignore Gradle Wrapper +gradle/ +gradlew +gradlew.bat \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 07793e6163..0000000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100755 index 1b6c787337..0000000000 --- a/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 107acd32c4..0000000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega From 0bda914b2e1436b98592000d09c4601a2c901bbc Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sat, 26 Mar 2022 17:42:30 -0700 Subject: [PATCH 14/55] Added several targets --- build.gradle.kts | 92 +++++++++++++++++-- gradle.properties | 219 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 305 insertions(+), 6 deletions(-) create mode 100644 gradle.properties diff --git a/build.gradle.kts b/build.gradle.kts index 0421cbb006..1c0cba7c3a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,6 +25,15 @@ dependencies { implementation("com.google.guava:guava:30.0-jre") } +/* +buildscript { + dependencies { + // Classpath + classpath("${project.properties["build.classes"]}") + } +} +*/ + application { // Define the main class for the application. //mainClass.set("nutch.App") @@ -44,39 +53,110 @@ publishing { maven { url = uri("https://repository.apache.org/service/local/staging/deploy/maven2") } - } } ant.importBuild("build.xml") {old ->"ant-${old}"} +tasks.register("REEE") +{ + println(project.properties["build.classes"]) +} tasks.register("clean-default-lib") { - description = "--> clean the project libraries directory (dependencies)" + description = "clean the project libraries directory (dependencies)" delete("./build/lib") } tasks.register("clean-test-lib") { - description = "--> clean the project test libraries directory (dependencies)" + description = "clean the project test libraries directory (dependencies)" delete("./build/test/lib") } tasks.register("clean-build") { - description = "--> clean the project built files" + description = "clean the project built files" delete("./build") } tasks.register("clean-dist") { - description = "--> clean the project dist files" + description = "clean the project dist files" delete("./dist") } tasks.register("clean-runtime") { - description = "--> clean the project runtime area" + description = "clean the project runtime area" delete("./runtime") +} + +tasks.register("copy-libs") +{ + description = "copy the libs in lib, which are not ivy enabled" + from(layout.buildDirectory.dir("${project.properties["lib.dir"]}")) + include("**/*.jar") + into(layout.buildDirectory.dir("${project.properties["build.lib.dir"]}")) +} + +tasks.register("compile-plugins") +{ + description = "compile plugins only" + dependsOn("init","resolve-default","deploy") +} + +tasks.register("jar") +{ + description = "make nutch.jar" + from(layout.buildDirectory.dir("${project.properties["conf.dir"]}/nutch-default.xml")) + into(layout.buildDirectory.dir("${project.properties["build.classes"]}")) + + from(layout.buildDirectory.dir("${project.properties["conf.dir"]}/nutch-site.xml")) + into(layout.buildDirectory.dir("${project.properties["build.classes"]}")) +} + +tasks.register("runtime") +{ + description = "default target for running Nutch" + mkdir("${project.properties["runtime.dir"]}") + mkdir("${project.properties["runtime.local"]}") + mkdir("${project.properties["runtime.deploy"]}") + + from(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")) + into(layout.buildDirectory.dir("${project.properties["runtime.deploy"]}")) + + from(layout.buildDirectory.dir("${project.properties["runtime.deploy"]}/bin")) + into(layout.buildDirectory.dir("src/bin")) + + from(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")) + into(layout.buildDirectory.dir("${project.properties["runtime.local"]}/lib")) + + from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/lib/native")) + into(layout.buildDirectory.dir("lib/native")) + + from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/conf")) { + exclude("*.template") + } + into(layout.buildDirectory.dir("${project.properties["conf.dir"]}/lib")) + + from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/bin")) + into(layout.buildDirectory.dir("src/bin")) + + from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/lib")) + into(layout.buildDirectory.dir("${project.properties["build.dir"]}/lib")) + + from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/plugins")) + into(layout.buildDirectory.dir("${project.properties["build.dir"]}/plugins")) + + from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/test")) + into(layout.buildDirectory.dir("${project.properties["build.dir"]}/test")) + + doLast() { + project.exec() { + commandLine("chmod","ugo+x","${project.properties["runtime.deploy"]}/bin") + commandLine("chmod","ugo+x","${project.properties["runtime.local"]}/bin") + } + } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000..f3e55c36dd --- /dev/null +++ b/gradle.properties @@ -0,0 +1,219 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name=apache-nutch +version=1.19-SNAPSHOT +final.name=apache-nutch-1.19-SNAPSHOT +year=2021 + +basedir = ./ +src.dir = ./src/java +lib.dir = ./lib +conf.dir = ./conf +plugins.dir = ./src/plugin + +build.dir = ./build +build.classes = ./build/classes +build.plugins = ./build/plugins +build.javadoc = ./build/docs/api +build.encoding = UTF-8 +build.ivy.dir=./build/ivy +build.lib.dir=./build/lib + +test.src.dir = ./src/test +test.build.dir = ./build/test +test.build.lib.dir = ./build/test/lib +test.build.data = ./build/test/data +test.build.classes = ./build/test/classes +test.build.javadoc = ./build/test/docs/api +test.junit.output.format = plain + +# Proxy Host and Port to use for building JavaDoc +javadoc.proxy.host=-J-DproxyHost= +javadoc.proxy.port=-J-DproxyPort= +javadoc.link.java=https://docs.oracle.com/en/java/javase/11/docs/api/ +javadoc.link.hadoop=https://hadoop.apache.org/docs/r3.1.3/api/ +#javadoc.link.lucene.core=https://lucene.apache.org/core/8_4_1/core/ +#javadoc.link.lucene.analyzers-common=https://lucene.apache.org/core/8_4_1/analyzers-common/ +#javadoc.link.solr-solrj=https://lucene.apache.org/solr/8_4_1/solr-solrj/ +javadoc.packages=org.apache.nutch.* + +dist.dir=./dist +src.dist.version.dir=./dist/apache-nutch-1.19-SNAPSHOT-src +bin.dist.version.dir=./dist/apache-nutch-1.19-SNAPSHOT-bin + +javac.debug=on +javac.optimize=on +javac.deprecation=on +javac.version=11 + +runtime.dir=./runtime +runtime.deploy=./runtime/deploy +runtime.local=./runtime/local + +ivy.version=2.5.0 +ivy.dir=.//ivy +ivy.file=.//ivy/ivy.xml +ivy.jar=.//ivy/ivy-2.5.0.jar +ivy.repo.url=https://repo1.maven.org/maven2/org/apache/ivy/ivy/2.5.0/ivy-2.5.0.jar + +ivy.local.default.root=${ivy.default.ivy.user.dir}/local +ivy.local.default.ivy.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] +ivy.local.default.artifact.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] + +ivy.shared.default.root=${ivy.default.ivy.user.dir}/shared +ivy.shared.default.ivy.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] +ivy.shared.default.artifact.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] + +# +# Plugins API +# +plugins.api=\ + org.apache.nutch.protocol.http.api*:\ + org.apache.nutch.urlfilter.api* + +# +# Protocol Plugins +# +plugins.protocol=\ + org.apache.nutch.protocol.file*:\ + org.apache.nutch.protocol.ftp*:\ + org.apache.nutch.protocol.http*:\ + org.apache.nutch.protocol.httpclient*:\ + org.apache.nutch.protocol.interactiveselenium*:\ + org.apache.nutch.protocol.okhttp*:\ + org.apache.nutch.protocol.selenium*:\ + org.apache.nutch.protocol.htmlunit*:\ + +# +# URL Filter Plugins +# +plugins.urlfilter=\ + org.apache.nutch.urlfilter.automaton*:\ + org.apache.nutch.urlfilter.domain*:\ + org.apache.nutch.urlfilter.domaindenylist*:\ + org.apache.nutch.urlfilter.fast*:\ + org.apache.nutch.urlfilter.ignoreexempt*:\ + org.apache.nutch.urlfilter.prefix*:\ + org.apache.nutch.urlfilter.regex*:\ + org.apache.nutch.urlfilter.suffix*:\ + org.apache.nutch.urlfilter.validator* + +# +# URL Normalizer Plugins +# +plugins.urlnormalizer=\ + org.apache.nutch.net.urlnormalizer.ajax*:\ + org.apache.nutch.net.urlnormalizer.basic*:\ + org.apache.nutch.net.urlnormalizer.host*:\ + org.apache.nutch.net.urlnormalizer.pass*:\ + org.apache.nutch.net.urlnormalizer.protocol*:\ + org.apache.nutch.net.urlnormalizer.querystring*:\ + org.apache.nutch.net.urlnormalizer.regex*:\ + org.apache.nutch.net.urlnormalizer.slash* + +# +# Scoring Plugins +# +plugins.scoring=\ + org.apache.nutch.scoring.depth*:\ + org.apache.nutch.scoring.link*:\ + org.apache.nutch.scoring.opic*:\ + org.apache.nutch.scoring.orphan*:\ + org.apache.nutch.scoring.similarity*:\ + org.apache.nutch.scoring.tld*:\ + org.apache.nutch.scoring.urlmeta*\ + org.apache.nutch.scoring.metadata* + +# +# Parse Plugins +# +plugins.parse=\ + org.apache.nutch.parse.ext*:\ + org.apache.nutch.parse.feed*:\ + org.apache.nutch.parse.html*:\ + org.apache.nutch.parse.js:\ + org.apache.nutch.parse.replace*:\ + org.apache.nutch.parse.swf*:\ + org.apache.nutch.parse.tika:\ + org.apache.nutch.parse.zip + +# +# Parse Filter Plugins +# +plugins.parsefilter=\ + org.apache.nutch.parsefilter.debug*:\ + org.apache.nutch.parse.headings*:\ + org.apache.nutch.parsefilter.naivebayes*:\ + org.apache.nutch.parsefilter.regex*:\ + org.apache.nutch.parse.metatags* + +# +# Publisher Plugins +# +plugins.publisher=\ + org.apache.nutch.publisher.rabbitmq* + +# +# Exchange Plugins +# +plugins.exchange=\ + org.apache.nutch.exchange.jexl* + +# +# Indexing Filter Plugins +# +plugins.index=\ + org.apache.nutch.indexer.anchor*:\ + org.apache.nutch.indexer.basic*:\ + org.apache.nutch.indexer.feed*:\ + org.apache.nutch.indexer.geoip*:\ + org.apache.nutch.indexer.jexl*:\ + org.apache.nutch.indexer.filter*:\ + org.apache.nutch.indexer.links*:\ + org.apache.nutch.indexer.metadata*:\ + org.apache.nutch.indexer.more*:\ + org.apache.nutch.indexer.replace*:\ + org.apache.nutch.indexer.staticfield*:\ + org.apache.nutch.indexer.subcollection*:\ + org.apache.nutch.indexer.tld*:\ + org.apache.nutch.indexer.urlmeta* + +# +# Indexing Backend Plugins +# +plugins.indexer=\ + org.apache.nutch.indexwriter.cloudsearch*:\ + org.apache.nutch.indexwriter.csv*:\ + org.apache.nutch.indexwriter.dummy*:\ + org.apache.nutch.indexwriter.elastic*:\ + org.apache.nutch.indexwriter.rabbit*:\ + org.apache.nutch.indexwriter.kafka*:\ + org.apache.nutch.indexwriter.solr* + +# +# Misc. Plugins +# +# (gathers plugins that cannot be dispatched +# in any category, mainly because they contain +# many extension points) +# +plugins.misc=\ + org.apache.nutch.collection*:\ + org.apache.nutch.analysis.lang*:\ + org.creativecommons.nutch*:\ + org.apache.nutch.microformats.reltag*:\ + org.apache.nutch.any23* + From 9a84e348112231802d4eff196005cd436528a87c Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sat, 26 Mar 2022 19:10:57 -0700 Subject: [PATCH 15/55] NUTCH 2940 Develop Gradle Core Build for Apache Nutch properties, classpath, init, updates --- build.gradle.kts | 53 ++++++++--- gradle.properties | 219 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 262 insertions(+), 10 deletions(-) create mode 100644 gradle.properties diff --git a/build.gradle.kts b/build.gradle.kts index ee476058b4..ab341aec1e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -67,33 +67,66 @@ publishing { ant.importBuild("build.xml") {old ->"ant-${old}"} +// the normal classpath +val classpathCollection: FileCollection = layout.files( + file(project.properties["build.classes"]), + fileTree(mapOf("dir" to project.properties["build.lib.dir"], "include" to listOf("*.jar"))) +) +val classpath: String = classpathCollection.asPath + +// ant target "init" renamed to "init-nutch" to avoid gradle naming conflits +tasks.register("init-nutch") { + doLast { + // making six directories + mkdir(project.properties["build.dir"]) + mkdir(project.properties["build.classes"]) + mkdir(project.properties["release.dir"]) + mkdir(project.properties["test.build.dir"]) + mkdir(project.properties["test.build.classes"]) + mkdir(project.properties["test.build.lib.dir"]) + + // incomplete: changing datetime for all **/*.template in conf.dir + fileTree(mapOf("dir" to project.properties["conf.dir"], "include" to listOf("**/*.template"))).forEach{ file: File -> + println(file) + // FIX: cannot find touch or datetime equivalent + // file.lastModified() = Date("01/25/1971 2:00 pm") + } + + // renaming from *.template to * for all files in folders in conf.dir + fileTree(project.properties["conf.dir"]).matching { include("**/*.template") }.forEach { file: File -> + rename { fileName: String -> + fileName.replace(".template", "") + } + } + } +} tasks.register("clean-default-lib") { - description = "--> clean the project libraries directory (dependencies)" - delete("./build/lib") + description = "clean the project libraries directory (dependencies)" + delete(project.properties["build.lib.dir"]) } tasks.register("clean-test-lib") { - description = "--> clean the project test libraries directory (dependencies)" - delete("./build/test/lib") + description = "clean the project test libraries directory (dependencies)" + delete(project.properties["test.build.lib.dir"]) } tasks.register("clean-build") { - description = "--> clean the project built files" - delete("./build") + description = "clean the project built files" + delete(project.properties["build.dir"]) } tasks.register("clean-dist") { - description = "--> clean the project dist files" - delete("./dist") + description = "clean the project dist files" + delete(project.properties["dist.dir"]) } tasks.register("clean-runtime") { - description = "--> clean the project runtime area" - delete("./runtime") + description = "clean the project runtime area" + delete(project.properties["runtime.dir"]) } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000..e50221a0e3 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,219 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name=apache-nutch +version=1.19-SNAPSHOT +final.name=apache-nutch-1.19-SNAPSHOT +year=2021 + +basedir = ./ +src.dir = ./src/java +lib.dir = ./lib +conf.dir = ./conf +plugins.dir = ./src/plugin + +build.dir = ./build +build.classes = ./build/classes +build.plugins = ./build/plugins +build.javadoc = ./build/docs/api +build.encoding = UTF-8 +build.ivy.dir=./build/ivy +build.lib.dir=./build/lib + +test.src.dir = ./src/test +test.build.dir = ./build/test +test.build.lib.dir = ./build/test/lib +test.build.data = ./build/test/data +test.build.classes = ./build/test/classes +test.build.javadoc = ./build/test/docs/api +test.junit.output.format = plain + +# Proxy Host and Port to use for building JavaDoc +javadoc.proxy.host=-J-DproxyHost= +javadoc.proxy.port=-J-DproxyPort= +javadoc.link.java=https://docs.oracle.com/en/java/javase/11/docs/api/ +javadoc.link.hadoop=https://hadoop.apache.org/docs/r3.1.3/api/ +#javadoc.link.lucene.core=https://lucene.apache.org/core/8_4_1/core/ +#javadoc.link.lucene.analyzers-common=https://lucene.apache.org/core/8_4_1/analyzers-common/ +#javadoc.link.solr-solrj=https://lucene.apache.org/solr/8_4_1/solr-solrj/ +javadoc.packages=org.apache.nutch.* + +dist.dir=./dist +src.dist.version.dir=./dist/apache-nutch-1.19-SNAPSHOT-src +bin.dist.version.dir=./dist/apache-nutch-1.19-SNAPSHOT-bin + +javac.debug=on +javac.optimize=on +javac.deprecation=on +javac.version=11 + +runtime.dir=./runtime +runtime.deploy=./runtime/deploy +runtime.local=./runtime/local + +ivy.version=2.5.0 +ivy.dir=${basedir}/ivy +ivy.file=${ivy.dir}/ivy.xml +ivy.jar=${ivy.dir}/ivy-${ivy.version}.jar +ivy.repo.url=https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar + +ivy.local.default.root=${ivy.default.ivy.user.dir}/local +ivy.local.default.ivy.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] +ivy.local.default.artifact.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] + +ivy.shared.default.root=${ivy.default.ivy.user.dir}/shared +ivy.shared.default.ivy.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] +ivy.shared.default.artifact.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] + +# +# Plugins API +# +plugins.api=\ + org.apache.nutch.protocol.http.api*:\ + org.apache.nutch.urlfilter.api* + +# +# Protocol Plugins +# +plugins.protocol=\ + org.apache.nutch.protocol.file*:\ + org.apache.nutch.protocol.ftp*:\ + org.apache.nutch.protocol.http*:\ + org.apache.nutch.protocol.httpclient*:\ + org.apache.nutch.protocol.interactiveselenium*:\ + org.apache.nutch.protocol.okhttp*:\ + org.apache.nutch.protocol.selenium*:\ + org.apache.nutch.protocol.htmlunit*:\ + +# +# URL Filter Plugins +# +plugins.urlfilter=\ + org.apache.nutch.urlfilter.automaton*:\ + org.apache.nutch.urlfilter.domain*:\ + org.apache.nutch.urlfilter.domaindenylist*:\ + org.apache.nutch.urlfilter.fast*:\ + org.apache.nutch.urlfilter.ignoreexempt*:\ + org.apache.nutch.urlfilter.prefix*:\ + org.apache.nutch.urlfilter.regex*:\ + org.apache.nutch.urlfilter.suffix*:\ + org.apache.nutch.urlfilter.validator* + +# +# URL Normalizer Plugins +# +plugins.urlnormalizer=\ + org.apache.nutch.net.urlnormalizer.ajax*:\ + org.apache.nutch.net.urlnormalizer.basic*:\ + org.apache.nutch.net.urlnormalizer.host*:\ + org.apache.nutch.net.urlnormalizer.pass*:\ + org.apache.nutch.net.urlnormalizer.protocol*:\ + org.apache.nutch.net.urlnormalizer.querystring*:\ + org.apache.nutch.net.urlnormalizer.regex*:\ + org.apache.nutch.net.urlnormalizer.slash* + +# +# Scoring Plugins +# +plugins.scoring=\ + org.apache.nutch.scoring.depth*:\ + org.apache.nutch.scoring.link*:\ + org.apache.nutch.scoring.opic*:\ + org.apache.nutch.scoring.orphan*:\ + org.apache.nutch.scoring.similarity*:\ + org.apache.nutch.scoring.tld*:\ + org.apache.nutch.scoring.urlmeta*\ + org.apache.nutch.scoring.metadata* + +# +# Parse Plugins +# +plugins.parse=\ + org.apache.nutch.parse.ext*:\ + org.apache.nutch.parse.feed*:\ + org.apache.nutch.parse.html*:\ + org.apache.nutch.parse.js:\ + org.apache.nutch.parse.replace*:\ + org.apache.nutch.parse.swf*:\ + org.apache.nutch.parse.tika:\ + org.apache.nutch.parse.zip + +# +# Parse Filter Plugins +# +plugins.parsefilter=\ + org.apache.nutch.parsefilter.debug*:\ + org.apache.nutch.parse.headings*:\ + org.apache.nutch.parsefilter.naivebayes*:\ + org.apache.nutch.parsefilter.regex*:\ + org.apache.nutch.parse.metatags* + +# +# Publisher Plugins +# +plugins.publisher=\ + org.apache.nutch.publisher.rabbitmq* + +# +# Exchange Plugins +# +plugins.exchange=\ + org.apache.nutch.exchange.jexl* + +# +# Indexing Filter Plugins +# +plugins.index=\ + org.apache.nutch.indexer.anchor*:\ + org.apache.nutch.indexer.basic*:\ + org.apache.nutch.indexer.feed*:\ + org.apache.nutch.indexer.geoip*:\ + org.apache.nutch.indexer.jexl*:\ + org.apache.nutch.indexer.filter*:\ + org.apache.nutch.indexer.links*:\ + org.apache.nutch.indexer.metadata*:\ + org.apache.nutch.indexer.more*:\ + org.apache.nutch.indexer.replace*:\ + org.apache.nutch.indexer.staticfield*:\ + org.apache.nutch.indexer.subcollection*:\ + org.apache.nutch.indexer.tld*:\ + org.apache.nutch.indexer.urlmeta* + +# +# Indexing Backend Plugins +# +plugins.indexer=\ + org.apache.nutch.indexwriter.cloudsearch*:\ + org.apache.nutch.indexwriter.csv*:\ + org.apache.nutch.indexwriter.dummy*:\ + org.apache.nutch.indexwriter.elastic*:\ + org.apache.nutch.indexwriter.rabbit*:\ + org.apache.nutch.indexwriter.kafka*:\ + org.apache.nutch.indexwriter.solr* + +# +# Misc. Plugins +# +# (gathers plugins that cannot be dispatched +# in any category, mainly because they contain +# many extension points) +# +plugins.misc=\ + org.apache.nutch.collection*:\ + org.apache.nutch.analysis.lang*:\ + org.creativecommons.nutch*:\ + org.apache.nutch.microformats.reltag*:\ + org.apache.nutch.any23* + From 1b3074e6d04ce3d966da80de74a411bcc20cdc42 Mon Sep 17 00:00:00 2001 From: Ryan Li Date: Sun, 27 Mar 2022 17:24:58 -0700 Subject: [PATCH 16/55] Created sample plugin and migrated over src:plugin:tld --- build.gradle.kts | 4 +++- settings.gradle.kts | 2 +- src/plugin/sample-plugin/build.gradle.kts | 7 +++++++ .../src/java/org/apache/nutch/example/Hello.java | 7 +++++++ 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 src/plugin/sample-plugin/build.gradle.kts create mode 100644 src/plugin/sample-plugin/src/java/org/apache/nutch/example/Hello.java diff --git a/build.gradle.kts b/build.gradle.kts index ee476058b4..404f67f802 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,9 +26,11 @@ plugins { // Apply the application plugin to add support for building a CLI application in Java. `maven-publish` - application + id("application") } + + repositories { // Use Maven Central for resolving dependencies. mavenCentral() diff --git a/settings.gradle.kts b/settings.gradle.kts index 3ba5b29007..e81e7b41e5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,4 +25,4 @@ */ rootProject.name = "nutch" -include("nutch") +include("src:plugin:sample-plugin","src:plugin:tld" ) \ No newline at end of file diff --git a/src/plugin/sample-plugin/build.gradle.kts b/src/plugin/sample-plugin/build.gradle.kts new file mode 100644 index 0000000000..fb9e85c348 --- /dev/null +++ b/src/plugin/sample-plugin/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + id("application") +} + +application { + mainClass.set("java.org.apache.nutch.example") +} \ No newline at end of file diff --git a/src/plugin/sample-plugin/src/java/org/apache/nutch/example/Hello.java b/src/plugin/sample-plugin/src/java/org/apache/nutch/example/Hello.java new file mode 100644 index 0000000000..1e86448b47 --- /dev/null +++ b/src/plugin/sample-plugin/src/java/org/apache/nutch/example/Hello.java @@ -0,0 +1,7 @@ +package java.org.apache.nutch.example; + +public class Hello { + public static void main(String[] args) { + System.out.println("Hello, world!"); + } +} \ No newline at end of file From 98c5e45e678dede0338083559bcb9288d9fcab5e Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sun, 27 Mar 2022 19:37:58 -0700 Subject: [PATCH 17/55] Update build.gradle.kts --- build.gradle.kts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f6e02bb472..1d25680efa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,15 +42,6 @@ dependencies { implementation("com.google.guava:guava:30.0-jre") } -/* -buildscript { - dependencies { - // Classpath - classpath("${project.properties["build.classes"]}") - } -} -*/ - application { // Define the main class for the application. //mainClass.set("nutch.App") @@ -75,11 +66,6 @@ publishing { ant.importBuild("build.xml") {old ->"ant-${old}"} -tasks.register("REEE") -{ - println(project.properties["build.classes"]) -} - tasks.register("clean-default-lib") { description = "clean the project libraries directory (dependencies)" From ffc0d146ddb83325cbbde5f10b474c17d108f693 Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sat, 2 Apr 2022 11:56:42 -0700 Subject: [PATCH 18/55] Updated according to requested changes --- build.gradle.kts | 14 ++++++++++---- gradle.properties | 17 +---------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1d25680efa..4882e09d13 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -64,6 +64,7 @@ publishing { } } +//TODO delete once Gradle build system is fully implemented ant.importBuild("build.xml") {old ->"ant-${old}"} tasks.register("clean-default-lib") @@ -98,19 +99,23 @@ tasks.register("clean-runtime") tasks.register("copy-libs") { - description = "copy the libs in lib, which are not ivy enabled" + description = "copy the libs in lib" from(layout.buildDirectory.dir("${project.properties["lib.dir"]}")) include("**/*.jar") into(layout.buildDirectory.dir("${project.properties["build.lib.dir"]}")) } -tasks.register("compile-plugins") +tasks.register("compile-plugins") { description = "compile plugins only" - dependsOn("init","resolve-default","deploy") + dependsOn("init","resolve-default") + //TODO Once plugins are finished, uncomment the following lines: + // dir = file("src/plugin") + // tasks = listOf("deploy") } -tasks.register("jar") +//TODO is this needed? Gradle has its own default jar task... +tasks.register("nutch-jar") { description = "make nutch.jar" from(layout.buildDirectory.dir("${project.properties["conf.dir"]}/nutch-default.xml")) @@ -123,6 +128,7 @@ tasks.register("jar") tasks.register("runtime") { description = "default target for running Nutch" + dependsOn("jar","job") mkdir("${project.properties["runtime.dir"]}") mkdir("${project.properties["runtime.local"]}") mkdir("${project.properties["runtime.deploy"]}") diff --git a/gradle.properties b/gradle.properties index f3e55c36dd..e3e184b0c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ name=apache-nutch version=1.19-SNAPSHOT final.name=apache-nutch-1.19-SNAPSHOT -year=2021 +year=2022 basedir = ./ src.dir = ./src/java @@ -29,7 +29,6 @@ build.classes = ./build/classes build.plugins = ./build/plugins build.javadoc = ./build/docs/api build.encoding = UTF-8 -build.ivy.dir=./build/ivy build.lib.dir=./build/lib test.src.dir = ./src/test @@ -63,20 +62,6 @@ runtime.dir=./runtime runtime.deploy=./runtime/deploy runtime.local=./runtime/local -ivy.version=2.5.0 -ivy.dir=.//ivy -ivy.file=.//ivy/ivy.xml -ivy.jar=.//ivy/ivy-2.5.0.jar -ivy.repo.url=https://repo1.maven.org/maven2/org/apache/ivy/ivy/2.5.0/ivy-2.5.0.jar - -ivy.local.default.root=${ivy.default.ivy.user.dir}/local -ivy.local.default.ivy.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] -ivy.local.default.artifact.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] - -ivy.shared.default.root=${ivy.default.ivy.user.dir}/shared -ivy.shared.default.ivy.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] -ivy.shared.default.artifact.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] - # # Plugins API # From 1294b50c479335ca8cdacf1c41f22829539e27c2 Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sat, 2 Apr 2022 14:52:52 -0700 Subject: [PATCH 19/55] Update build.gradle.kts --- build.gradle.kts | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4882e09d13..d7f2e47993 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,6 +27,7 @@ plugins { // Apply the application plugin to add support for building a CLI application in Java. `maven-publish` application + java } repositories { @@ -70,31 +71,31 @@ ant.importBuild("build.xml") {old ->"ant-${old}"} tasks.register("clean-default-lib") { description = "clean the project libraries directory (dependencies)" - delete("./build/lib") + delete("${project.properties["build.lib.dir"]}") } tasks.register("clean-test-lib") { description = "clean the project test libraries directory (dependencies)" - delete("./build/test/lib") + delete("${project.properties["test.build.lib.dir"]}") } tasks.register("clean-build") { description = "clean the project built files" - delete("./build") + delete("${project.properties["build.dir"]}") } tasks.register("clean-dist") { description = "clean the project dist files" - delete("./dist") + delete("${project.properties["dist.dir"]}") } tasks.register("clean-runtime") { description = "clean the project runtime area" - delete("./runtime") + delete("${project.properties["runtime.dir"]}") } tasks.register("copy-libs") @@ -114,15 +115,19 @@ tasks.register("compile-plugins") // tasks = listOf("deploy") } -//TODO is this needed? Gradle has its own default jar task... -tasks.register("nutch-jar") -{ +tasks.jar { description = "make nutch.jar" + dependsOn("compile-core") + from(layout.buildDirectory.dir("${project.properties["conf.dir"]}/nutch-default.xml")) into(layout.buildDirectory.dir("${project.properties["build.classes"]}")) from(layout.buildDirectory.dir("${project.properties["conf.dir"]}/nutch-site.xml")) into(layout.buildDirectory.dir("${project.properties["build.classes"]}")) + + //TODO this is meant to replace + destinationDirectory.set(file("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")) + from(layout.buildDirectory.dir(project.properties["build.classes"] as String)) } tasks.register("runtime") From 1afbe708e284ed0cc3332025eac4e639d45dbb83 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sun, 3 Apr 2022 23:46:02 -0700 Subject: [PATCH 20/55] NUTCH 2940 Develop Gradle Core Build for Apache Nutch fixing changes requested from prior pull request --- build.gradle.kts | 18 ++++++------------ gradle.properties | 23 +++-------------------- 2 files changed, 9 insertions(+), 32 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ab341aec1e..9c4dd61996 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,6 +76,7 @@ val classpath: String = classpathCollection.asPath // ant target "init" renamed to "init-nutch" to avoid gradle naming conflits tasks.register("init-nutch") { + description = "Stuff required by all targets" doLast { // making six directories mkdir(project.properties["build.dir"]) @@ -85,13 +86,6 @@ tasks.register("init-nutch") { mkdir(project.properties["test.build.classes"]) mkdir(project.properties["test.build.lib.dir"]) - // incomplete: changing datetime for all **/*.template in conf.dir - fileTree(mapOf("dir" to project.properties["conf.dir"], "include" to listOf("**/*.template"))).forEach{ file: File -> - println(file) - // FIX: cannot find touch or datetime equivalent - // file.lastModified() = Date("01/25/1971 2:00 pm") - } - // renaming from *.template to * for all files in folders in conf.dir fileTree(project.properties["conf.dir"]).matching { include("**/*.template") }.forEach { file: File -> rename { fileName: String -> @@ -103,30 +97,30 @@ tasks.register("init-nutch") { tasks.register("clean-default-lib") { - description = "clean the project libraries directory (dependencies)" + description = "Clean the project libraries directory (dependencies)" delete(project.properties["build.lib.dir"]) } tasks.register("clean-test-lib") { - description = "clean the project test libraries directory (dependencies)" + description = "Clean the project test libraries directory (dependencies)" delete(project.properties["test.build.lib.dir"]) } tasks.register("clean-build") { - description = "clean the project built files" + description = "Clean the project built files" delete(project.properties["build.dir"]) } tasks.register("clean-dist") { - description = "clean the project dist files" + description = "Clean the project dist files" delete(project.properties["dist.dir"]) } tasks.register("clean-runtime") { - description = "clean the project runtime area" + description = "Clean the project runtime area" delete(project.properties["runtime.dir"]) } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e50221a0e3..76a487fc16 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ name=apache-nutch version=1.19-SNAPSHOT final.name=apache-nutch-1.19-SNAPSHOT -year=2021 +year=2022 basedir = ./ src.dir = ./src/java @@ -29,7 +29,6 @@ build.classes = ./build/classes build.plugins = ./build/plugins build.javadoc = ./build/docs/api build.encoding = UTF-8 -build.ivy.dir=./build/ivy build.lib.dir=./build/lib test.src.dir = ./src/test @@ -63,20 +62,6 @@ runtime.dir=./runtime runtime.deploy=./runtime/deploy runtime.local=./runtime/local -ivy.version=2.5.0 -ivy.dir=${basedir}/ivy -ivy.file=${ivy.dir}/ivy.xml -ivy.jar=${ivy.dir}/ivy-${ivy.version}.jar -ivy.repo.url=https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar - -ivy.local.default.root=${ivy.default.ivy.user.dir}/local -ivy.local.default.ivy.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] -ivy.local.default.artifact.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] - -ivy.shared.default.root=${ivy.default.ivy.user.dir}/shared -ivy.shared.default.ivy.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] -ivy.shared.default.artifact.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext] - # # Plugins API # @@ -96,7 +81,6 @@ plugins.protocol=\ org.apache.nutch.protocol.okhttp*:\ org.apache.nutch.protocol.selenium*:\ org.apache.nutch.protocol.htmlunit*:\ - # # URL Filter Plugins # @@ -136,7 +120,7 @@ plugins.scoring=\ org.apache.nutch.scoring.tld*:\ org.apache.nutch.scoring.urlmeta*\ org.apache.nutch.scoring.metadata* - + # # Parse Plugins # @@ -149,7 +133,7 @@ plugins.parse=\ org.apache.nutch.parse.swf*:\ org.apache.nutch.parse.tika:\ org.apache.nutch.parse.zip - + # # Parse Filter Plugins # @@ -216,4 +200,3 @@ plugins.misc=\ org.creativecommons.nutch*:\ org.apache.nutch.microformats.reltag*:\ org.apache.nutch.any23* - From dd57dee3ecb3cbf45e3a5585b4a8db94861caf19 Mon Sep 17 00:00:00 2001 From: Lily Perry Date: Mon, 4 Apr 2022 16:58:11 -0700 Subject: [PATCH 21/55] Update settings.gradle.kts Trying to verify that a plugin can be built using 'gradle build' command. --- settings.gradle.kts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index e81e7b41e5..e3a5730512 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,4 +25,6 @@ */ rootProject.name = "nutch" -include("src:plugin:sample-plugin","src:plugin:tld" ) \ No newline at end of file +includeBuild("src/plugin/sample-plugin") +includeBuild("src/plugin/tld") +includeBuild("src/plugin/language-identifier") From af532873209d0c76a25d1723d2109dedfdf42095 Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sun, 10 Apr 2022 22:24:13 -0700 Subject: [PATCH 22/55] Update build.gradle.kts --- build.gradle.kts | 69 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 73f07106e7..15f7e838d7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -73,7 +73,7 @@ ant.importBuild("build.xml") {old ->"ant-${old}"} // the normal classpath val classpathCollection: FileCollection = layout.files( - file(project.properties["build.classes"]), + file("${project.properties["build.classes"]}"), fileTree(mapOf("dir" to project.properties["build.lib.dir"], "include" to listOf("*.jar"))) ) val classpath: String = classpathCollection.asPath @@ -83,15 +83,15 @@ tasks.register("init-nutch") { description = "Stuff required by all targets" doLast { // making six directories - mkdir(project.properties["build.dir"]) - mkdir(project.properties["build.classes"]) - mkdir(project.properties["release.dir"]) - mkdir(project.properties["test.build.dir"]) - mkdir(project.properties["test.build.classes"]) - mkdir(project.properties["test.build.lib.dir"]) + mkdir("${project.properties["build.dir"]}") + mkdir("${project.properties["build.classes"]}") + mkdir("${project.properties["release.dir"]}") + mkdir("${project.properties["test.build.dir"]}") + mkdir("${project.properties["test.build.classes"]}") + mkdir("${project.properties["test.build.lib.dir"]}") // renaming from *.template to * for all files in folders in conf.dir - fileTree(project.properties["conf.dir"]).matching { include("**/*.template") }.forEach { file: File -> + fileTree("${project.properties["conf.dir"]}").matching { include("**/*.template") }.forEach { file: File -> rename { fileName: String -> fileName.replace(".template", "") } @@ -204,4 +204,57 @@ tasks.register("runtime") commandLine("chmod","ugo+x","${project.properties["runtime.local"]}/bin") } } +} + +tasks.register("job") +{ + description = "make nutch.job jar" + dependsOn("compile") + from( + zipTree("${project.properties["build.classes"]}").matching { + exclude("nutch-default.xml","nutch-site.xml") + }, + zipTree("${project.properties["conf.dir"]}").matching { + exclude("*.template","hadoop*.*") + }, + zipTree("${project.properties["build.lib.dir"]}").matching { + eachFile { + relativePath = RelativePath(true,"lib") + } + include("**/*.jar") + exclude("hadoop-*.jar,slf4j*.jar","log4j*.jar") + }, + zipTree("${project.properties["build.plugins"]}").matching { + eachFile { + relativePath = RelativePath(true,"classes","plugins") + } + } + ) + into(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")) +} + +tasks.register("compile-core-test") +{ + description = "compile test code" + dependsOn("init-nutch","compile-core","resolve-test") + source = fileTree(layout.buildDirectory.dir("${project.properties["test.src.dir"]}")) + include("org/apache/nutch/**/*.java") + destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.classes"]}")) + classpath = classpathCollection + sourceCompatibility = "${project.properties["javac.version"]}" + targetCompatibility = "${project.properties["javac.version"]}" + + options.annotationProcessorPath = classpathCollection + options.sourcepath = layout.files("${project.properties["src.dir"]}") + options.compilerArgs.add("-Xlint:-path") + options.isDebug = "${project.properties["javac.debug"]}" == "on" + options.encoding = "${project.properties["build.encoding"]}" + options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" + //TODO No optimize flag in Gradle, consider deleting option in gradle.properties +} + +tasks.test.configure() +{ + description = "run JUnit tests" + dependsOn("test-core","test-plugins") } \ No newline at end of file From 5581faf9cfd41d6976d5d94c20abe15fb3bab59e Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sun, 10 Apr 2022 22:35:51 -0700 Subject: [PATCH 23/55] NUTCH 2940 Develop Gradle Core Build for Apache Nutch test classpath, and tasks for targets compile, compile-core, proxy, benchmark --- build.gradle.kts | 79 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ef9e135499..cf31570ef9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -73,7 +73,19 @@ val classpathCollection: FileCollection = layout.files( file(project.properties["build.classes"]), fileTree(mapOf("dir" to project.properties["build.lib.dir"], "include" to listOf("*.jar"))) ) -val classpath: String = classpathCollection.asPath +val classPath: String = classpathCollection.asPath + +// test classpath +val testClasspathCollection: FileCollection = layout.files( + file(project.properties["test.build.classes"]), + file(project.properties["conf.dir"]), + file(project.properties["test.src.dir"]), + file(project.properties["build.plugins"]), // plugins.classpath.dir + classpathCollection, + file(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")), + fileTree(mapOf("dir" to project.properties["build.lib.dir"], "include" to listOf("*.jar"))), + fileTree(mapOf("dir" to project.properties["test.build.lib.dir"], "include" to listOf("*.jar"))) +) // ant target "init" renamed to "init-nutch" to avoid gradle naming conflits tasks.register("init-nutch") { @@ -96,6 +108,69 @@ tasks.register("init-nutch") { } } +tasks.register("compile") +{ + description = "Compile all Java files" + dependsOn("compile-core","compile-plugins") +} + +tasks.register("compile-core") +{ + description = "Compile core Java files only" + dependsOn("init-nutch","resolve-default") + + source = fileTree(layout.buildDirectory.dir("${project.properties["src.dir"]}")) + include("org/apache/nutch/**/*.java") + destinationDirectory.set(layout.buildDirectory.dir("${project.properties["build.classes"]}")) + classpath = classpathCollection + sourceCompatibility = "${project.properties["javac.version"]}" + targetCompatibility = "${project.properties["javac.version"]}" + + options.annotationProcessorPath = classpathCollection + options.sourcepath = layout.files("${project.properties["src.dir"]}") + options.compilerArgs.add("-Xlint-path") + options.encoding = "${project.properties["build.encoding"]}" + options.isDebug = "${project.properties["javac.debug"]}" == "on" + options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" + + // Deprecated? + // options.isOptimize = "${project.properties["javac.optimize"]}" == "on" + + copy { + from(layout.buildDirectory.dir("${project.properties["src.dir"]}")) + include("**/*.html") + include("**/*.css") + include("**/*.properties") + into(layout.buildDirectory.dir("${project.properties["build.classes"]}")) + } +} + +tasks.register("proxy") +{ + description = "Run nutch proxy" + dependsOn("compile-core-test","job") + + mainClass.set("org.apache.nutch.tools.proxy.ProxyTestbed") + classpath = testClasspathCollection + args("-fake") + jvmArgs("-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl") +} + +tasks.register("benchmark") +{ + description = "Run nutch benchmarking analysis" + + mainClass.set("org.apache.nutch.tools.Benchmark") + classpath = testClasspathCollection + jvmArgs("-Xmx512m -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl") + args("-maxPerHost") + args("10") + args("-seeds") + args("1") + args("-depth") + args("5") +} + tasks.register("clean-default-lib") { description = "Clean the project libraries directory (dependencies)" @@ -137,7 +212,7 @@ tasks.register("copy-libs") tasks.register("compile-plugins") { description = "compile plugins only" - dependsOn("init","resolve-default") + dependsOn("init-nutch","resolve-default") //TODO Once plugins are finished, uncomment the following lines: // dir = file("src/plugin") // tasks = listOf("deploy") From 8763aff4e23cf4f2c067a3cfb6cd3d22df30a064 Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Tue, 12 Apr 2022 11:01:26 -0700 Subject: [PATCH 24/55] Removed javac optimize option --- build.gradle.kts | 1 - gradle.properties | 1 - 2 files changed, 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 15f7e838d7..ca04a1ff5a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -250,7 +250,6 @@ tasks.register("compile-core-test") options.isDebug = "${project.properties["javac.debug"]}" == "on" options.encoding = "${project.properties["build.encoding"]}" options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" - //TODO No optimize flag in Gradle, consider deleting option in gradle.properties } tasks.test.configure() diff --git a/gradle.properties b/gradle.properties index 5de7b0c09b..f0fc90d901 100644 --- a/gradle.properties +++ b/gradle.properties @@ -54,7 +54,6 @@ src.dist.version.dir=./dist/apache-nutch-1.19-SNAPSHOT-src bin.dist.version.dir=./dist/apache-nutch-1.19-SNAPSHOT-bin javac.debug=on -javac.optimize=on javac.deprecation=on javac.version=11 From c84c36062f5db5ecdf19869faeb78fa64ea0698a Mon Sep 17 00:00:00 2001 From: James Simmons Date: Thu, 21 Apr 2022 11:04:12 -0700 Subject: [PATCH 25/55] NUTCH 2940 Develop Gradle Core Build for Apache Nutch pushing for testing purposes --- build.gradle.kts | 98 ++++++++++++++++++++++++++++++++++++++--------- gradle.properties | 2 - 2 files changed, 80 insertions(+), 20 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cf31570ef9..2dd5265e3c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -80,7 +80,7 @@ val testClasspathCollection: FileCollection = layout.files( file(project.properties["test.build.classes"]), file(project.properties["conf.dir"]), file(project.properties["test.src.dir"]), - file(project.properties["build.plugins"]), // plugins.classpath.dir + file(project.properties["build.plugins"]), classpathCollection, file(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")), fileTree(mapOf("dir" to project.properties["build.lib.dir"], "include" to listOf("*.jar"))), @@ -90,24 +90,29 @@ val testClasspathCollection: FileCollection = layout.files( // ant target "init" renamed to "init-nutch" to avoid gradle naming conflits tasks.register("init-nutch") { description = "Stuff required by all targets" - doLast { - // making six directories - mkdir(project.properties["build.dir"]) - mkdir(project.properties["build.classes"]) - mkdir(project.properties["release.dir"]) - mkdir(project.properties["test.build.dir"]) - mkdir(project.properties["test.build.classes"]) - mkdir(project.properties["test.build.lib.dir"]) - - // renaming from *.template to * for all files in folders in conf.dir - fileTree(project.properties["conf.dir"]).matching { include("**/*.template") }.forEach { file: File -> - rename { fileName: String -> - fileName.replace(".template", "") - } + + // making six directories + mkdir(project.properties["build.dir"]) + mkdir(project.properties["build.classes"]) + mkdir("${project.properties["build.dir"]}/release") + mkdir(project.properties["test.build.dir"]) + mkdir(project.properties["test.build.classes"]) + mkdir(project.properties["test.build.lib.dir"]) + + // renaming from *.template to * for all files in folders in conf.dir + fileTree(project.properties["conf.dir"]).matching { include("**/*.template") }.forEach { file: File -> + rename { fileName: String -> + fileName.replace(".template", "") } } } +tasks.register("resolve-default") +{ + description = "Resolve and retrieve dependencies" + dependsOn("clean-default-lib","init-nutch","copy-libs") +} + tasks.register("compile") { description = "Compile all Java files" @@ -133,9 +138,6 @@ tasks.register("compile-core") options.isDebug = "${project.properties["javac.debug"]}" == "on" options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" - // Deprecated? - // options.isOptimize = "${project.properties["javac.optimize"]}" == "on" - copy { from(layout.buildDirectory.dir("${project.properties["src.dir"]}")) include("**/*.html") @@ -171,6 +173,14 @@ tasks.register("benchmark") args("5") } +/* +tasks.javadoc { + description = "Generate Javadoc" + mkdir("${project.properties["build.javadoc"]}") + mkdir("${project.properties["build.javadoc"]}/resources") +} +*/ + tasks.register("clean-default-lib") { description = "Clean the project libraries directory (dependencies)" @@ -276,4 +286,56 @@ tasks.register("runtime") commandLine("chmod","ugo+x","${project.properties["runtime.local"]}/bin") } } +} + +tasks.register("job") +{ + description = "make nutch.job jar" + dependsOn("compile") + from( + zipTree("${project.properties["build.classes"]}").matching { + exclude("nutch-default.xml","nutch-site.xml") + }, + zipTree("${project.properties["conf.dir"]}").matching { + exclude("*.template","hadoop*.*") + }, + zipTree("${project.properties["build.lib.dir"]}").matching { + eachFile { + relativePath = RelativePath(true,"lib") + } + include("**/*.jar") + exclude("hadoop-*.jar,slf4j*.jar","log4j*.jar") + }, + zipTree("${project.properties["build.plugins"]}").matching { + eachFile { + relativePath = RelativePath(true,"classes","plugins") + } + } + ) + into(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")) +} + +tasks.register("compile-core-test") +{ + description = "compile test code" + dependsOn("init-nutch","compile-core","resolve-test") + source = fileTree(layout.buildDirectory.dir("${project.properties["test.src.dir"]}")) + include("org/apache/nutch/**/*.java") + destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.classes"]}")) + classpath = classpathCollection + sourceCompatibility = "${project.properties["javac.version"]}" + targetCompatibility = "${project.properties["javac.version"]}" + + options.annotationProcessorPath = classpathCollection + options.sourcepath = layout.files("${project.properties["src.dir"]}") + options.compilerArgs.add("-Xlint:-path") + options.isDebug = "${project.properties["javac.debug"]}" == "on" + options.encoding = "${project.properties["build.encoding"]}" + options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" +} + +tasks.test.configure() +{ + description = "run JUnit tests" + dependsOn("test-core","test-plugins") } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 5de7b0c09b..23b25292cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -54,7 +54,6 @@ src.dist.version.dir=./dist/apache-nutch-1.19-SNAPSHOT-src bin.dist.version.dir=./dist/apache-nutch-1.19-SNAPSHOT-bin javac.debug=on -javac.optimize=on javac.deprecation=on javac.version=11 @@ -81,7 +80,6 @@ plugins.protocol=\ org.apache.nutch.protocol.okhttp*:\ org.apache.nutch.protocol.selenium*:\ org.apache.nutch.protocol.htmlunit*:\ - # # URL Filter Plugins # From 4ef628b6092334e268767daeb83e5a753d02fcb4 Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Thu, 21 Apr 2022 15:28:09 -0700 Subject: [PATCH 26/55] Fixed strings --- build.gradle.kts | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d856f65a6f..cdf3778185 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -80,10 +80,10 @@ val classPath: String = classpathCollection.asPath // test classpath val testClasspathCollection: FileCollection = layout.files( - file(project.properties["test.build.classes"]), - file(project.properties["conf.dir"]), - file(project.properties["test.src.dir"]), - file(project.properties["build.plugins"]), + file("${project.properties["test.build.classes"]}"), + file("${project.properties["conf.dir"]}"), + file("${project.properties["test.src.dir"]}"), + file("${project.properties["build.plugins"]}"), classpathCollection, file(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")), fileTree(mapOf("dir" to project.properties["build.lib.dir"], "include" to listOf("*.jar"))), @@ -95,15 +95,15 @@ tasks.register("init-nutch") { description = "Stuff required by all targets" // making six directories - mkdir(project.properties["build.dir"]) - mkdir(project.properties["build.classes"]) + mkdir("${project.properties["build.dir"]}") + mkdir("${project.properties["build.classes"]}") mkdir("${project.properties["build.dir"]}/release") - mkdir(project.properties["test.build.dir"]) - mkdir(project.properties["test.build.classes"]) - mkdir(project.properties["test.build.lib.dir"]) + mkdir("${project.properties["test.build.dir"]}") + mkdir("${project.properties["test.build.classes"]}") + mkdir("${project.properties["test.build.lib.dir"]}") // renaming from *.template to * for all files in folders in conf.dir - fileTree(project.properties["conf.dir"]).matching { include("**/*.template") }.forEach { file: File -> + fileTree("${project.properties["conf.dir"]}").matching { include("**/*.template") }.forEach { file: File -> rename { fileName: String -> fileName.replace(".template", "") } @@ -245,15 +245,15 @@ tasks.jar { description = "Make nutch.jar" dependsOn("compile-core") - from(layout.buildDirectory.dir("${project.properties["conf.dir"]}/nutch-default.xml")) - into(layout.buildDirectory.dir("${project.properties["build.classes"]}")) + from("${project.properties["conf.dir"]}/nutch-default.xml") + into("${project.properties["build.classes"]}") - from(layout.buildDirectory.dir("${project.properties["conf.dir"]}/nutch-site.xml")) - into(layout.buildDirectory.dir("${project.properties["build.classes"]}")) + from("${project.properties["conf.dir"]}/nutch-site.xml") + into("${project.properties["build.classes"]}") //TODO this is meant to replace destinationDirectory.set(file("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")) - from(layout.buildDirectory.dir(project.properties["build.classes"] as String)) + from(project.properties["build.classes"] as String) } tasks.register("runtime") From a03167d59d7cd56d2f34fde9057b235ef8413a9e Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Fri, 22 Apr 2022 13:43:44 -0700 Subject: [PATCH 27/55] Fixed issues with job target --- build.gradle.kts | 12 +++++++----- settings.gradle.kts | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cdf3778185..90a7768db5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -303,29 +303,31 @@ tasks.register("runtime") tasks.register("job") { + //TODO there is no support to create a ".job" directly description = "Make nutch.job jar" dependsOn("compile") + from( - zipTree("${project.properties["build.classes"]}").matching { + files("${project.properties["build.classes"]}") { exclude("nutch-default.xml","nutch-site.xml") }, - zipTree("${project.properties["conf.dir"]}").matching { + files("${project.properties["conf.dir"]}") { exclude("*.template","hadoop*.*") }, - zipTree("${project.properties["build.lib.dir"]}").matching { + files("${project.properties["build.lib.dir"]}") { eachFile { relativePath = RelativePath(true,"lib") } include("**/*.jar") exclude("hadoop-*.jar,slf4j*.jar","log4j*.jar") }, - zipTree("${project.properties["build.plugins"]}").matching { + files("${project.properties["build.plugins"]}") { eachFile { relativePath = RelativePath(true,"classes","plugins") } } ) - into(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")) + into("${project.properties["build.dir"]}/${project.properties["final.name"]}.job") } tasks.register("compile-core-test") diff --git a/settings.gradle.kts b/settings.gradle.kts index e3a5730512..4e80f4a8fe 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,6 +25,8 @@ */ rootProject.name = "nutch" +/* TODO uncomment when plugins are completed includeBuild("src/plugin/sample-plugin") includeBuild("src/plugin/tld") includeBuild("src/plugin/language-identifier") +*/ \ No newline at end of file From 213bb13af7390120d24d52eb8f9b50bca7ecbb8c Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Fri, 22 Apr 2022 14:14:16 -0700 Subject: [PATCH 28/55] NUTCH-2943 Implement core dependencies in build.gradle.kts --- build.gradle.kts | 210 ++++++++++++++++++++++++++++---------------- gradle.properties | 71 +++++++-------- settings.gradle.kts | 83 ++++++++++++++++- 3 files changed, 248 insertions(+), 116 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d856f65a6f..05d7787ca8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,35 +15,88 @@ * limitations under the License. */ -/* - * This file was generated by the Gradle 'init' task. - * - * This generated file contains a sample Java application project to get you started. - * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle - * User Manual available at https://docs.gradle.org/7.0.2/userguide/building_java_projects.html - */ - plugins { - // Apply the application plugin to add support for building a CLI application in Java. `maven-publish` application java - } - - repositories { - // Use Maven Central for resolving dependencies. mavenCentral() } dependencies { - // Use JUnit test framework. - testImplementation("junit:junit:4.13.1") + val cxfVersion by extra { "3.4.1" } + val hadoopVersion by extra { "3.1.3" } + val jacksonVersion by extra { "2.12.0" } + val log4j2Version by extra { "2.17.0" } + val mortbayJettyVersion by extra { "6.1.26" } + + implementation("com.ibm.icu:icu4j:68.2") + implementation("com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}") + implementation("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}") + implementation("com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${jacksonVersion}") + implementation("com.github.crawler-commons:crawler-commons:1.2") + implementation("com.google.code.gson:gson:2.8.9") + implementation("com.google.guava:guava:30.1-jre") + implementation("com.martinkl.warc:warc-hadoop:0.1.0") { + exclude(module="hadoop-client") + } + implementation("com.rabbitmq:amqp-client:5.2.0") + implementation("com.tdunning:t-digest:3.2") + implementation("commons-codec:commons-codec:1.15") + implementation("de.vandermeer:asciitable:0.3.2") + implementation("org.apache.commons:commons-collections4:4.4") + implementation("org.apache.commons:commons-compress:1.21") + implementation("org.apache.commons:commons-jexl3:3.1") + implementation("org.apache.commons:commons-lang3:3.12.0") + implementation("org.apache.cxf:cxf-rt-frontend-jaxrs:${cxfVersion}") + implementation("org.apache.cxf:cxf-rt-frontend-jaxws:${cxfVersion}") + implementation("org.apache.cxf:cxf-rt-transports-http:${cxfVersion}") + implementation("org.apache.cxf:cxf-rt-transports-http-jetty:${cxfVersion}") + implementation("org.apache.hadoop:hadoop-common:${hadoopVersion}") { + exclude("ant", "ant") + exclude("hsqldb", "hsqldb") + exclude("net.java.dev.jets3t", "jets3t") + exclude("net.sf.kosmosfs", "kfs") + exclude("org.eclipse.jdt", "core") + exclude("org.mortbay.jetty", "jsp-*") + } + implementation("org.apache.hadoop:hadoop-hdfs:${hadoopVersion}") + implementation("org.apache.hadoop:hadoop-mapreduce-client-core:${hadoopVersion}") + implementation("org.apache.hadoop:hadoop-mapreduce-client-jobclient:${hadoopVersion}") + implementation("org.apache.httpcomponents:httpcore:4.4.14") + implementation("org.apache.httpcomponents:httpcore-nio:4.4.9") + implementation("org.apache.httpcomponents:httpclient:4.5.13") + implementation("org.apache.logging.log4j:log4j-api:${log4j2Version}") + implementation("org.apache.logging.log4j:log4j-core:${log4j2Version}") + implementation("org.apache.logging.log4j:log4j-slf4j-impl:${log4j2Version}") + implementation("org.apache.tika:tika-core:2.2.1") + implementation("org.mortbay.jetty:jetty:${mortbayJettyVersion}") + implementation("org.netpreserve.commons:webarchive-commons:1.1.9") { + exclude(group="com.google.guava") + exclude("it.unimi.dsi", "dsiutils") + because("Incompatible LGPL 2.1 licence; exclusion disables support of WARC generation by 'bin/nutch commoncrawldump -warc ...'. Remove this exclusion and recompile Nutch to generate WARC files using the 'commoncrawldump' tool.") + exclude(group="junit") + exclude(module="hadoop-core") + exclude("org.gnu.inet", "libidn") + because("Incompatible LGPL 2.1 licence; exclusion disables support of WARC generation by 'bin/nutch commoncrawldump -warc ...'. Remove this exclusion and recompile Nutch to generate WARC files using the 'commoncrawldump' tool.") + exclude(group="org.json") + because("Incompatible JSON licence.") + } + implementation("org.slf4j:slf4j-api:1.7.35") + implementation("xerces:xercesImpl:2.12.1") + implementation("xml-apis:xml-apis:1.4.01") { + because("Force this version as it is required by Tika.") + } - // This dependency is used by the application. - implementation("com.google.guava:guava:30.0-jre") + testImplementation("junit:junit:4.13.2") + testImplementation("org.apache.cxf:cxf-rt-rs-client:${cxfVersion}") + testImplementation("org.apache.mrunit:mrunit:1.1.0:hadoop2") { + exclude("log4j", "log4j") + } + testImplementation("org.mortbay.jetty:jetty-client:${mortbayJettyVersion}") } application { @@ -68,8 +121,25 @@ publishing { } } -//TODO delete once Gradle build system is fully implemented -// ant.importBuild("build.xml") {old ->"ant-${old}"} +configurations { + implementation { + resolutionStrategy.failOnVersionConflict() + } +} + +configurations.all { + exclude(group="com.thoughtworks.xstream") + exclude(module="jms") + exclude(module="jmx-tools") + exclude(module="jmxri") + exclude(module="log4j") + exclude(module="slf4j-log4j12") +} + +configure { + sourceCompatibility=JavaVersion.VERSION_11 + targetCompatibility=JavaVersion.VERSION_11 +} // the normal classpath val classpathCollection: FileCollection = layout.files( @@ -80,50 +150,47 @@ val classPath: String = classpathCollection.asPath // test classpath val testClasspathCollection: FileCollection = layout.files( - file(project.properties["test.build.classes"]), - file(project.properties["conf.dir"]), - file(project.properties["test.src.dir"]), - file(project.properties["build.plugins"]), + file("${project.properties["test.build.classes"]}"), + file("${project.properties["conf.dir"]}"), + file("${project.properties["test.src.dir"]}"), + file("${project.properties["build.plugins"]}"), classpathCollection, file(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")), fileTree(mapOf("dir" to project.properties["build.lib.dir"], "include" to listOf("*.jar"))), fileTree(mapOf("dir" to project.properties["test.build.lib.dir"], "include" to listOf("*.jar"))) ) -// ant target "init" renamed to "init-nutch" to avoid gradle naming conflits +// legacy ant target "init" renamed to "init-nutch" to avoid gradle naming conflicts tasks.register("init-nutch") { description = "Stuff required by all targets" // making six directories - mkdir(project.properties["build.dir"]) - mkdir(project.properties["build.classes"]) + mkdir("${project.properties["build.dir"]}") + mkdir("${project.properties["build.classes"]}") mkdir("${project.properties["build.dir"]}/release") - mkdir(project.properties["test.build.dir"]) - mkdir(project.properties["test.build.classes"]) - mkdir(project.properties["test.build.lib.dir"]) + mkdir("${project.properties["test.build.dir"]}") + mkdir("${project.properties["test.build.classes"]}") + mkdir("${project.properties["test.build.lib.dir"]}") // renaming from *.template to * for all files in folders in conf.dir - fileTree(project.properties["conf.dir"]).matching { include("**/*.template") }.forEach { file: File -> + fileTree("${project.properties["conf.dir"]}").matching { include("**/*.template") }.forEach { file: File -> rename { fileName: String -> fileName.replace(".template", "") } } } -tasks.register("resolve-default") -{ +tasks.register("resolve-default") { description = "Resolve and retrieve dependencies" dependsOn("clean-default-lib","init-nutch","copy-libs") } -tasks.register("compile") -{ +tasks.register("compile") { description = "Compile all Java files" dependsOn("compile-core","compile-plugins") } -tasks.register("compile-core") -{ +tasks.register("compile-core") { description = "Compile core Java files only" dependsOn("init-nutch","resolve-default") @@ -150,8 +217,7 @@ tasks.register("compile-core") } } -tasks.register("proxy") -{ +tasks.register("proxy") { description = "Run nutch proxy" dependsOn("compile-core-test","job") @@ -161,8 +227,7 @@ tasks.register("proxy") jvmArgs("-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl") } -tasks.register("benchmark") -{ +tasks.register("benchmark") { description = "Run nutch benchmarking analysis" mainClass.set("org.apache.nutch.tools.Benchmark") @@ -176,13 +241,12 @@ tasks.register("benchmark") args("5") } -/* -tasks.javadoc { - description = "Generate Javadoc" - mkdir("${project.properties["build.javadoc"]}") - mkdir("${project.properties["build.javadoc"]}/resources") -} -*/ +// tasks.javadoc { +// description = "Generate Javadoc" +// dependsOn("compile") +// mkdir("${project.properties["build.javadoc"]}") +// mkdir("${project.properties["build.javadoc"]}/resources") +// } tasks.clean { description = "Clean the project" @@ -194,46 +258,40 @@ tasks.register("clean-lib") { dependsOn("clean-default-lib","clean-test-lib") } -tasks.register("clean-default-lib") -{ +tasks.register("clean-default-lib") { description = "Clean the project libraries directory (dependencies)" delete("${project.properties["build.lib.dir"]}") } -tasks.register("clean-test-lib") -{ +tasks.register("clean-test-lib") { description = "Clean the project test libraries directory (dependencies)" delete("${project.properties["test.build.lib.dir"]}") } -tasks.register("clean-build") -{ +tasks.register("clean-build") { description = "Clean the project built files" delete("${project.properties["build.dir"]}") } -tasks.register("clean-dist") -{ +tasks.register("clean-dist") { description = "Clean the project dist files" delete("${project.properties["dist.dir"]}") } -tasks.register("clean-runtime") -{ +tasks.register("clean-runtime") { description = "Clean the project runtime area" delete("${project.properties["runtime.dir"]}") } -tasks.register("copy-libs") -{ +tasks.register("copy-libs") { description = "Copy the libs in lib" - from(layout.buildDirectory.dir("${project.properties["lib.dir"]}")) - include("**/*.jar") - into(layout.buildDirectory.dir("${project.properties["build.lib.dir"]}")) + from("${project.properties["lib.dir"]}") { + include("**/*.jar") + } + into("${project.properties["build.lib.dir"]}") } -tasks.register("compile-plugins") -{ +tasks.register("compile-plugins") { description = "Compile plugins only" dependsOn("init-nutch","resolve-default") //TODO Once plugins are finished, uncomment the following lines: @@ -245,15 +303,15 @@ tasks.jar { description = "Make nutch.jar" dependsOn("compile-core") - from(layout.buildDirectory.dir("${project.properties["conf.dir"]}/nutch-default.xml")) - into(layout.buildDirectory.dir("${project.properties["build.classes"]}")) + from("${project.properties["conf.dir"]}/nutch-default.xml") + into("${project.properties["build.classes"]}") - from(layout.buildDirectory.dir("${project.properties["conf.dir"]}/nutch-site.xml")) - into(layout.buildDirectory.dir("${project.properties["build.classes"]}")) + from("${project.properties["conf.dir"]}/nutch-site.xml") + into("${project.properties["build.classes"]}") //TODO this is meant to replace destinationDirectory.set(file("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")) - from(layout.buildDirectory.dir(project.properties["build.classes"] as String)) + from(project.properties["build.classes"] as String) } tasks.register("runtime") @@ -303,29 +361,31 @@ tasks.register("runtime") tasks.register("job") { + //TODO there is no support to create a ".job" directly description = "Make nutch.job jar" dependsOn("compile") + from( - zipTree("${project.properties["build.classes"]}").matching { + files("${project.properties["build.classes"]}") { exclude("nutch-default.xml","nutch-site.xml") }, - zipTree("${project.properties["conf.dir"]}").matching { + files("${project.properties["conf.dir"]}") { exclude("*.template","hadoop*.*") }, - zipTree("${project.properties["build.lib.dir"]}").matching { + files("${project.properties["build.lib.dir"]}") { eachFile { relativePath = RelativePath(true,"lib") } include("**/*.jar") exclude("hadoop-*.jar,slf4j*.jar","log4j*.jar") }, - zipTree("${project.properties["build.plugins"]}").matching { + files("${project.properties["build.plugins"]}") { eachFile { relativePath = RelativePath(true,"classes","plugins") } } ) - into(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")) + into("${project.properties["build.dir"]}/${project.properties["final.name"]}.job") } tasks.register("compile-core-test") @@ -351,4 +411,4 @@ tasks.test.configure() { description = "Run JUnit tests" dependsOn("test-core","test-plugins") -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 23b25292cf..ff81e3cd95 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,48 +18,43 @@ version=1.19-SNAPSHOT final.name=apache-nutch-1.19-SNAPSHOT year=2022 -basedir = ./ -src.dir = ./src/java -lib.dir = ./lib -conf.dir = ./conf -plugins.dir = ./src/plugin - -build.dir = ./build -build.classes = ./build/classes -build.plugins = ./build/plugins -build.javadoc = ./build/docs/api +src.dir = src/java +lib.dir = lib +conf.dir = conf +plugins.dir = src/plugin + +build.dir = build +build.classes = build/classes +build.plugins = build/plugins +build.javadoc = build/docs/api build.encoding = UTF-8 -build.lib.dir=./build/lib - -test.src.dir = ./src/test -test.build.dir = ./build/test -test.build.lib.dir = ./build/test/lib -test.build.data = ./build/test/data -test.build.classes = ./build/test/classes -test.build.javadoc = ./build/test/docs/api +build.lib.dir = build/lib + +test.src.dir = src/test +test.build.dir = build/test +test.build.lib.dir = build/test/lib +test.build.data = build/test/data +test.build.classes = build/test/classes +test.build.javadoc = build/test/docs/api test.junit.output.format = plain # Proxy Host and Port to use for building JavaDoc -javadoc.proxy.host=-J-DproxyHost= -javadoc.proxy.port=-J-DproxyPort= -javadoc.link.java=https://docs.oracle.com/en/java/javase/11/docs/api/ -javadoc.link.hadoop=https://hadoop.apache.org/docs/r3.1.3/api/ -#javadoc.link.lucene.core=https://lucene.apache.org/core/8_4_1/core/ -#javadoc.link.lucene.analyzers-common=https://lucene.apache.org/core/8_4_1/analyzers-common/ -#javadoc.link.solr-solrj=https://lucene.apache.org/solr/8_4_1/solr-solrj/ -javadoc.packages=org.apache.nutch.* - -dist.dir=./dist -src.dist.version.dir=./dist/apache-nutch-1.19-SNAPSHOT-src -bin.dist.version.dir=./dist/apache-nutch-1.19-SNAPSHOT-bin - -javac.debug=on -javac.deprecation=on -javac.version=11 - -runtime.dir=./runtime -runtime.deploy=./runtime/deploy -runtime.local=./runtime/local +javadoc.proxy.host = -J-DproxyHost= +javadoc.proxy.port = -J-DproxyPort= +javadoc.link.java = https://docs.oracle.com/en/java/javase/11/docs/api/ +javadoc.link.hadoop = https://hadoop.apache.org/docs/r3.1.3/api/ +javadoc.packages = org.apache.nutch.* + +dist.dir= dist +src.dist.version.dir = dist/apache-nutch-1.19-SNAPSHOT-src +bin.dist.version.dir = dist/apache-nutch-1.19-SNAPSHOT-bin + +javac.debug = true +javac.deprecation = true + +runtime.dir = runtime +runtime.deploy = runtime/deploy +runtime.local = runtime/local # # Plugins API diff --git a/settings.gradle.kts b/settings.gradle.kts index e3a5730512..9c0a11ddeb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,6 +25,83 @@ */ rootProject.name = "nutch" -includeBuild("src/plugin/sample-plugin") -includeBuild("src/plugin/tld") -includeBuild("src/plugin/language-identifier") + +// includeBuild("src/plugin/any23") +// includeBuild("src/plugin/build-plugin.xml") +// includeBuild("src/plugin/creativecommons") +// includeBuild("src/plugin/exchange-jexl") +// includeBuild("src/plugin/feed") +// includeBuild("src/plugin/headings") +// includeBuild("src/plugin/index-anchor") +// includeBuild("src/plugin/index-basic") +// includeBuild("src/plugin/index-geoip") +// includeBuild("src/plugin/index-jexl-filter") +// includeBuild("src/plugin/index-links") +// includeBuild("src/plugin/index-metadata") +// includeBuild("src/plugin/index-more") +// includeBuild("src/plugin/index-replace") +// includeBuild("src/plugin/index-static") +// includeBuild("src/plugin/indexer-cloudsearch") +// includeBuild("src/plugin/indexer-csv") +// includeBuild("src/plugin/indexer-dummy") +// includeBuild("src/plugin/indexer-elastic") +// includeBuild("src/plugin/indexer-kafka") +// includeBuild("src/plugin/indexer-rabbit") +// includeBuild("src/plugin/indexer-solr") +// includeBuild("src/plugin/language-identifier") +// includeBuild("src/plugin/lib-htmlunit") +// includeBuild("src/plugin/lib-http") +// includeBuild("src/plugin/lib-nekohtml") +// includeBuild("src/plugin/lib-rabbitmq") +// includeBuild("src/plugin/lib-regex-filter") +// includeBuild("src/plugin/lib-selenium") +// includeBuild("src/plugin/lib-xml") +// includeBuild("src/plugin/microformats-reltag") +// includeBuild("src/plugin/mimetype-filter") +// includeBuild("src/plugin/nutch-extensionpoints") +// includeBuild("src/plugin/parse-ext") +// includeBuild("src/plugin/parse-html") +// includeBuild("src/plugin/parse-js") +// includeBuild("src/plugin/parse-metatags") +// includeBuild("src/plugin/parse-swf") +// includeBuild("src/plugin/parse-tika") +// includeBuild("src/plugin/parse-zip") +// includeBuild("src/plugin/parsefilter-debug") +// includeBuild("src/plugin/parsefilter-naivebayes") +// includeBuild("src/plugin/parsefilter-regex") +// includeBuild("src/plugin/protocol-file") +// includeBuild("src/plugin/protocol-foo") +// includeBuild("src/plugin/protocol-ftp") +// includeBuild("src/plugin/protocol-htmlunit") +// includeBuild("src/plugin/protocol-http") +// includeBuild("src/plugin/protocol-httpclient") +// includeBuild("src/plugin/protocol-interactiveselenium") +// includeBuild("src/plugin/protocol-okhttp") +// includeBuild("src/plugin/protocol-selenium") +// includeBuild("src/plugin/publish-rabbitmq") +// includeBuild("src/plugin/scoring-depth") +// includeBuild("src/plugin/scoring-link") +// includeBuild("src/plugin/scoring-metadata") +// includeBuild("src/plugin/scoring-opic") +// includeBuild("src/plugin/scoring-orphan") +// includeBuild("src/plugin/scoring-similarity") +// includeBuild("src/plugin/subcollection") +// includeBuild("src/plugin/tld") +// includeBuild("src/plugin/urlfilter-automaton") +// includeBuild("src/plugin/urlfilter-domain") +// includeBuild("src/plugin/urlfilter-domaindenylist") +// includeBuild("src/plugin/urlfilter-fast") +// includeBuild("src/plugin/urlfilter-ignoreexempt") +// includeBuild("src/plugin/urlfilter-prefix") +// includeBuild("src/plugin/urlfilter-regex") +// includeBuild("src/plugin/urlfilter-suffix") +// includeBuild("src/plugin/urlfilter-validator") +// includeBuild("src/plugin/urlmeta") +// includeBuild("src/plugin/urlnormalizer-ajax") +// includeBuild("src/plugin/urlnormalizer-basic") +// includeBuild("src/plugin/urlnormalizer-host") +// includeBuild("src/plugin/urlnormalizer-pass") +// includeBuild("src/plugin/urlnormalizer-protocol") +// includeBuild("src/plugin/urlnormalizer-querystring") +// includeBuild("src/plugin/urlnormalizer-regex") +// includeBuild("src/plugin/urlnormalizer-slash") From 2cd15ef489e3665c7e2fbab25510c4e5c2852430 Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Fri, 22 Apr 2022 14:20:51 -0700 Subject: [PATCH 29/55] NUTCH-2943 Implement core dependencies in build.gradle.kts --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 4458c68a9f..307ead3658 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ Apache Nutch README =================== -hello - For the latest information about Nutch, please visit our website at: From f70ed34d6e92010bd161bbd18770534ba31080da Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Fri, 22 Apr 2022 14:24:25 -0700 Subject: [PATCH 30/55] NUTCH-2943 Implement core dependencies in build.gradle.kts --- settings.gradle.kts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 9c0a11ddeb..5f6b6be4b8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,15 +15,6 @@ * limitations under the License. */ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user manual at https://docs.gradle.org/7.0.2/userguide/multi_project_builds.html - */ - rootProject.name = "nutch" // includeBuild("src/plugin/any23") From b48c2de7fc15dc1465f5134135b5310b170d6125 Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Fri, 22 Apr 2022 14:53:33 -0700 Subject: [PATCH 31/55] NUTCH-2943 Implement core dependencies in build.gradle.kts --- build.gradle.kts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 05d7787ca8..c0b94889c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -180,9 +180,12 @@ tasks.register("init-nutch") { } } -tasks.register("resolve-default") { +tasks.register("resolve-default") { description = "Resolve and retrieve dependencies" dependsOn("clean-default-lib","init-nutch","copy-libs") + from(configurations.compileClasspath) + from(configurations.runtimeClasspath) + into(layout.buildDirectory.dir("${project.properties["lib.dir"]}")) } tasks.register("compile") { From 504088b0d7798b42535ec0fc2a57cf0df1c78476 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sat, 23 Apr 2022 14:43:44 -0700 Subject: [PATCH 32/55] NUTCH 2940 Develop Gradle Core Build for Apache Nutch Fixing compile-core, PR for last bug with tmp bin --- build.gradle.kts | 243 +++++++++++++++++++++++++++++++---------------- 1 file changed, 160 insertions(+), 83 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2dd5265e3c..ab96bb3d18 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,32 +15,88 @@ * limitations under the License. */ -/* - * This file was generated by the Gradle 'init' task. - * - * This generated file contains a sample Java application project to get you started. - * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle - * User Manual available at https://docs.gradle.org/7.0.2/userguide/building_java_projects.html - */ - plugins { - // Apply the application plugin to add support for building a CLI application in Java. `maven-publish` application java } repositories { - // Use Maven Central for resolving dependencies. mavenCentral() } dependencies { - // Use JUnit test framework. - testImplementation("junit:junit:4.13.1") + val cxfVersion by extra { "3.4.1" } + val hadoopVersion by extra { "3.1.3" } + val jacksonVersion by extra { "2.12.0" } + val log4j2Version by extra { "2.17.0" } + val mortbayJettyVersion by extra { "6.1.26" } + + implementation("com.ibm.icu:icu4j:68.2") + implementation("com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}") + implementation("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}") + implementation("com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${jacksonVersion}") + implementation("com.github.crawler-commons:crawler-commons:1.2") + implementation("com.google.code.gson:gson:2.8.9") + implementation("com.google.guava:guava:30.1-jre") + implementation("com.martinkl.warc:warc-hadoop:0.1.0") { + exclude(module="hadoop-client") + } + implementation("com.rabbitmq:amqp-client:5.2.0") + implementation("com.tdunning:t-digest:3.2") + implementation("commons-codec:commons-codec:1.15") + implementation("de.vandermeer:asciitable:0.3.2") + implementation("org.apache.commons:commons-collections4:4.4") + implementation("org.apache.commons:commons-compress:1.21") + implementation("org.apache.commons:commons-jexl3:3.1") + implementation("org.apache.commons:commons-lang3:3.12.0") + implementation("org.apache.cxf:cxf-rt-frontend-jaxrs:${cxfVersion}") + implementation("org.apache.cxf:cxf-rt-frontend-jaxws:${cxfVersion}") + implementation("org.apache.cxf:cxf-rt-transports-http:${cxfVersion}") + implementation("org.apache.cxf:cxf-rt-transports-http-jetty:${cxfVersion}") + implementation("org.apache.hadoop:hadoop-common:${hadoopVersion}") { + exclude("ant", "ant") + exclude("hsqldb", "hsqldb") + exclude("net.java.dev.jets3t", "jets3t") + exclude("net.sf.kosmosfs", "kfs") + exclude("org.eclipse.jdt", "core") + exclude("org.mortbay.jetty", "jsp-*") + } + implementation("org.apache.hadoop:hadoop-hdfs:${hadoopVersion}") + implementation("org.apache.hadoop:hadoop-mapreduce-client-core:${hadoopVersion}") + implementation("org.apache.hadoop:hadoop-mapreduce-client-jobclient:${hadoopVersion}") + implementation("org.apache.httpcomponents:httpcore:4.4.14") + implementation("org.apache.httpcomponents:httpcore-nio:4.4.9") + implementation("org.apache.httpcomponents:httpclient:4.5.13") + implementation("org.apache.logging.log4j:log4j-api:${log4j2Version}") + implementation("org.apache.logging.log4j:log4j-core:${log4j2Version}") + implementation("org.apache.logging.log4j:log4j-slf4j-impl:${log4j2Version}") + implementation("org.apache.tika:tika-core:2.2.1") + implementation("org.mortbay.jetty:jetty:${mortbayJettyVersion}") + implementation("org.netpreserve.commons:webarchive-commons:1.1.9") { + exclude(group="com.google.guava") + exclude("it.unimi.dsi", "dsiutils") + because("Incompatible LGPL 2.1 licence; exclusion disables support of WARC generation by 'bin/nutch commoncrawldump -warc ...'. Remove this exclusion and recompile Nutch to generate WARC files using the 'commoncrawldump' tool.") + exclude(group="junit") + exclude(module="hadoop-core") + exclude("org.gnu.inet", "libidn") + because("Incompatible LGPL 2.1 licence; exclusion disables support of WARC generation by 'bin/nutch commoncrawldump -warc ...'. Remove this exclusion and recompile Nutch to generate WARC files using the 'commoncrawldump' tool.") + exclude(group="org.json") + because("Incompatible JSON licence.") + } + implementation("org.slf4j:slf4j-api:1.7.35") + implementation("xerces:xercesImpl:2.12.1") + implementation("xml-apis:xml-apis:1.4.01") { + because("Force this version as it is required by Tika.") + } - // This dependency is used by the application. - implementation("com.google.guava:guava:30.0-jre") + testImplementation("junit:junit:4.13.2") + testImplementation("org.apache.cxf:cxf-rt-rs-client:${cxfVersion}") + testImplementation("org.apache.mrunit:mrunit:1.1.0:hadoop2") { + exclude("log4j", "log4j") + } + testImplementation("org.mortbay.jetty:jetty-client:${mortbayJettyVersion}") } application { @@ -65,90 +121,107 @@ publishing { } } -//TODO delete once Gradle build system is fully implemented -ant.importBuild("build.xml") {old ->"ant-${old}"} +configurations { + implementation { + resolutionStrategy.failOnVersionConflict() + } +} + +configurations.all { + exclude(group="com.thoughtworks.xstream") + exclude(module="jms") + exclude(module="jmx-tools") + exclude(module="jmxri") + exclude(module="log4j") + exclude(module="slf4j-log4j12") +} + +configure { + sourceCompatibility=JavaVersion.VERSION_11 + targetCompatibility=JavaVersion.VERSION_11 +} // the normal classpath val classpathCollection: FileCollection = layout.files( - file(project.properties["build.classes"]), + file("${project.properties["build.classes"]}"), fileTree(mapOf("dir" to project.properties["build.lib.dir"], "include" to listOf("*.jar"))) ) val classPath: String = classpathCollection.asPath // test classpath val testClasspathCollection: FileCollection = layout.files( - file(project.properties["test.build.classes"]), - file(project.properties["conf.dir"]), - file(project.properties["test.src.dir"]), - file(project.properties["build.plugins"]), + file("${project.properties["test.build.classes"]}"), + file("${project.properties["conf.dir"]}"), + file("${project.properties["test.src.dir"]}"), + file("${project.properties["build.plugins"]}"), classpathCollection, file(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")), fileTree(mapOf("dir" to project.properties["build.lib.dir"], "include" to listOf("*.jar"))), fileTree(mapOf("dir" to project.properties["test.build.lib.dir"], "include" to listOf("*.jar"))) ) -// ant target "init" renamed to "init-nutch" to avoid gradle naming conflits +// legacy ant target "init" renamed to "init-nutch" to avoid gradle naming conflicts tasks.register("init-nutch") { description = "Stuff required by all targets" // making six directories - mkdir(project.properties["build.dir"]) - mkdir(project.properties["build.classes"]) + mkdir("${project.properties["build.dir"]}") + mkdir("${project.properties["build.classes"]}") mkdir("${project.properties["build.dir"]}/release") - mkdir(project.properties["test.build.dir"]) - mkdir(project.properties["test.build.classes"]) - mkdir(project.properties["test.build.lib.dir"]) + mkdir("${project.properties["test.build.dir"]}") + mkdir("${project.properties["test.build.classes"]}") + mkdir("${project.properties["test.build.lib.dir"]}") // renaming from *.template to * for all files in folders in conf.dir - fileTree(project.properties["conf.dir"]).matching { include("**/*.template") }.forEach { file: File -> + fileTree("${project.properties["conf.dir"]}").matching { include("**/*.template") }.forEach { file: File -> rename { fileName: String -> fileName.replace(".template", "") } } } -tasks.register("resolve-default") -{ +tasks.register("resolve-default") { description = "Resolve and retrieve dependencies" dependsOn("clean-default-lib","init-nutch","copy-libs") + from(configurations.compileClasspath) + from(configurations.runtimeClasspath) + into(layout.buildDirectory.dir("${project.properties["lib.dir"]}")) } -tasks.register("compile") -{ +tasks.register("compile") { description = "Compile all Java files" dependsOn("compile-core","compile-plugins") } -tasks.register("compile-core") -{ +tasks.register("compile-core") { description = "Compile core Java files only" dependsOn("init-nutch","resolve-default") - source = fileTree(layout.buildDirectory.dir("${project.properties["src.dir"]}")) + source = fileTree("${project.properties["src.dir"]}") include("org/apache/nutch/**/*.java") - destinationDirectory.set(layout.buildDirectory.dir("${project.properties["build.classes"]}")) + // destinationDirectory = DirectoryProperty("${project.properties["build.classes"]}") + destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.classes"]}")) classpath = classpathCollection sourceCompatibility = "${project.properties["javac.version"]}" targetCompatibility = "${project.properties["javac.version"]}" options.annotationProcessorPath = classpathCollection options.sourcepath = layout.files("${project.properties["src.dir"]}") - options.compilerArgs.add("-Xlint-path") + options.compilerArgs.add("-Xlint:-path") options.encoding = "${project.properties["build.encoding"]}" options.isDebug = "${project.properties["javac.debug"]}" == "on" options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" copy { - from(layout.buildDirectory.dir("${project.properties["src.dir"]}")) + from("${project.properties["src.dir"]}") include("**/*.html") include("**/*.css") include("**/*.properties") - into(layout.buildDirectory.dir("${project.properties["build.classes"]}")) + into("${project.properties["build.classes"]}") } } -tasks.register("proxy") -{ +tasks.register("proxy") { description = "Run nutch proxy" dependsOn("compile-core-test","job") @@ -158,8 +231,7 @@ tasks.register("proxy") jvmArgs("-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl") } -tasks.register("benchmark") -{ +tasks.register("benchmark") { description = "Run nutch benchmarking analysis" mainClass.set("org.apache.nutch.tools.Benchmark") @@ -173,55 +245,58 @@ tasks.register("benchmark") args("5") } -/* -tasks.javadoc { - description = "Generate Javadoc" - mkdir("${project.properties["build.javadoc"]}") - mkdir("${project.properties["build.javadoc"]}/resources") +// tasks.javadoc { +// description = "Generate Javadoc" +// dependsOn("compile") +// mkdir("${project.properties["build.javadoc"]}") +// mkdir("${project.properties["build.javadoc"]}/resources") +// } + +tasks.clean { + description = "Clean the project" + dependsOn("clean-build","clean-lib","clean-dist","clean-runtime") } -*/ -tasks.register("clean-default-lib") -{ +tasks.register("clean-lib") { + description = "Clean the project libraries directories (dependencies: default + test)" + dependsOn("clean-default-lib","clean-test-lib") +} + +tasks.register("clean-default-lib") { description = "Clean the project libraries directory (dependencies)" delete("${project.properties["build.lib.dir"]}") } -tasks.register("clean-test-lib") -{ +tasks.register("clean-test-lib") { description = "Clean the project test libraries directory (dependencies)" delete("${project.properties["test.build.lib.dir"]}") } -tasks.register("clean-build") -{ +tasks.register("clean-build") { description = "Clean the project built files" delete("${project.properties["build.dir"]}") } -tasks.register("clean-dist") -{ +tasks.register("clean-dist") { description = "Clean the project dist files" delete("${project.properties["dist.dir"]}") } -tasks.register("clean-runtime") -{ +tasks.register("clean-runtime") { description = "Clean the project runtime area" delete("${project.properties["runtime.dir"]}") } -tasks.register("copy-libs") -{ - description = "copy the libs in lib" - from(layout.buildDirectory.dir("${project.properties["lib.dir"]}")) - include("**/*.jar") - into(layout.buildDirectory.dir("${project.properties["build.lib.dir"]}")) +tasks.register("copy-libs") { + description = "Copy the libs in lib" + from("${project.properties["lib.dir"]}") { + include("**/*.jar") + } + into("${project.properties["build.lib.dir"]}") } -tasks.register("compile-plugins") -{ - description = "compile plugins only" +tasks.register("compile-plugins") { + description = "Compile plugins only" dependsOn("init-nutch","resolve-default") //TODO Once plugins are finished, uncomment the following lines: // dir = file("src/plugin") @@ -229,23 +304,23 @@ tasks.register("compile-plugins") } tasks.jar { - description = "make nutch.jar" + description = "Make nutch.jar" dependsOn("compile-core") - from(layout.buildDirectory.dir("${project.properties["conf.dir"]}/nutch-default.xml")) - into(layout.buildDirectory.dir("${project.properties["build.classes"]}")) + from("${project.properties["conf.dir"]}/nutch-default.xml") + into("${project.properties["build.classes"]}") - from(layout.buildDirectory.dir("${project.properties["conf.dir"]}/nutch-site.xml")) - into(layout.buildDirectory.dir("${project.properties["build.classes"]}")) + from("${project.properties["conf.dir"]}/nutch-site.xml") + into("${project.properties["build.classes"]}") //TODO this is meant to replace destinationDirectory.set(file("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")) - from(layout.buildDirectory.dir(project.properties["build.classes"] as String)) + from(project.properties["build.classes"] as String) } tasks.register("runtime") { - description = "default target for running Nutch" + description = "Default target for running Nutch" dependsOn("jar","job") mkdir("${project.properties["runtime.dir"]}") mkdir("${project.properties["runtime.local"]}") @@ -290,34 +365,36 @@ tasks.register("runtime") tasks.register("job") { - description = "make nutch.job jar" + //TODO there is no support to create a ".job" directly + description = "Make nutch.job jar" dependsOn("compile") + from( - zipTree("${project.properties["build.classes"]}").matching { + files("${project.properties["build.classes"]}") { exclude("nutch-default.xml","nutch-site.xml") }, - zipTree("${project.properties["conf.dir"]}").matching { + files("${project.properties["conf.dir"]}") { exclude("*.template","hadoop*.*") }, - zipTree("${project.properties["build.lib.dir"]}").matching { + files("${project.properties["build.lib.dir"]}") { eachFile { relativePath = RelativePath(true,"lib") } include("**/*.jar") exclude("hadoop-*.jar,slf4j*.jar","log4j*.jar") }, - zipTree("${project.properties["build.plugins"]}").matching { + files("${project.properties["build.plugins"]}") { eachFile { relativePath = RelativePath(true,"classes","plugins") } } ) - into(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")) + into("${project.properties["build.dir"]}/${project.properties["final.name"]}.job") } tasks.register("compile-core-test") { - description = "compile test code" + description = "Compile test code" dependsOn("init-nutch","compile-core","resolve-test") source = fileTree(layout.buildDirectory.dir("${project.properties["test.src.dir"]}")) include("org/apache/nutch/**/*.java") @@ -336,6 +413,6 @@ tasks.register("compile-core-test") tasks.test.configure() { - description = "run JUnit tests" + description = "Run JUnit tests" dependsOn("test-core","test-plugins") } \ No newline at end of file From ea09d0bd56a9d40fee8320769830a4dad6ab5717 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sat, 23 Apr 2022 15:24:56 -0700 Subject: [PATCH 33/55] NUTCH 2940 Develop Gradle Core Build for Apache Nutch adding back javac.version for now --- build.gradle.kts | 3 +-- gradle.properties | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d4d5c3f052..773edd63b2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -199,7 +199,6 @@ tasks.register("compile-core") { source = fileTree("${project.properties["src.dir"]}") include("org/apache/nutch/**/*.java") - // destinationDirectory = DirectoryProperty("${project.properties["build.classes"]}") destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.classes"]}")) classpath = classpathCollection sourceCompatibility = "${project.properties["javac.version"]}" @@ -415,4 +414,4 @@ tasks.test.configure() { description = "Run JUnit tests" dependsOn("test-core","test-plugins") -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ff81e3cd95..6bf57aae59 100644 --- a/gradle.properties +++ b/gradle.properties @@ -51,6 +51,7 @@ bin.dist.version.dir = dist/apache-nutch-1.19-SNAPSHOT-bin javac.debug = true javac.deprecation = true +javac.version = 11 runtime.dir = runtime runtime.deploy = runtime/deploy From fcf8d2875b0a01758f40b7ce18e7294201e6387f Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sat, 23 Apr 2022 18:00:18 -0700 Subject: [PATCH 34/55] NUTCH 2940 Develop Gradle Core Build for Apache Nutch Fixed jar, job, runtime tasks. Runtime task overall appears functional. --- build.gradle.kts | 83 +++++++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 773edd63b2..e234af6f71 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -218,6 +218,9 @@ tasks.register("compile-core") { include("**/*.properties") into("${project.properties["build.classes"]}") } + doLast { + delete("${project.properties["build.dir"]}/tmp") + } } tasks.register("proxy") { @@ -306,15 +309,15 @@ tasks.jar { description = "Make nutch.jar" dependsOn("compile-core") - from("${project.properties["conf.dir"]}/nutch-default.xml") - into("${project.properties["build.classes"]}") - - from("${project.properties["conf.dir"]}/nutch-site.xml") - into("${project.properties["build.classes"]}") + copy { + from("${project.properties["conf.dir"]}/nutch-default.xml") + from("${project.properties["conf.dir"]}/nutch-site.xml") + into("${project.properties["build.classes"]}") + } - //TODO this is meant to replace - destinationDirectory.set(file("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")) - from(project.properties["build.classes"] as String) + archiveFileName.set("${project.properties["final.name"]}.jar") + destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.dir"]}")) + from(files("${project.properties["build.classes"]}")) } tasks.register("runtime") @@ -325,34 +328,37 @@ tasks.register("runtime") mkdir("${project.properties["runtime.local"]}") mkdir("${project.properties["runtime.deploy"]}") - from(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")) - into(layout.buildDirectory.dir("${project.properties["runtime.deploy"]}")) - - from(layout.buildDirectory.dir("${project.properties["runtime.deploy"]}/bin")) - into(layout.buildDirectory.dir("src/bin")) + into(layout.projectDirectory) - from(layout.buildDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")) - into(layout.buildDirectory.dir("${project.properties["runtime.local"]}/lib")) - - from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/lib/native")) - into(layout.buildDirectory.dir("lib/native")) - - from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/conf")) { - exclude("*.template") + into("${project.properties["runtime.deploy"]}") { + from(layout.projectDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.job")) + } + into("${project.properties["runtime.deploy"]}/bin") { + from(layout.projectDirectory.dir("src/bin")) + } + into("${project.properties["runtime.local"]}/lib") { + from(layout.projectDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")) + } + into("${project.properties["runtime.local"]}/lib/native") { + from(layout.projectDirectory.dir("lib/native")) + } + into("${project.properties["runtime.local"]}/conf") { + from(layout.projectDirectory.dir("${project.properties["conf.dir"]}")) { + exclude("*.template") + } + } + into("${project.properties["runtime.local"]}/bin") { + from(layout.projectDirectory.dir("src/bin")) + } + into("${project.properties["runtime.local"]}/lib") { + from(layout.projectDirectory.dir("${project.properties["build.dir"]}/lib")) + } + into("${project.properties["runtime.local"]}/plugins") { + from(layout.projectDirectory.dir("${project.properties["build.dir"]}/plugins")) + } + into("${project.properties["runtime.local"]}/test") { + from(layout.projectDirectory.dir("${project.properties["build.dir"]}/test")) } - into(layout.buildDirectory.dir("${project.properties["conf.dir"]}/lib")) - - from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/bin")) - into(layout.buildDirectory.dir("src/bin")) - - from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/lib")) - into(layout.buildDirectory.dir("${project.properties["build.dir"]}/lib")) - - from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/plugins")) - into(layout.buildDirectory.dir("${project.properties["build.dir"]}/plugins")) - - from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/test")) - into(layout.buildDirectory.dir("${project.properties["build.dir"]}/test")) doLast() { project.exec() { @@ -368,6 +374,9 @@ tasks.register("job") description = "Make nutch.job jar" dependsOn("compile") + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + archiveFileName.set("${project.properties["final.name"]}.job") + destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.dir"]}")) from( files("${project.properties["build.classes"]}") { exclude("nutch-default.xml","nutch-site.xml") @@ -388,14 +397,16 @@ tasks.register("job") } } ) - into("${project.properties["build.dir"]}/${project.properties["final.name"]}.job") + doLast { + delete("${project.properties["build.dir"]}/tmp") + } } tasks.register("compile-core-test") { description = "Compile test code" dependsOn("init-nutch","compile-core","resolve-test") - source = fileTree(layout.buildDirectory.dir("${project.properties["test.src.dir"]}")) + source = fileTree(layout.projectDirectory.dir("${project.properties["test.src.dir"]}")) include("org/apache/nutch/**/*.java") destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.classes"]}")) classpath = classpathCollection From 08000d67e4d3ffb8e93cd5e379100f795e297e3f Mon Sep 17 00:00:00 2001 From: James Simmons Date: Mon, 25 Apr 2022 00:46:48 -0700 Subject: [PATCH 35/55] NUTCH 2940 Develop Gradle Core Build for Apache Nutch Fixes from comments; including fixing errors with some copying syntax, fixing gradle clean jar deprecated error, and implementing compile-core-test (and resolve-test) although the latter is still not working, not sure if dependency issue --- build.gradle.kts | 56 +++++++++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e234af6f71..a8ca622231 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -173,11 +173,12 @@ tasks.register("init-nutch") { mkdir("${project.properties["test.build.lib.dir"]}") // renaming from *.template to * for all files in folders in conf.dir - fileTree("${project.properties["conf.dir"]}").matching { include("**/*.template") }.forEach { file: File -> - rename { fileName: String -> - fileName.replace(".template", "") - } + from(layout.projectDirectory.dir("${project.properties["conf.dir"]}")) + include("**/*.template") + rename { filename: String -> + filename.replace(".template", "") } + into(layout.projectDirectory.dir("${project.properties["conf.dir"]}")) } tasks.register("resolve-default") { @@ -188,6 +189,14 @@ tasks.register("resolve-default") { into(layout.buildDirectory.dir("${project.properties["lib.dir"]}")) } +tasks.register("resolve-test") { + description = "Resolve and retrieve dependencies" + dependsOn("clean-test-lib","init-nutch","copy-libs") + from(configurations.testCompileClasspath) + from(configurations.testRuntimeClasspath) + into(layout.buildDirectory.dir("${project.properties["test.lib.dir"]}")) +} + tasks.register("compile") { description = "Compile all Java files" dependsOn("compile-core","compile-plugins") @@ -195,7 +204,7 @@ tasks.register("compile") { tasks.register("compile-core") { description = "Compile core Java files only" - dependsOn("init-nutch","resolve-default") + dependsOn("init-nutch","resolve-default","compileJava") source = fileTree("${project.properties["src.dir"]}") include("org/apache/nutch/**/*.java") @@ -210,13 +219,11 @@ tasks.register("compile-core") { options.encoding = "${project.properties["build.encoding"]}" options.isDebug = "${project.properties["javac.debug"]}" == "on" options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" - + copy { - from("${project.properties["src.dir"]}") - include("**/*.html") - include("**/*.css") - include("**/*.properties") - into("${project.properties["build.classes"]}") + from(layout.projectDirectory.dir("${project.properties["src.dir"]}")) + include("**/*.html", "**/*.css", "**/*.properties") + into(layout.projectDirectory.dir("${project.properties["build.classes"]}")) } doLast { delete("${project.properties["build.dir"]}/tmp") @@ -310,8 +317,12 @@ tasks.jar { dependsOn("compile-core") copy { - from("${project.properties["conf.dir"]}/nutch-default.xml") - from("${project.properties["conf.dir"]}/nutch-site.xml") + from( + file(layout.projectDirectory.dir("${project.properties["conf.dir"]}/nutch-default.xml")), + file(layout.projectDirectory.dir("${project.properties["conf.dir"]}/nutch-site.xml")) + ) + // from("${project.properties["conf.dir"]}/nutch-default.xml") + // from("${project.properties["conf.dir"]}/nutch-site.xml") into("${project.properties["build.classes"]}") } @@ -337,6 +348,10 @@ tasks.register("runtime") from(layout.projectDirectory.dir("src/bin")) } into("${project.properties["runtime.local"]}/lib") { + // from( + // file(layout.projectDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")), + // files("${project.properties["build.lib.dir"]}") + // ) from(layout.projectDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")) } into("${project.properties["runtime.local"]}/lib/native") { @@ -351,7 +366,7 @@ tasks.register("runtime") from(layout.projectDirectory.dir("src/bin")) } into("${project.properties["runtime.local"]}/lib") { - from(layout.projectDirectory.dir("${project.properties["build.dir"]}/lib")) + from(layout.projectDirectory.dir("${project.properties["build.lib.dir"]}")) } into("${project.properties["runtime.local"]}/plugins") { from(layout.projectDirectory.dir("${project.properties["build.dir"]}/plugins")) @@ -405,19 +420,20 @@ tasks.register("job") tasks.register("compile-core-test") { description = "Compile test code" - dependsOn("init-nutch","compile-core","resolve-test") - source = fileTree(layout.projectDirectory.dir("${project.properties["test.src.dir"]}")) + dependsOn("init-nutch","compile-core","resolve-test","compileTestJava") + + source = fileTree("${project.properties["test.src.dir"]}") include("org/apache/nutch/**/*.java") - destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.classes"]}")) - classpath = classpathCollection + destinationDirectory.set(layout.projectDirectory.dir("${project.properties["test.build.classes"]}")) + classpath = testClasspathCollection sourceCompatibility = "${project.properties["javac.version"]}" targetCompatibility = "${project.properties["javac.version"]}" - options.annotationProcessorPath = classpathCollection + options.annotationProcessorPath = testClasspathCollection options.sourcepath = layout.files("${project.properties["src.dir"]}") options.compilerArgs.add("-Xlint:-path") - options.isDebug = "${project.properties["javac.debug"]}" == "on" options.encoding = "${project.properties["build.encoding"]}" + options.isDebug = "${project.properties["javac.debug"]}" == "on" options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" } From 7c5564b626afab1468234fd78acc2fadf6682dec Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Mon, 25 Apr 2022 16:27:22 -0700 Subject: [PATCH 36/55] NUTCH-2940 Develop Gradle Core Build for Apache Nutch --- build.gradle.kts | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a8ca622231..748afdcf72 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -194,7 +194,7 @@ tasks.register("resolve-test") { dependsOn("clean-test-lib","init-nutch","copy-libs") from(configurations.testCompileClasspath) from(configurations.testRuntimeClasspath) - into(layout.buildDirectory.dir("${project.properties["test.lib.dir"]}")) + into(layout.projectDirectory.dir("${project.properties["test.build.lib.dir"]}")) } tasks.register("compile") { @@ -205,14 +205,12 @@ tasks.register("compile") { tasks.register("compile-core") { description = "Compile core Java files only" dependsOn("init-nutch","resolve-default","compileJava") - source = fileTree("${project.properties["src.dir"]}") include("org/apache/nutch/**/*.java") destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.classes"]}")) classpath = classpathCollection sourceCompatibility = "${project.properties["javac.version"]}" targetCompatibility = "${project.properties["javac.version"]}" - options.annotationProcessorPath = classpathCollection options.sourcepath = layout.files("${project.properties["src.dir"]}") options.compilerArgs.add("-Xlint:-path") @@ -254,13 +252,6 @@ tasks.register("benchmark") { args("5") } -// tasks.javadoc { -// description = "Generate Javadoc" -// dependsOn("compile") -// mkdir("${project.properties["build.javadoc"]}") -// mkdir("${project.properties["build.javadoc"]}/resources") -// } - tasks.clean { description = "Clean the project" dependsOn("clean-build","clean-lib","clean-dist","clean-runtime") @@ -321,18 +312,17 @@ tasks.jar { file(layout.projectDirectory.dir("${project.properties["conf.dir"]}/nutch-default.xml")), file(layout.projectDirectory.dir("${project.properties["conf.dir"]}/nutch-site.xml")) ) - // from("${project.properties["conf.dir"]}/nutch-default.xml") - // from("${project.properties["conf.dir"]}/nutch-site.xml") into("${project.properties["build.classes"]}") } - archiveFileName.set("${project.properties["final.name"]}.jar") destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.dir"]}")) from(files("${project.properties["build.classes"]}")) + doLast { + delete("${project.properties["build.dir"]}/tmp") + } } -tasks.register("runtime") -{ +tasks.register("runtime") { description = "Default target for running Nutch" dependsOn("jar","job") mkdir("${project.properties["runtime.dir"]}") @@ -348,10 +338,6 @@ tasks.register("runtime") from(layout.projectDirectory.dir("src/bin")) } into("${project.properties["runtime.local"]}/lib") { - // from( - // file(layout.projectDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")), - // files("${project.properties["build.lib.dir"]}") - // ) from(layout.projectDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")) } into("${project.properties["runtime.local"]}/lib/native") { @@ -383,9 +369,7 @@ tasks.register("runtime") } } -tasks.register("job") -{ - //TODO there is no support to create a ".job" directly +tasks.register("job") { description = "Make nutch.job jar" dependsOn("compile") @@ -417,8 +401,7 @@ tasks.register("job") } } -tasks.register("compile-core-test") -{ +tasks.register("compile-core-test") { description = "Compile test code" dependsOn("init-nutch","compile-core","resolve-test","compileTestJava") @@ -437,8 +420,7 @@ tasks.register("compile-core-test") options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" } -tasks.test.configure() -{ +tasks.test.configure() { description = "Run JUnit tests" dependsOn("test-core","test-plugins") } \ No newline at end of file From eec4255777e7b25596410c37d6c0db5323b1e687 Mon Sep 17 00:00:00 2001 From: Lily Perry Date: Mon, 25 Apr 2022 16:39:06 -0700 Subject: [PATCH 37/55] Delete Jenkinsfile_ant --- Jenkinsfile_ant | 70 ------------------------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 Jenkinsfile_ant diff --git a/Jenkinsfile_ant b/Jenkinsfile_ant deleted file mode 100644 index c8863e6e0b..0000000000 --- a/Jenkinsfile_ant +++ /dev/null @@ -1,70 +0,0 @@ -#!groovy - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu' -// ================================================================= -// https://cwiki.apache.org/confluence/display/INFRA/Jenkins -// https://cwiki.apache.org/confluence/display/INFRA/Multibranch+Pipeline+recipes -// ================================================================= - -// general pipeline documentation: https://jenkins.io/doc/book/pipeline/syntax/ -pipeline { - agent { - node { - label AGENT_LABEL - } - - environment { - LANG = 'C.UTF-8' -} - - stages { - stage('Build') { - steps { - withAnt(installation: 'myinstall') - { - sh "ant runtime" - } - } - - post { - success { - archiveArtifacts '**/target/*.jar' - } - } - } - - stage('Test') { - steps { - withAnt(installation: 'myinstall') - { - sh "ant test" - } - } - - post { - always { - junit testResults: '**/target/surefire-reports/TEST-*.xml', testDataPublishers: [[$class: 'StabilityTestDataPublisher']] - } - } - } - } -} From c34d5afaaf5094ff088c5a95ed3202eb45f2c460 Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Tue, 26 Apr 2022 15:43:33 -0700 Subject: [PATCH 38/55] NUTCH-2940 Develop Gradle Core Build for Apache Nutch --- build.gradle.kts | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 748afdcf72..a7ce457b52 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,9 +16,10 @@ */ plugins { - `maven-publish` application + base java + `maven-publish` } repositories { @@ -214,6 +215,7 @@ tasks.register("compile-core") { options.annotationProcessorPath = classpathCollection options.sourcepath = layout.files("${project.properties["src.dir"]}") options.compilerArgs.add("-Xlint:-path") + options.compilerArgs.add("-Xpkginfo:always") options.encoding = "${project.properties["build.encoding"]}" options.isDebug = "${project.properties["javac.debug"]}" == "on" options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" @@ -376,26 +378,21 @@ tasks.register("job") { duplicatesStrategy = DuplicatesStrategy.EXCLUDE archiveFileName.set("${project.properties["final.name"]}.job") destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.dir"]}")) - from( - files("${project.properties["build.classes"]}") { - exclude("nutch-default.xml","nutch-site.xml") - }, - files("${project.properties["conf.dir"]}") { - exclude("*.template","hadoop*.*") - }, - files("${project.properties["build.lib.dir"]}") { - eachFile { - relativePath = RelativePath(true,"lib") - } - include("**/*.jar") - exclude("hadoop-*.jar,slf4j*.jar","log4j*.jar") - }, - files("${project.properties["build.plugins"]}") { - eachFile { - relativePath = RelativePath(true,"classes","plugins") - } - } - ) + from(layout.projectDirectory.dir("${project.properties["build.classes"]}")) { + exclude("nutch-default.xml","nutch-site.xml") + } + from(layout.projectDirectory.dir("${project.properties["conf.dir"]}")) { + exclude("*.template","hadoop*.*") + } + from(layout.projectDirectory.dir("${project.properties["build.lib.dir"]}")) { + include("**/*.jar") + exclude("hadoop-*.jar","slf4j*.jar","log4j*.jar") + into("lib") + } + from(layout.projectDirectory.dir("${project.properties["build.plugins"]}")) { + exclude("nutch-default.xml","nutch-site.xml") + into("classes/plugins") + } doLast { delete("${project.properties["build.dir"]}/tmp") } From 61a343eca9e78746a56f169c2844a4fb20a30f74 Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sat, 23 Apr 2022 20:44:32 -0700 Subject: [PATCH 39/55] Implemented javadoc, package-src, and zip-src targets --- build.gradle.kts | 215 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 213 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a7ce457b52..073ad90327 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -363,8 +363,8 @@ tasks.register("runtime") { from(layout.projectDirectory.dir("${project.properties["build.dir"]}/test")) } - doLast() { - project.exec() { + doLast { + project.exec { commandLine("chmod","ugo+x","${project.properties["runtime.deploy"]}/bin") commandLine("chmod","ugo+x","${project.properties["runtime.local"]}/bin") } @@ -420,4 +420,215 @@ tasks.register("compile-core-test") { tasks.test.configure() { description = "Run JUnit tests" dependsOn("test-core","test-plugins") +} + +tasks.javadoc { + //TODO This function is untested because the equivalent ant target does not work + description = "generate Javadoc" + dependsOn("compile") + + val version:String = System.getProperty("java.version") + if("1.7.0_25".compareTo(version) >= 0) + throw GradleException( + "Unsupported Java version: ${version}. Javadoc requires Java version 7u25 " + + "or greater. See https://issues.apache.org/jira/browse/NUTCH-1590" + ) + + mkdir("${project.properties["build.javadoc"]}") + mkdir("${project.properties["build.javadoc"]}/resources") + + options { + overview = "${project.properties["src.dir"]}/overview.html" + destinationDirectory = file("${project.properties["build.javadoc"]}") + windowTitle = "${project.properties["name"]} ${project.properties["version"]} API" + isFailOnError = true + //TODO isFailOnWarning = true + + val dc = StandardJavadocDocletOptions() + dc.isAuthor = true + dc.isVersion = true + dc.isUse = true + dc.docTitle = windowTitle + dc.bottom = "Copyright &copy; ${project.properties["year"]} The Apache Software Foundation" + dc.addStringOption("${project.properties["javadoc.proxy.host"]}") + dc.addStringOption("${project.properties["javadoc.proxy.port"]}") + dc.addBooleanOption("--allow-script-in-comments") + dc.links( + "${project.properties["javadoc.link.java"]}", + "${project.properties["javadoc.link.hadoop"]}" + ) + dc.classpath = files("${project.properties["build.plugins"]}") { + include("**/*.jar") + exclude("any23/javax.annotation-api*.jar") + }.distinct() + dc.groups = mutableMapOf( + "Core" to mutableListOf("org.apache.nutch.*"), + "Plugins API" to mutableListOf("${project.properties["plugins.api"]}"), + "Protocol Plugins" to mutableListOf("${project.properties["plugins.protocol"]}"), + "URL Filter Plugins" to mutableListOf("${project.properties["plugins.urlfilter"]}"), + "URL Normalizer Plugins" to mutableListOf("${project.properties["plugins.urlnormalizer"]}"), + "Scoring Plugins" to mutableListOf("${project.properties["plugins.scoring"]}"), + "Parse Plugins" to mutableListOf("${project.properties["plugins.parse"]}"), + "Parse Filter Plugins" to mutableListOf("${project.properties["plugins.parsefilter"]}"), + "Publisher Plugins" to mutableListOf("${project.properties["plugins.publisher"]}"), + "Exchange Plugins" to mutableListOf("${project.properties["plugins.exchange"]}"), + "Indexing Filter Plugins" to mutableListOf("${project.properties["plugins.index"]}"), + "Indexer Plugins" to mutableListOf("${project.properties["plugins.indexer"]}"), + "Misc. Plugins" to mutableListOf("${project.properties["plugins.misc"]}") + ) + // TODO it is unclear if this actually gets applied to the javadoc options + doclet = dc.doclet + } + + //TODO this is meant to replace the tags + include( + "${project.properties["src.dir"]}", + "${project.properties["plugins.dir"]}/any23/src/java/", + "${project.properties["plugins.dir"]}/creativecommons/src/java", + "${project.properties["plugins.dir"]}/feed/src/java", + "${project.properties["plugins.dir"]}/headings/src/java", + "${project.properties["plugins.dir"]}/exchange-jexl/src/java", + "${project.properties["plugins.dir"]}/index-anchor/src/java", + "${project.properties["plugins.dir"]}/index-basic/src/java", + "${project.properties["plugins.dir"]}/index-geoip/src/java", + "${project.properties["plugins.dir"]}/index-jexl-filter/src/java", + "${project.properties["plugins.dir"]}/index-links/src/java", + "${project.properties["plugins.dir"]}/index-metadata/src/java", + "${project.properties["plugins.dir"]}/index-more/src/java", + "${project.properties["plugins.dir"]}/index-replace/src/java", + "${project.properties["plugins.dir"]}/index-static/src/java", + "${project.properties["plugins.dir"]}/indexer-cloudsearch/src/java/", + "${project.properties["plugins.dir"]}/indexer-csv/src/java", + "${project.properties["plugins.dir"]}/indexer-dummy/src/java", + "${project.properties["plugins.dir"]}/indexer-elastic/src/java/", + "${project.properties["plugins.dir"]}/indexer-kafka/src/java/", + "${project.properties["plugins.dir"]}/indexer-rabbit/src/java", + "${project.properties["plugins.dir"]}/indexer-solr/src/java", + "${project.properties["plugins.dir"]}/language-identifier/src/java", + "${project.properties["plugins.dir"]}/lib-htmlunit/src/java", + "${project.properties["plugins.dir"]}/lib-http/src/java", + "${project.properties["plugins.dir"]}/lib-rabbitmq/src/java", + "${project.properties["plugins.dir"]}/lib-regex-filter/src/java", + "${project.properties["plugins.dir"]}/lib-selenium/src/java", + "${project.properties["plugins.dir"]}/microformats-reltag/src/java", + "${project.properties["plugins.dir"]}/mimetype-filter/src/java", + "${project.properties["plugins.dir"]}/parse-ext/src/java", + "${project.properties["plugins.dir"]}/parse-html/src/java", + "${project.properties["plugins.dir"]}/parse-js/src/java", + "${project.properties["plugins.dir"]}/parse-metatags/src/java", + "${project.properties["plugins.dir"]}/parse-swf/src/java", + "${project.properties["plugins.dir"]}/parse-tika/src/java", + "${project.properties["plugins.dir"]}/parse-zip/src/java", + "${project.properties["plugins.dir"]}/parsefilter-debug/src/java", + "${project.properties["plugins.dir"]}/parsefilter-naivebayes/src/java", + "${project.properties["plugins.dir"]}/parsefilter-regex/src/java", + "${project.properties["plugins.dir"]}/protocol-file/src/java", + "${project.properties["plugins.dir"]}/protocol-ftp/src/java", + "${project.properties["plugins.dir"]}/protocol-htmlunit/src/java", + "${project.properties["plugins.dir"]}/protocol-http/src/java", + "${project.properties["plugins.dir"]}/protocol-httpclient/src/java", + "${project.properties["plugins.dir"]}/protocol-interactiveselenium/src/java", + "${project.properties["plugins.dir"]}/protocol-okhttp/src/java", + "${project.properties["plugins.dir"]}/protocol-selenium/src/java", + "${project.properties["plugins.dir"]}/publish-rabbitmq/src/java", + "${project.properties["plugins.dir"]}/scoring-depth/src/java", + "${project.properties["plugins.dir"]}/scoring-link/src/java", + "${project.properties["plugins.dir"]}/scoring-opic/src/java", + "${project.properties["plugins.dir"]}/scoring-orphan/src/java", + "${project.properties["plugins.dir"]}/scoring-similarity/src/java", + "${project.properties["plugins.dir"]}/scoring-metadata/src/java", + "${project.properties["plugins.dir"]}/subcollection/src/java", + "${project.properties["plugins.dir"]}/tld/src/java", + "${project.properties["plugins.dir"]}/urlfilter-automaton/src/java", + "${project.properties["plugins.dir"]}/urlfilter-domain/src/java", + "${project.properties["plugins.dir"]}/urlfilter-domaindenylist/src/java", + "${project.properties["plugins.dir"]}/urlfilter-fast/src/java", + "${project.properties["plugins.dir"]}/urlfilter-ignoreexempt/src/java", + "${project.properties["plugins.dir"]}/urlfilter-prefix/src/java", + "${project.properties["plugins.dir"]}/urlfilter-regex/src/java", + "${project.properties["plugins.dir"]}/urlfilter-suffix/src/java", + "${project.properties["plugins.dir"]}/urlfilter-validator/src/java", + "${project.properties["plugins.dir"]}/urlmeta/src/java", + "${project.properties["plugins.dir"]}/urlnormalizer-ajax/src/java", + "${project.properties["plugins.dir"]}/urlnormalizer-basic/src/java", + "${project.properties["plugins.dir"]}/urlnormalizer-host/src/java", + "${project.properties["plugins.dir"]}/urlnormalizer-pass/src/java", + "${project.properties["plugins.dir"]}/urlnormalizer-protocol/src/java", + "${project.properties["plugins.dir"]}/urlnormalizer-querystring/src/java", + "${project.properties["plugins.dir"]}/urlnormalizer-regex/src/java", + "${project.properties["plugins.dir"]}/urlnormalizer-slash/src/java" + ) + + copy { + from("${project.properties["plugins.dir"]}/plugin.dtd") + into("${project.properties["build.javadoc"]}/org/apache/nutch/plugin/doc-files") + } + copy { + from( + "${project.properties["conf.dir"]}/nutch-default.xml", + "${project.properties["conf.dir"]}/configuration.xsl" + ) + into("${project.properties["build.javadoc"]}/resources/") + } +} + +tasks.register("package-src") +{ + //TODO This function is untested because of the dependency on the javadoc target + description = "generate source distribution package" + dependsOn("runtime","javadoc") + + mkdir("${project.properties["dist.dir"]}") + mkdir("${project.properties["src.dist.version.dir"]}") + mkdir("${project.properties["src.dist.version.dir"]}/lib") + mkdir("${project.properties["src.dist.version.dir"]}/docs") + mkdir("${project.properties["src.dist.version.dir"]}/docs/api") + mkdir("${project.properties["src.dist.version.dir"]}/ivy") + + from("lib") { + includeEmptyDirs = false + into("${project.properties["src.dist.version.dir"]}/lib") + } + from("${project.properties["conf.dir"]}") { + exclude("**/*.template") + into("${project.properties["src.dist.version.dir"]}/conf") + } + from("${project.properties["build.javadoc"]}") { + into("${project.properties["src.dist.version.dir"]}/docs/api") + } + from(".") { + include("*.txt") + into("${project.properties["src.dist.version.dir"]}") + } + from("src") { + includeEmptyDirs = true + into("${project.properties["src.dist.version.dir"]}/src") + } + //TODO skipped Ivy copy, now deprecated + from(".") { + //TODO replaced Ant files with Gradle files + include("build.gradle.kts","gradle.properties","settings.gradle.kts") + into("${project.properties["src.dist.version.dir"]}/") + } +} +tasks.register("zip-src") +{ + description = "generate src.zip distribution package" + dependsOn("package-src") + + archiveFileName.set("${project.properties["src.dist.version.dir"]}.zip") + destinationDirectory.set(layout.buildDirectory.dir("${project.properties["final.name"]}")) + + from( + files("${project.properties["src.dist.version.dir"]}") { + fileMode = 664 + exclude("src/bin/*") + exclude("ivy/ivy*.jar") + include("**") + }, + files("${project.properties["src.dist.version.dir"]}") { + fileMode = 755 + include("src/bin/*") + } + ) } \ No newline at end of file From e031ab1e526848ca2a27021b49a0a84f9813f79a Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sat, 23 Apr 2022 21:06:10 -0700 Subject: [PATCH 40/55] Update build.gradle.kts --- build.gradle.kts | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 073ad90327..030309496c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -376,23 +376,26 @@ tasks.register("job") { dependsOn("compile") duplicatesStrategy = DuplicatesStrategy.EXCLUDE - archiveFileName.set("${project.properties["final.name"]}.job") - destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.dir"]}")) - from(layout.projectDirectory.dir("${project.properties["build.classes"]}")) { - exclude("nutch-default.xml","nutch-site.xml") - } - from(layout.projectDirectory.dir("${project.properties["conf.dir"]}")) { - exclude("*.template","hadoop*.*") - } - from(layout.projectDirectory.dir("${project.properties["build.lib.dir"]}")) { - include("**/*.jar") - exclude("hadoop-*.jar","slf4j*.jar","log4j*.jar") - into("lib") - } - from(layout.projectDirectory.dir("${project.properties["build.plugins"]}")) { - exclude("nutch-default.xml","nutch-site.xml") - into("classes/plugins") - } + from( + files("${project.properties["build.classes"]}") { + exclude("nutch-default.xml","nutch-site.xml") + }, + files("${project.properties["conf.dir"]}") { + exclude("*.template","hadoop*.*") + }, + files("${project.properties["build.lib.dir"]}") { + eachFile { + relativePath = RelativePath(true,"lib") + } + include("**/*.jar") + exclude("hadoop-*.jar,slf4j*.jar","log4j*.jar") + }, + files("${project.properties["build.plugins"]}") { + eachFile { + relativePath = RelativePath(true,"classes","plugins") + } + } + ) doLast { delete("${project.properties["build.dir"]}/tmp") } @@ -578,6 +581,8 @@ tasks.register("package-src") description = "generate source distribution package" dependsOn("runtime","javadoc") + destinationDir = file(".") + mkdir("${project.properties["dist.dir"]}") mkdir("${project.properties["src.dist.version.dir"]}") mkdir("${project.properties["src.dist.version.dir"]}/lib") @@ -623,6 +628,7 @@ tasks.register("zip-src") files("${project.properties["src.dist.version.dir"]}") { fileMode = 664 exclude("src/bin/*") + //TODO delete the following line once Ivy is removed completely exclude("ivy/ivy*.jar") include("**") }, From 7879be61acad6b23eaf6e8043b2dc50c70d4fa32 Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sun, 24 Apr 2022 12:50:31 -0700 Subject: [PATCH 41/55] Capitalized descriptions --- build.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 030309496c..6d77442918 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -427,7 +427,7 @@ tasks.test.configure() { tasks.javadoc { //TODO This function is untested because the equivalent ant target does not work - description = "generate Javadoc" + description = "Generate Javadoc" dependsOn("compile") val version:String = System.getProperty("java.version") @@ -578,7 +578,7 @@ tasks.javadoc { tasks.register("package-src") { //TODO This function is untested because of the dependency on the javadoc target - description = "generate source distribution package" + description = "Generate source distribution package" dependsOn("runtime","javadoc") destinationDir = file(".") @@ -618,7 +618,7 @@ tasks.register("package-src") } tasks.register("zip-src") { - description = "generate src.zip distribution package" + description = "Generate src.zip distribution package" dependsOn("package-src") archiveFileName.set("${project.properties["src.dist.version.dir"]}.zip") @@ -637,4 +637,4 @@ tasks.register("zip-src") include("src/bin/*") } ) -} \ No newline at end of file +} From 10f1dd9492af8973414613b67e507762c452f72a Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sun, 24 Apr 2022 12:58:15 -0700 Subject: [PATCH 42/55] Removed TODO at top of javadoc task --- build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6d77442918..ec33a4f8b9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -426,7 +426,6 @@ tasks.test.configure() { } tasks.javadoc { - //TODO This function is untested because the equivalent ant target does not work description = "Generate Javadoc" dependsOn("compile") From 625d0545662bd4feb32273fe5e68aeff26b90441 Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sat, 23 Apr 2022 20:44:32 -0700 Subject: [PATCH 43/55] Implemented javadoc, package-src, and zip-src targets --- build.gradle.kts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ec33a4f8b9..9282312674 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -363,6 +363,18 @@ tasks.register("runtime") { from(layout.projectDirectory.dir("${project.properties["build.dir"]}/test")) } + from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/bin")) + into(layout.buildDirectory.dir("src/bin")) + + from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/lib")) + into(layout.buildDirectory.dir("${project.properties["build.dir"]}/lib")) + + from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/plugins")) + into(layout.buildDirectory.dir("${project.properties["build.dir"]}/plugins")) + + from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/test")) + into(layout.buildDirectory.dir("${project.properties["build.dir"]}/test")) + doLast { project.exec { commandLine("chmod","ugo+x","${project.properties["runtime.deploy"]}/bin") @@ -576,12 +588,9 @@ tasks.javadoc { tasks.register("package-src") { - //TODO This function is untested because of the dependency on the javadoc target description = "Generate source distribution package" dependsOn("runtime","javadoc") - destinationDir = file(".") - mkdir("${project.properties["dist.dir"]}") mkdir("${project.properties["src.dist.version.dir"]}") mkdir("${project.properties["src.dist.version.dir"]}/lib") @@ -627,7 +636,6 @@ tasks.register("zip-src") files("${project.properties["src.dist.version.dir"]}") { fileMode = 664 exclude("src/bin/*") - //TODO delete the following line once Ivy is removed completely exclude("ivy/ivy*.jar") include("**") }, From fe5f85addb102138984eea5792f870f38e5b2118 Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sat, 23 Apr 2022 21:06:10 -0700 Subject: [PATCH 44/55] Update build.gradle.kts --- build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 9282312674..75e0af7087 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -591,6 +591,8 @@ tasks.register("package-src") description = "Generate source distribution package" dependsOn("runtime","javadoc") + destinationDir = file(".") + mkdir("${project.properties["dist.dir"]}") mkdir("${project.properties["src.dist.version.dir"]}") mkdir("${project.properties["src.dist.version.dir"]}/lib") @@ -636,6 +638,7 @@ tasks.register("zip-src") files("${project.properties["src.dist.version.dir"]}") { fileMode = 664 exclude("src/bin/*") + //TODO delete the following line once Ivy is removed completely exclude("ivy/ivy*.jar") include("**") }, From 5948f1ec473a308e528ed67aa633c30636c05188 Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Wed, 27 Apr 2022 07:48:27 -0700 Subject: [PATCH 45/55] Revert regression in runtime task, cleanup Javadoc --- build.gradle.kts | 60 +++++++++++++++++------------------------------- 1 file changed, 21 insertions(+), 39 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 75e0af7087..654b98cb96 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -363,20 +363,8 @@ tasks.register("runtime") { from(layout.projectDirectory.dir("${project.properties["build.dir"]}/test")) } - from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/bin")) - into(layout.buildDirectory.dir("src/bin")) - - from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/lib")) - into(layout.buildDirectory.dir("${project.properties["build.dir"]}/lib")) - - from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/plugins")) - into(layout.buildDirectory.dir("${project.properties["build.dir"]}/plugins")) - - from(layout.buildDirectory.dir("${project.properties["runtime.local"]}/test")) - into(layout.buildDirectory.dir("${project.properties["build.dir"]}/test")) - - doLast { - project.exec { + doLast() { + project.exec() { commandLine("chmod","ugo+x","${project.properties["runtime.deploy"]}/bin") commandLine("chmod","ugo+x","${project.properties["runtime.local"]}/bin") } @@ -388,26 +376,23 @@ tasks.register("job") { dependsOn("compile") duplicatesStrategy = DuplicatesStrategy.EXCLUDE - from( - files("${project.properties["build.classes"]}") { - exclude("nutch-default.xml","nutch-site.xml") - }, - files("${project.properties["conf.dir"]}") { - exclude("*.template","hadoop*.*") - }, - files("${project.properties["build.lib.dir"]}") { - eachFile { - relativePath = RelativePath(true,"lib") - } - include("**/*.jar") - exclude("hadoop-*.jar,slf4j*.jar","log4j*.jar") - }, - files("${project.properties["build.plugins"]}") { - eachFile { - relativePath = RelativePath(true,"classes","plugins") - } - } - ) + archiveFileName.set("${project.properties["final.name"]}.job") + destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.dir"]}")) + from(layout.projectDirectory.dir("${project.properties["build.classes"]}")) { + exclude("nutch-default.xml","nutch-site.xml") + } + from(layout.projectDirectory.dir("${project.properties["conf.dir"]}")) { + exclude("*.template","hadoop*.*") + } + from(layout.projectDirectory.dir("${project.properties["build.lib.dir"]}")) { + include("**/*.jar") + exclude("hadoop-*.jar","slf4j*.jar","log4j*.jar") + into("lib") + } + from(layout.projectDirectory.dir("${project.properties["build.plugins"]}")) { + exclude("nutch-default.xml","nutch-site.xml") + into("classes/plugins") + } doLast { delete("${project.properties["build.dir"]}/tmp") } @@ -456,7 +441,7 @@ tasks.javadoc { destinationDirectory = file("${project.properties["build.javadoc"]}") windowTitle = "${project.properties["name"]} ${project.properties["version"]} API" isFailOnError = true - //TODO isFailOnWarning = true + //isFailOnWarning = true val dc = StandardJavadocDocletOptions() dc.isAuthor = true @@ -494,7 +479,6 @@ tasks.javadoc { doclet = dc.doclet } - //TODO this is meant to replace the tags include( "${project.properties["src.dir"]}", "${project.properties["plugins.dir"]}/any23/src/java/", @@ -619,9 +603,7 @@ tasks.register("package-src") includeEmptyDirs = true into("${project.properties["src.dist.version.dir"]}/src") } - //TODO skipped Ivy copy, now deprecated from(".") { - //TODO replaced Ant files with Gradle files include("build.gradle.kts","gradle.properties","settings.gradle.kts") into("${project.properties["src.dist.version.dir"]}/") } @@ -639,7 +621,7 @@ tasks.register("zip-src") fileMode = 664 exclude("src/bin/*") //TODO delete the following line once Ivy is removed completely - exclude("ivy/ivy*.jar") + exclude("ivy") include("**") }, files("${project.properties["src.dist.version.dir"]}") { From 77868f22fa1451b851a77868c2995462e6b15067 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sun, 1 May 2022 17:18:23 -0700 Subject: [PATCH 46/55] NUTCH 2940 Develop Gradle Core Build for Apache Nutch Fixes for ant javadoc errors --- src/java/org/apache/nutch/segment/SegmentMerger.java | 2 +- src/java/org/apache/nutch/tools/arc/ArcRecordReader.java | 5 ++--- .../org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/java/org/apache/nutch/segment/SegmentMerger.java b/src/java/org/apache/nutch/segment/SegmentMerger.java index 056df3c882..86e61fee28 100644 --- a/src/java/org/apache/nutch/segment/SegmentMerger.java +++ b/src/java/org/apache/nutch/segment/SegmentMerger.java @@ -76,7 +76,7 @@ *

* Also, it's possible to slice the resulting segment into chunks of fixed size. *

- *

Important Notes

Which parts are merged?

+ *

Important Notes

Which parts are merged?

*

* It doesn't make sense to merge data from segments, which are at different * stages of processing (e.g. one unfetched segment, one fetched but not parsed, diff --git a/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java b/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java index 0a93947e43..b5cf6ae951 100644 --- a/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java +++ b/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java @@ -42,9 +42,8 @@ * Arc files are essentially tars of gzips. Each record in an arc file is a * compressed gzip. Multiple records are concatenated together to form a * complete arc.

- *

For more information on the arc file format - * @see ArcFileFormat. - *

+ *

For more information on the arc file format

+ * @see ArcFileFormat

.

* *

* Arc files are used by the internet archive and grub projects. diff --git a/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java b/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java index dd8605f792..64885d7e88 100644 --- a/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java +++ b/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java @@ -78,7 +78,7 @@ * expressions, it only accepts literal suffixes. I.e. a suffix "+*.jpg" is most * probably wrong, you should use "+.jpg" instead. *

- *

Example 1

+ *

Example 1

*

* The configuration shown below will accept all URLs with '.html' or '.htm' * suffixes (case-sensitive - '.HTML' or '.HTM' will be rejected), and prohibit @@ -96,7 +96,7 @@ * .htm * * - *

Example 2

+ *

Example 2

*

* The configuration shown below will accept all URLs except common graphical * formats. From 888e497ede5b20b393abb8d5655119e9d3e2a151 Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sun, 1 May 2022 14:46:39 -0700 Subject: [PATCH 47/55] Temporary changes to javadoc target --- build.gradle.kts | 232 +++++++++++++++++++++++++++++++++++++--------- gradle.properties | 2 +- 2 files changed, 191 insertions(+), 43 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 654b98cb96..a37d9d21bf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import java.util.StringJoiner plugins { application base java `maven-publish` + `java-library` } repositories { @@ -422,6 +424,153 @@ tasks.test.configure() { dependsOn("test-core","test-plugins") } +tasks.register("jd") { + dependsOn("compile") + + val version:String = System.getProperty("java.version") + if("1.7.0_25".compareTo(version) >= 0) + throw GradleException( + "Unsupported Java version: ${version}. Javadoc requires Java version 7u25 " + + "or greater. See https://issues.apache.org/jira/browse/NUTCH-1590" + ) +// val src:String = "${project.properties["src.dir"]};"+ +// "${project.properties["plugins.dir"]}/any23/src/java;"+ +// "${project.properties["plugins.dir"]}/creativecommons/src/java;"+ +// "${project.properties["plugins.dir"]}/feed/src/java;"+ +// "${project.properties["plugins.dir"]}/headings/src/java;"+ +// "${project.properties["plugins.dir"]}/exchange-jexl/src/java;"+ +// "${project.properties["plugins.dir"]}/index-anchor/src/java;"+ +// "${project.properties["plugins.dir"]}/index-basic/src/java;"+ +// "${project.properties["plugins.dir"]}/index-geoip/src/java;"+ +// "${project.properties["plugins.dir"]}/index-jexl-filter/src/java;"+ +// "${project.properties["plugins.dir"]}/index-links/src/java;"+ +// "${project.properties["plugins.dir"]}/index-metadata/src/java;"+ +// "${project.properties["plugins.dir"]}/index-more/src/java;"+ +// "${project.properties["plugins.dir"]}/index-replace/src/java;"+ +// "${project.properties["plugins.dir"]}/index-static/src/java;"+ +// "${project.properties["plugins.dir"]}/indexer-cloudsearch/src/java/;"+ +// "${project.properties["plugins.dir"]}/indexer-csv/src/java;"+ +// "${project.properties["plugins.dir"]}/indexer-dummy/src/java;"+ +// "${project.properties["plugins.dir"]}/indexer-elastic/src/java/;"+ +// "${project.properties["plugins.dir"]}/indexer-kafka/src/java/;"+ +// "${project.properties["plugins.dir"]}/indexer-rabbit/src/java;"+ +// "${project.properties["plugins.dir"]}/indexer-solr/src/java;"+ +// "${project.properties["plugins.dir"]}/language-identifier/src/java;"+ +// "${project.properties["plugins.dir"]}/lib-htmlunit/src/java;"+ +// "${project.properties["plugins.dir"]}/lib-http/src/java;"+ +// "${project.properties["plugins.dir"]}/lib-rabbitmq/src/java;"+ +// "${project.properties["plugins.dir"]}/lib-regex-filter/src/java;"+ +// "${project.properties["plugins.dir"]}/lib-selenium/src/java;"+ +// "${project.properties["plugins.dir"]}/microformats-reltag/src/java;"+ +// "${project.properties["plugins.dir"]}/mimetype-filter/src/java;"+ +// "${project.properties["plugins.dir"]}/parse-ext/src/java;"+ +// "${project.properties["plugins.dir"]}/parse-html/src/java;"+ +// "${project.properties["plugins.dir"]}/parse-js/src/java;"+ +// "${project.properties["plugins.dir"]}/parse-metatags/src/java;"+ +// "${project.properties["plugins.dir"]}/parse-swf/src/java;"+ +// "${project.properties["plugins.dir"]}/parse-tika/src/java;"+ +// "${project.properties["plugins.dir"]}/parse-zip/src/java;"+ +// "${project.properties["plugins.dir"]}/parsefilter-debug/src/java;"+ +// "${project.properties["plugins.dir"]}/parsefilter-naivebayes/src/java;"+ +// "${project.properties["plugins.dir"]}/parsefilter-regex/src/java;"+ +// "${project.properties["plugins.dir"]}/protocol-file/src/java;"+ +// "${project.properties["plugins.dir"]}/protocol-ftp/src/java;"+ +// "${project.properties["plugins.dir"]}/protocol-htmlunit/src/java;"+ +// "${project.properties["plugins.dir"]}/protocol-http/src/java;"+ +// "${project.properties["plugins.dir"]}/protocol-httpclient/src/java;"+ +// "${project.properties["plugins.dir"]}/protocol-interactiveselenium/src/java;"+ +// "${project.properties["plugins.dir"]}/protocol-okhttp/src/java;"+ +// "${project.properties["plugins.dir"]}/protocol-selenium/src/java;"+ +// "${project.properties["plugins.dir"]}/publish-rabbitmq/src/java;"+ +// "${project.properties["plugins.dir"]}/scoring-depth/src/java;"+ +// "${project.properties["plugins.dir"]}/scoring-link/src/java;"+ +// "${project.properties["plugins.dir"]}/scoring-opic/src/java;"+ +// "${project.properties["plugins.dir"]}/scoring-orphan/src/java;"+ +// "${project.properties["plugins.dir"]}/scoring-similarity/src/java;"+ +// "${project.properties["plugins.dir"]}/scoring-metadata/src/java;"+ +// "${project.properties["plugins.dir"]}/subcollection/src/java;"+ +// "${project.properties["plugins.dir"]}/tld/src/java;"+ +// "${project.properties["plugins.dir"]}/urlfilter-automaton/src/java;"+ +// "${project.properties["plugins.dir"]}/urlfilter-domain/src/java;"+ +// "${project.properties["plugins.dir"]}/urlfilter-domaindenylist/src/java;"+ +// "${project.properties["plugins.dir"]}/urlfilter-fast/src/java;"+ +// "${project.properties["plugins.dir"]}/urlfilter-ignoreexempt/src/java;"+ +// "${project.properties["plugins.dir"]}/urlfilter-prefix/src/java;"+ +// "${project.properties["plugins.dir"]}/urlfilter-regex/src/java;"+ +// "${project.properties["plugins.dir"]}/urlfilter-suffix/src/java;"+ +// "${project.properties["plugins.dir"]}/urlfilter-validator/src/java;"+ +// "${project.properties["plugins.dir"]}/urlmeta/src/java;"+ +// "${project.properties["plugins.dir"]}/urlnormalizer-ajax/src/java;"+ +// "${project.properties["plugins.dir"]}/urlnormalizer-basic/src/java;"+ +// "${project.properties["plugins.dir"]}/urlnormalizer-host/src/java;"+ +// "${project.properties["plugins.dir"]}/urlnormalizer-pass/src/java;"+ +// "${project.properties["plugins.dir"]}/urlnormalizer-protocol/src/java;"+ +// "${project.properties["plugins.dir"]}/urlnormalizer-querystring/src/java;"+ +// "${project.properties["plugins.dir"]}/urlnormalizer-regex/src/java;"+ +// "${project.properties["plugins.dir"]}/urlnormalizer-slash/src/java" +// commandLine( +// "javadoc", +// "-d","build/docs/api", +// "-sourcepath",src, +// "-classpath","src/plugin/*;build/lib/*", +// "-subpackages","org.apache.nutch:org.apache.nutch.any23", +// ) + val org:String = "org.apache.nutch." + val pkg:String = org+"crawl:"+ + org+"exchange:"+ + org+"fetcher:"+ + org+"hostdb:"+ + org+"indexer:"+ + org+"metadata:"+ + org+"net:"+ + org+"parse:"+ + org+"plugin:"+ + org+"protocol:"+ + org+"publisher:"+ + org+"scoring:"+ + org+"segment:"+ + org+"service:"+ + org+"tools:"+ + org+"util" + +// var cls:StringJoiner = StringJoiner(";") +// fileTree("${project.properties["build.plugins"]}").matching { +// include("**/*.jar") +// exclude("any23/javax.annotation-api*.jar") +// }.forEach { +// cls.add(it.path) +// } + isIgnoreExitValue = true + commandLine( + "javadoc", + "-d","build/docs/api", + "-sourcepath","src/java", + "-classpath","${project.properties["plugins.dir"]}/*;${project.properties["build.lib.dir"]}/*", + //"-classpath",cls.toString(), + "-author", + "-windowtitle","\"${project.properties["name"]} ${project.properties["version"]} API\"", + "-doctitle","\"${project.properties["name"]} ${project.properties["version"]} API\"", + "-bottom","\"Copyright &copy; ${project.properties["year"]} The Apache Software Foundation\"", + "-link","${project.properties["javadoc.link.java"]}", + "-link","${project.properties["javadoc.link.hadoop"]}", + "-group","\"Core\"" ,"org.apache.nutch.*", + "-group","\"Plugins Api\"" ,"\"${project.properties["plugins.api"]}\"", + "-group","\"Protocol Plugins\"" ,"\"${project.properties["plugins.protocol"]}\"", + "-group","\"URL Filter Plugins\"" ,"\"${project.properties["plugins.urlfilter"]}\"", + "-group","\"URL Normalizer Plugins\"" ,"\"${project.properties["plugins.urlnormalizer"]}\"", + "-group","\"Scoring Plugins\"" ,"\"${project.properties["plugins.scoring"]}\"", + "-group","\"Parse Plugins\"" ,"\"${project.properties["plugins.parse"]}\"", + "-group","\"Parse Filter Plugins\"" ,"\"${project.properties["plugins.parsefilter"]}\"", + "-group","\"Publisher Plugins\"" ,"\"${project.properties["plugins.publisher"]}\"", + "-group","\"Exchange Plugins\"" ,"\"${project.properties["plugins.exchange"]}\"", + "-group","\"Indexing Filter Plugins\"","\"${project.properties["plugins.index"]}\"", + "-group","\"Indexer Plugins\"" ,"\"${project.properties["plugins.indexer"]}\"", + "-group","\"Misc. Plugins\"" ,"\"${project.properties["plugins.misc"]}\"", + "-overview","\"${project.properties["src.dir"]}/overview.html\"", + "-use", + "-subpackages",pkg + ) +} tasks.javadoc { description = "Generate Javadoc" dependsOn("compile") @@ -433,50 +582,61 @@ tasks.javadoc { "or greater. See https://issues.apache.org/jira/browse/NUTCH-1590" ) + //source = sourceSets.main.get().java + setDestinationDir(file("${project.properties["build.javadoc"]}")) + mkdir("${project.properties["build.javadoc"]}") mkdir("${project.properties["build.javadoc"]}/resources") options { + this as StandardJavadocDocletOptions + + addStringOption("sourcepath","${project.properties["src.dir"]}") overview = "${project.properties["src.dir"]}/overview.html" destinationDirectory = file("${project.properties["build.javadoc"]}") windowTitle = "${project.properties["name"]} ${project.properties["version"]} API" isFailOnError = true //isFailOnWarning = true - - val dc = StandardJavadocDocletOptions() - dc.isAuthor = true - dc.isVersion = true - dc.isUse = true - dc.docTitle = windowTitle - dc.bottom = "Copyright &copy; ${project.properties["year"]} The Apache Software Foundation" - dc.addStringOption("${project.properties["javadoc.proxy.host"]}") - dc.addStringOption("${project.properties["javadoc.proxy.port"]}") - dc.addBooleanOption("--allow-script-in-comments") - dc.links( - "${project.properties["javadoc.link.java"]}", - "${project.properties["javadoc.link.hadoop"]}" - ) - dc.classpath = files("${project.properties["build.plugins"]}") { + classpath = files("${project.properties["build.plugins"]}") { include("**/*.jar") exclude("any23/javax.annotation-api*.jar") }.distinct() - dc.groups = mutableMapOf( + isAuthor = true + isVersion = true + isUse = true + docTitle = windowTitle + bottom = "Copyright &copy; ${project.properties["year"]} The Apache Software Foundation" + links("${project.properties["javadoc.link.java"]}","${project.properties["javadoc.link.hadoop"]}") + groups = mutableMapOf( "Core" to mutableListOf("org.apache.nutch.*"), - "Plugins API" to mutableListOf("${project.properties["plugins.api"]}"), - "Protocol Plugins" to mutableListOf("${project.properties["plugins.protocol"]}"), - "URL Filter Plugins" to mutableListOf("${project.properties["plugins.urlfilter"]}"), - "URL Normalizer Plugins" to mutableListOf("${project.properties["plugins.urlnormalizer"]}"), - "Scoring Plugins" to mutableListOf("${project.properties["plugins.scoring"]}"), - "Parse Plugins" to mutableListOf("${project.properties["plugins.parse"]}"), - "Parse Filter Plugins" to mutableListOf("${project.properties["plugins.parsefilter"]}"), - "Publisher Plugins" to mutableListOf("${project.properties["plugins.publisher"]}"), - "Exchange Plugins" to mutableListOf("${project.properties["plugins.exchange"]}"), - "Indexing Filter Plugins" to mutableListOf("${project.properties["plugins.index"]}"), - "Indexer Plugins" to mutableListOf("${project.properties["plugins.indexer"]}"), - "Misc. Plugins" to mutableListOf("${project.properties["plugins.misc"]}") + "Plugins API" to "${project.properties["plugins.api"]}" .split(":"), + "Protocol Plugins" to "${project.properties["plugins.protocol"]}" .split(":"), + "URL Filter Plugins" to "${project.properties["plugins.urlfilter"]}" .split(":"), + "URL Normalizer Plugins" to "${project.properties["plugins.urlnormalizer"]}".split(":"), + "Scoring Plugins" to "${project.properties["plugins.scoring"]}" .split(":"), + "Parse Plugins" to "${project.properties["plugins.parse"]}" .split(":"), + "Parse Filter Plugins" to "${project.properties["plugins.parsefilter"]}" .split(":"), + "Publisher Plugins" to "${project.properties["plugins.publisher"]}" .split(":"), + "Exchange Plugins" to "${project.properties["plugins.exchange"]}" .split(":"), + "Indexing Filter Plugins" to "${project.properties["plugins.index"]}" .split(":"), + "Indexer Plugins" to "${project.properties["plugins.indexer"]}" .split(":"), + "Misc. Plugins" to "${project.properties["plugins.misc"]}" .split(":") + ) + addStringOption("${project.properties["javadoc.proxy.host"]}","") + addStringOption("${project.properties["javadoc.proxy.port"]}","") + addBooleanOption("allow-script-in-comments",true) + } + + copy { + from("${project.properties["plugins.dir"]}/plugin.dtd") + into("${project.properties["build.javadoc"]}/org/apache/nutch/plugin/doc-files") + } + copy { + from( + "${project.properties["conf.dir"]}/nutch-default.xml", + "${project.properties["conf.dir"]}/configuration.xsl" ) - // TODO it is unclear if this actually gets applied to the javadoc options - doclet = dc.doclet + into("${project.properties["build.javadoc"]}/resources/") } include( @@ -556,18 +716,6 @@ tasks.javadoc { "${project.properties["plugins.dir"]}/urlnormalizer-regex/src/java", "${project.properties["plugins.dir"]}/urlnormalizer-slash/src/java" ) - - copy { - from("${project.properties["plugins.dir"]}/plugin.dtd") - into("${project.properties["build.javadoc"]}/org/apache/nutch/plugin/doc-files") - } - copy { - from( - "${project.properties["conf.dir"]}/nutch-default.xml", - "${project.properties["conf.dir"]}/configuration.xsl" - ) - into("${project.properties["build.javadoc"]}/resources/") - } } tasks.register("package-src") diff --git a/gradle.properties b/gradle.properties index 6bf57aae59..318257f0f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -113,7 +113,7 @@ plugins.scoring=\ org.apache.nutch.scoring.orphan*:\ org.apache.nutch.scoring.similarity*:\ org.apache.nutch.scoring.tld*:\ - org.apache.nutch.scoring.urlmeta*\ + org.apache.nutch.scoring.urlmeta*:\ org.apache.nutch.scoring.metadata* # From 6c8423fc1541ce33c0e4626c86edf26373cd31d6 Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sun, 1 May 2022 15:51:38 -0700 Subject: [PATCH 48/55] Updated javadoc target --- build.gradle.kts | 471 ++++++++++++++++++++--------------------------- 1 file changed, 195 insertions(+), 276 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a37d9d21bf..e7885893d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import java.util.StringJoiner plugins { application @@ -424,299 +423,219 @@ tasks.test.configure() { dependsOn("test-core","test-plugins") } -tasks.register("jd") { +// Dummy target. This just ensures that the compile target always happens before the command line invocation +tasks.register("javadoc-dummy") { dependsOn("compile") val version:String = System.getProperty("java.version") if("1.7.0_25".compareTo(version) >= 0) throw GradleException( "Unsupported Java version: ${version}. Javadoc requires Java version 7u25 " + - "or greater. See https://issues.apache.org/jira/browse/NUTCH-1590" + "or greater. See https://issues.apache.org/jira/browse/NUTCH-1590" ) -// val src:String = "${project.properties["src.dir"]};"+ -// "${project.properties["plugins.dir"]}/any23/src/java;"+ -// "${project.properties["plugins.dir"]}/creativecommons/src/java;"+ -// "${project.properties["plugins.dir"]}/feed/src/java;"+ -// "${project.properties["plugins.dir"]}/headings/src/java;"+ -// "${project.properties["plugins.dir"]}/exchange-jexl/src/java;"+ -// "${project.properties["plugins.dir"]}/index-anchor/src/java;"+ -// "${project.properties["plugins.dir"]}/index-basic/src/java;"+ -// "${project.properties["plugins.dir"]}/index-geoip/src/java;"+ -// "${project.properties["plugins.dir"]}/index-jexl-filter/src/java;"+ -// "${project.properties["plugins.dir"]}/index-links/src/java;"+ -// "${project.properties["plugins.dir"]}/index-metadata/src/java;"+ -// "${project.properties["plugins.dir"]}/index-more/src/java;"+ -// "${project.properties["plugins.dir"]}/index-replace/src/java;"+ -// "${project.properties["plugins.dir"]}/index-static/src/java;"+ -// "${project.properties["plugins.dir"]}/indexer-cloudsearch/src/java/;"+ -// "${project.properties["plugins.dir"]}/indexer-csv/src/java;"+ -// "${project.properties["plugins.dir"]}/indexer-dummy/src/java;"+ -// "${project.properties["plugins.dir"]}/indexer-elastic/src/java/;"+ -// "${project.properties["plugins.dir"]}/indexer-kafka/src/java/;"+ -// "${project.properties["plugins.dir"]}/indexer-rabbit/src/java;"+ -// "${project.properties["plugins.dir"]}/indexer-solr/src/java;"+ -// "${project.properties["plugins.dir"]}/language-identifier/src/java;"+ -// "${project.properties["plugins.dir"]}/lib-htmlunit/src/java;"+ -// "${project.properties["plugins.dir"]}/lib-http/src/java;"+ -// "${project.properties["plugins.dir"]}/lib-rabbitmq/src/java;"+ -// "${project.properties["plugins.dir"]}/lib-regex-filter/src/java;"+ -// "${project.properties["plugins.dir"]}/lib-selenium/src/java;"+ -// "${project.properties["plugins.dir"]}/microformats-reltag/src/java;"+ -// "${project.properties["plugins.dir"]}/mimetype-filter/src/java;"+ -// "${project.properties["plugins.dir"]}/parse-ext/src/java;"+ -// "${project.properties["plugins.dir"]}/parse-html/src/java;"+ -// "${project.properties["plugins.dir"]}/parse-js/src/java;"+ -// "${project.properties["plugins.dir"]}/parse-metatags/src/java;"+ -// "${project.properties["plugins.dir"]}/parse-swf/src/java;"+ -// "${project.properties["plugins.dir"]}/parse-tika/src/java;"+ -// "${project.properties["plugins.dir"]}/parse-zip/src/java;"+ -// "${project.properties["plugins.dir"]}/parsefilter-debug/src/java;"+ -// "${project.properties["plugins.dir"]}/parsefilter-naivebayes/src/java;"+ -// "${project.properties["plugins.dir"]}/parsefilter-regex/src/java;"+ -// "${project.properties["plugins.dir"]}/protocol-file/src/java;"+ -// "${project.properties["plugins.dir"]}/protocol-ftp/src/java;"+ -// "${project.properties["plugins.dir"]}/protocol-htmlunit/src/java;"+ -// "${project.properties["plugins.dir"]}/protocol-http/src/java;"+ -// "${project.properties["plugins.dir"]}/protocol-httpclient/src/java;"+ -// "${project.properties["plugins.dir"]}/protocol-interactiveselenium/src/java;"+ -// "${project.properties["plugins.dir"]}/protocol-okhttp/src/java;"+ -// "${project.properties["plugins.dir"]}/protocol-selenium/src/java;"+ -// "${project.properties["plugins.dir"]}/publish-rabbitmq/src/java;"+ -// "${project.properties["plugins.dir"]}/scoring-depth/src/java;"+ -// "${project.properties["plugins.dir"]}/scoring-link/src/java;"+ -// "${project.properties["plugins.dir"]}/scoring-opic/src/java;"+ -// "${project.properties["plugins.dir"]}/scoring-orphan/src/java;"+ -// "${project.properties["plugins.dir"]}/scoring-similarity/src/java;"+ -// "${project.properties["plugins.dir"]}/scoring-metadata/src/java;"+ -// "${project.properties["plugins.dir"]}/subcollection/src/java;"+ -// "${project.properties["plugins.dir"]}/tld/src/java;"+ -// "${project.properties["plugins.dir"]}/urlfilter-automaton/src/java;"+ -// "${project.properties["plugins.dir"]}/urlfilter-domain/src/java;"+ -// "${project.properties["plugins.dir"]}/urlfilter-domaindenylist/src/java;"+ -// "${project.properties["plugins.dir"]}/urlfilter-fast/src/java;"+ -// "${project.properties["plugins.dir"]}/urlfilter-ignoreexempt/src/java;"+ -// "${project.properties["plugins.dir"]}/urlfilter-prefix/src/java;"+ -// "${project.properties["plugins.dir"]}/urlfilter-regex/src/java;"+ -// "${project.properties["plugins.dir"]}/urlfilter-suffix/src/java;"+ -// "${project.properties["plugins.dir"]}/urlfilter-validator/src/java;"+ -// "${project.properties["plugins.dir"]}/urlmeta/src/java;"+ -// "${project.properties["plugins.dir"]}/urlnormalizer-ajax/src/java;"+ -// "${project.properties["plugins.dir"]}/urlnormalizer-basic/src/java;"+ -// "${project.properties["plugins.dir"]}/urlnormalizer-host/src/java;"+ -// "${project.properties["plugins.dir"]}/urlnormalizer-pass/src/java;"+ -// "${project.properties["plugins.dir"]}/urlnormalizer-protocol/src/java;"+ -// "${project.properties["plugins.dir"]}/urlnormalizer-querystring/src/java;"+ -// "${project.properties["plugins.dir"]}/urlnormalizer-regex/src/java;"+ -// "${project.properties["plugins.dir"]}/urlnormalizer-slash/src/java" -// commandLine( -// "javadoc", -// "-d","build/docs/api", -// "-sourcepath",src, -// "-classpath","src/plugin/*;build/lib/*", -// "-subpackages","org.apache.nutch:org.apache.nutch.any23", -// ) + val org:String = "org.apache.nutch." val pkg:String = org+"crawl:"+ - org+"exchange:"+ - org+"fetcher:"+ - org+"hostdb:"+ - org+"indexer:"+ - org+"metadata:"+ - org+"net:"+ - org+"parse:"+ - org+"plugin:"+ - org+"protocol:"+ - org+"publisher:"+ - org+"scoring:"+ - org+"segment:"+ - org+"service:"+ - org+"tools:"+ - org+"util" - -// var cls:StringJoiner = StringJoiner(";") -// fileTree("${project.properties["build.plugins"]}").matching { -// include("**/*.jar") -// exclude("any23/javax.annotation-api*.jar") -// }.forEach { -// cls.add(it.path) -// } + org+"exchange:"+ + org+"fetcher:"+ + org+"hostdb:"+ + org+"indexer:"+ + org+"metadata:"+ + org+"net:"+ + org+"parse:"+ + org+"plugin:"+ + org+"protocol:"+ + org+"publisher:"+ + org+"scoring:"+ + org+"segment:"+ + org+"service:"+ + org+"tools:"+ + org+"util" + isIgnoreExitValue = true commandLine( "javadoc", - "-d","build/docs/api", - "-sourcepath","src/java", - "-classpath","${project.properties["plugins.dir"]}/*;${project.properties["build.lib.dir"]}/*", - //"-classpath",cls.toString(), + "-d", "build/docs/api", + "-sourcepath", "src/java", + "-classpath", "${project.properties["plugins.dir"]}/*;${project.properties["build.lib.dir"]}/*", "-author", - "-windowtitle","\"${project.properties["name"]} ${project.properties["version"]} API\"", - "-doctitle","\"${project.properties["name"]} ${project.properties["version"]} API\"", - "-bottom","\"Copyright &copy; ${project.properties["year"]} The Apache Software Foundation\"", - "-link","${project.properties["javadoc.link.java"]}", - "-link","${project.properties["javadoc.link.hadoop"]}", - "-group","\"Core\"" ,"org.apache.nutch.*", - "-group","\"Plugins Api\"" ,"\"${project.properties["plugins.api"]}\"", - "-group","\"Protocol Plugins\"" ,"\"${project.properties["plugins.protocol"]}\"", - "-group","\"URL Filter Plugins\"" ,"\"${project.properties["plugins.urlfilter"]}\"", - "-group","\"URL Normalizer Plugins\"" ,"\"${project.properties["plugins.urlnormalizer"]}\"", - "-group","\"Scoring Plugins\"" ,"\"${project.properties["plugins.scoring"]}\"", - "-group","\"Parse Plugins\"" ,"\"${project.properties["plugins.parse"]}\"", - "-group","\"Parse Filter Plugins\"" ,"\"${project.properties["plugins.parsefilter"]}\"", - "-group","\"Publisher Plugins\"" ,"\"${project.properties["plugins.publisher"]}\"", - "-group","\"Exchange Plugins\"" ,"\"${project.properties["plugins.exchange"]}\"", - "-group","\"Indexing Filter Plugins\"","\"${project.properties["plugins.index"]}\"", - "-group","\"Indexer Plugins\"" ,"\"${project.properties["plugins.indexer"]}\"", - "-group","\"Misc. Plugins\"" ,"\"${project.properties["plugins.misc"]}\"", - "-overview","\"${project.properties["src.dir"]}/overview.html\"", + "-windowtitle", "\"${project.properties["name"]} ${project.properties["version"]} API\"", + "-doctitle", "\"${project.properties["name"]} ${project.properties["version"]} API\"", + "-bottom", "\"Copyright &copy; ${project.properties["year"]} The Apache Software Foundation\"", + "-link", "${project.properties["javadoc.link.java"]}", + "-link", "${project.properties["javadoc.link.hadoop"]}", + "-group", "\"Core\"", "org.apache.nutch.*", + "-group", "\"Plugins Api\"", "\"${project.properties["plugins.api"]}\"", + "-group", "\"Protocol Plugins\"", "\"${project.properties["plugins.protocol"]}\"", + "-group", "\"URL Filter Plugins\"", "\"${project.properties["plugins.urlfilter"]}\"", + "-group", "\"URL Normalizer Plugins\"", "\"${project.properties["plugins.urlnormalizer"]}\"", + "-group", "\"Scoring Plugins\"", "\"${project.properties["plugins.scoring"]}\"", + "-group", "\"Parse Plugins\"", "\"${project.properties["plugins.parse"]}\"", + "-group", "\"Parse Filter Plugins\"", "\"${project.properties["plugins.parsefilter"]}\"", + "-group", "\"Publisher Plugins\"", "\"${project.properties["plugins.publisher"]}\"", + "-group", "\"Exchange Plugins\"", "\"${project.properties["plugins.exchange"]}\"", + "-group", "\"Indexing Filter Plugins\"", "\"${project.properties["plugins.index"]}\"", + "-group", "\"Indexer Plugins\"", "\"${project.properties["plugins.indexer"]}\"", + "-group", "\"Misc. Plugins\"", "\"${project.properties["plugins.misc"]}\"", + "-overview", "\"${project.properties["src.dir"]}/overview.html\"", "-use", + "--allow-script-in-comments", + "-J-DproxyPort=", + "-J-DproxyHost=", "-subpackages",pkg ) } -tasks.javadoc { +tasks.javadoc.configure { description = "Generate Javadoc" - dependsOn("compile") - - val version:String = System.getProperty("java.version") - if("1.7.0_25".compareTo(version) >= 0) - throw GradleException( - "Unsupported Java version: ${version}. Javadoc requires Java version 7u25 " + - "or greater. See https://issues.apache.org/jira/browse/NUTCH-1590" - ) - - //source = sourceSets.main.get().java - setDestinationDir(file("${project.properties["build.javadoc"]}")) - - mkdir("${project.properties["build.javadoc"]}") - mkdir("${project.properties["build.javadoc"]}/resources") - - options { - this as StandardJavadocDocletOptions - - addStringOption("sourcepath","${project.properties["src.dir"]}") - overview = "${project.properties["src.dir"]}/overview.html" - destinationDirectory = file("${project.properties["build.javadoc"]}") - windowTitle = "${project.properties["name"]} ${project.properties["version"]} API" - isFailOnError = true - //isFailOnWarning = true - classpath = files("${project.properties["build.plugins"]}") { - include("**/*.jar") - exclude("any23/javax.annotation-api*.jar") - }.distinct() - isAuthor = true - isVersion = true - isUse = true - docTitle = windowTitle - bottom = "Copyright &copy; ${project.properties["year"]} The Apache Software Foundation" - links("${project.properties["javadoc.link.java"]}","${project.properties["javadoc.link.hadoop"]}") - groups = mutableMapOf( - "Core" to mutableListOf("org.apache.nutch.*"), - "Plugins API" to "${project.properties["plugins.api"]}" .split(":"), - "Protocol Plugins" to "${project.properties["plugins.protocol"]}" .split(":"), - "URL Filter Plugins" to "${project.properties["plugins.urlfilter"]}" .split(":"), - "URL Normalizer Plugins" to "${project.properties["plugins.urlnormalizer"]}".split(":"), - "Scoring Plugins" to "${project.properties["plugins.scoring"]}" .split(":"), - "Parse Plugins" to "${project.properties["plugins.parse"]}" .split(":"), - "Parse Filter Plugins" to "${project.properties["plugins.parsefilter"]}" .split(":"), - "Publisher Plugins" to "${project.properties["plugins.publisher"]}" .split(":"), - "Exchange Plugins" to "${project.properties["plugins.exchange"]}" .split(":"), - "Indexing Filter Plugins" to "${project.properties["plugins.index"]}" .split(":"), - "Indexer Plugins" to "${project.properties["plugins.indexer"]}" .split(":"), - "Misc. Plugins" to "${project.properties["plugins.misc"]}" .split(":") - ) - addStringOption("${project.properties["javadoc.proxy.host"]}","") - addStringOption("${project.properties["javadoc.proxy.port"]}","") - addBooleanOption("allow-script-in-comments",true) - } - - copy { - from("${project.properties["plugins.dir"]}/plugin.dtd") - into("${project.properties["build.javadoc"]}/org/apache/nutch/plugin/doc-files") - } - copy { - from( - "${project.properties["conf.dir"]}/nutch-default.xml", - "${project.properties["conf.dir"]}/configuration.xsl" - ) - into("${project.properties["build.javadoc"]}/resources/") - } - - include( - "${project.properties["src.dir"]}", - "${project.properties["plugins.dir"]}/any23/src/java/", - "${project.properties["plugins.dir"]}/creativecommons/src/java", - "${project.properties["plugins.dir"]}/feed/src/java", - "${project.properties["plugins.dir"]}/headings/src/java", - "${project.properties["plugins.dir"]}/exchange-jexl/src/java", - "${project.properties["plugins.dir"]}/index-anchor/src/java", - "${project.properties["plugins.dir"]}/index-basic/src/java", - "${project.properties["plugins.dir"]}/index-geoip/src/java", - "${project.properties["plugins.dir"]}/index-jexl-filter/src/java", - "${project.properties["plugins.dir"]}/index-links/src/java", - "${project.properties["plugins.dir"]}/index-metadata/src/java", - "${project.properties["plugins.dir"]}/index-more/src/java", - "${project.properties["plugins.dir"]}/index-replace/src/java", - "${project.properties["plugins.dir"]}/index-static/src/java", - "${project.properties["plugins.dir"]}/indexer-cloudsearch/src/java/", - "${project.properties["plugins.dir"]}/indexer-csv/src/java", - "${project.properties["plugins.dir"]}/indexer-dummy/src/java", - "${project.properties["plugins.dir"]}/indexer-elastic/src/java/", - "${project.properties["plugins.dir"]}/indexer-kafka/src/java/", - "${project.properties["plugins.dir"]}/indexer-rabbit/src/java", - "${project.properties["plugins.dir"]}/indexer-solr/src/java", - "${project.properties["plugins.dir"]}/language-identifier/src/java", - "${project.properties["plugins.dir"]}/lib-htmlunit/src/java", - "${project.properties["plugins.dir"]}/lib-http/src/java", - "${project.properties["plugins.dir"]}/lib-rabbitmq/src/java", - "${project.properties["plugins.dir"]}/lib-regex-filter/src/java", - "${project.properties["plugins.dir"]}/lib-selenium/src/java", - "${project.properties["plugins.dir"]}/microformats-reltag/src/java", - "${project.properties["plugins.dir"]}/mimetype-filter/src/java", - "${project.properties["plugins.dir"]}/parse-ext/src/java", - "${project.properties["plugins.dir"]}/parse-html/src/java", - "${project.properties["plugins.dir"]}/parse-js/src/java", - "${project.properties["plugins.dir"]}/parse-metatags/src/java", - "${project.properties["plugins.dir"]}/parse-swf/src/java", - "${project.properties["plugins.dir"]}/parse-tika/src/java", - "${project.properties["plugins.dir"]}/parse-zip/src/java", - "${project.properties["plugins.dir"]}/parsefilter-debug/src/java", - "${project.properties["plugins.dir"]}/parsefilter-naivebayes/src/java", - "${project.properties["plugins.dir"]}/parsefilter-regex/src/java", - "${project.properties["plugins.dir"]}/protocol-file/src/java", - "${project.properties["plugins.dir"]}/protocol-ftp/src/java", - "${project.properties["plugins.dir"]}/protocol-htmlunit/src/java", - "${project.properties["plugins.dir"]}/protocol-http/src/java", - "${project.properties["plugins.dir"]}/protocol-httpclient/src/java", - "${project.properties["plugins.dir"]}/protocol-interactiveselenium/src/java", - "${project.properties["plugins.dir"]}/protocol-okhttp/src/java", - "${project.properties["plugins.dir"]}/protocol-selenium/src/java", - "${project.properties["plugins.dir"]}/publish-rabbitmq/src/java", - "${project.properties["plugins.dir"]}/scoring-depth/src/java", - "${project.properties["plugins.dir"]}/scoring-link/src/java", - "${project.properties["plugins.dir"]}/scoring-opic/src/java", - "${project.properties["plugins.dir"]}/scoring-orphan/src/java", - "${project.properties["plugins.dir"]}/scoring-similarity/src/java", - "${project.properties["plugins.dir"]}/scoring-metadata/src/java", - "${project.properties["plugins.dir"]}/subcollection/src/java", - "${project.properties["plugins.dir"]}/tld/src/java", - "${project.properties["plugins.dir"]}/urlfilter-automaton/src/java", - "${project.properties["plugins.dir"]}/urlfilter-domain/src/java", - "${project.properties["plugins.dir"]}/urlfilter-domaindenylist/src/java", - "${project.properties["plugins.dir"]}/urlfilter-fast/src/java", - "${project.properties["plugins.dir"]}/urlfilter-ignoreexempt/src/java", - "${project.properties["plugins.dir"]}/urlfilter-prefix/src/java", - "${project.properties["plugins.dir"]}/urlfilter-regex/src/java", - "${project.properties["plugins.dir"]}/urlfilter-suffix/src/java", - "${project.properties["plugins.dir"]}/urlfilter-validator/src/java", - "${project.properties["plugins.dir"]}/urlmeta/src/java", - "${project.properties["plugins.dir"]}/urlnormalizer-ajax/src/java", - "${project.properties["plugins.dir"]}/urlnormalizer-basic/src/java", - "${project.properties["plugins.dir"]}/urlnormalizer-host/src/java", - "${project.properties["plugins.dir"]}/urlnormalizer-pass/src/java", - "${project.properties["plugins.dir"]}/urlnormalizer-protocol/src/java", - "${project.properties["plugins.dir"]}/urlnormalizer-querystring/src/java", - "${project.properties["plugins.dir"]}/urlnormalizer-regex/src/java", - "${project.properties["plugins.dir"]}/urlnormalizer-slash/src/java" - ) -} + dependsOn("javadoc-dummy") +} +// TODO The following is the Gradle version of the javadoc target. For some unknown reason, it does +// not produce any results. +//tasks.javadoc { +// description = "Generate Javadoc" +// dependsOn("compile") +// +// val version:String = System.getProperty("java.version") +// if("1.7.0_25".compareTo(version) >= 0) +// throw GradleException( +// "Unsupported Java version: ${version}. Javadoc requires Java version 7u25 " + +// "or greater. See https://issues.apache.org/jira/browse/NUTCH-1590" +// ) +// +// setDestinationDir(file("${project.properties["build.javadoc"]}")) +// +// mkdir("${project.properties["build.javadoc"]}") +// mkdir("${project.properties["build.javadoc"]}/resources") +// +// options { +// this as StandardJavadocDocletOptions +// +// addStringOption("sourcepath","${project.properties["src.dir"]}") +// overview = "${project.properties["src.dir"]}/overview.html" +// destinationDirectory = file("${project.properties["build.javadoc"]}") +// windowTitle = "${project.properties["name"]} ${project.properties["version"]} API" +// isFailOnError = true +// //isFailOnWarning = true +// classpath = files("${project.properties["build.plugins"]}") { +// include("**/*.jar") +// exclude("any23/javax.annotation-api*.jar") +// }.distinct() +// isAuthor = true +// isVersion = true +// isUse = true +// docTitle = windowTitle +// bottom = "Copyright &copy; ${project.properties["year"]} The Apache Software Foundation" +// links("${project.properties["javadoc.link.java"]}","${project.properties["javadoc.link.hadoop"]}") +// groups = mutableMapOf( +// "Core" to mutableListOf("org.apache.nutch.*"), +// "Plugins API" to "${project.properties["plugins.api"]}" .split(":"), +// "Protocol Plugins" to "${project.properties["plugins.protocol"]}" .split(":"), +// "URL Filter Plugins" to "${project.properties["plugins.urlfilter"]}" .split(":"), +// "URL Normalizer Plugins" to "${project.properties["plugins.urlnormalizer"]}".split(":"), +// "Scoring Plugins" to "${project.properties["plugins.scoring"]}" .split(":"), +// "Parse Plugins" to "${project.properties["plugins.parse"]}" .split(":"), +// "Parse Filter Plugins" to "${project.properties["plugins.parsefilter"]}" .split(":"), +// "Publisher Plugins" to "${project.properties["plugins.publisher"]}" .split(":"), +// "Exchange Plugins" to "${project.properties["plugins.exchange"]}" .split(":"), +// "Indexing Filter Plugins" to "${project.properties["plugins.index"]}" .split(":"), +// "Indexer Plugins" to "${project.properties["plugins.indexer"]}" .split(":"), +// "Misc. Plugins" to "${project.properties["plugins.misc"]}" .split(":") +// ) +// addStringOption("${project.properties["javadoc.proxy.host"]}","") +// addStringOption("${project.properties["javadoc.proxy.port"]}","") +// addBooleanOption("allow-script-in-comments",true) +// } +// +// copy { +// from("${project.properties["plugins.dir"]}/plugin.dtd") +// into("${project.properties["build.javadoc"]}/org/apache/nutch/plugin/doc-files") +// } +// copy { +// from( +// "${project.properties["conf.dir"]}/nutch-default.xml", +// "${project.properties["conf.dir"]}/configuration.xsl" +// ) +// into("${project.properties["build.javadoc"]}/resources/") +// } +// +// include( +// "${project.properties["src.dir"]}", +// "${project.properties["plugins.dir"]}/any23/src/java/", +// "${project.properties["plugins.dir"]}/creativecommons/src/java", +// "${project.properties["plugins.dir"]}/feed/src/java", +// "${project.properties["plugins.dir"]}/headings/src/java", +// "${project.properties["plugins.dir"]}/exchange-jexl/src/java", +// "${project.properties["plugins.dir"]}/index-anchor/src/java", +// "${project.properties["plugins.dir"]}/index-basic/src/java", +// "${project.properties["plugins.dir"]}/index-geoip/src/java", +// "${project.properties["plugins.dir"]}/index-jexl-filter/src/java", +// "${project.properties["plugins.dir"]}/index-links/src/java", +// "${project.properties["plugins.dir"]}/index-metadata/src/java", +// "${project.properties["plugins.dir"]}/index-more/src/java", +// "${project.properties["plugins.dir"]}/index-replace/src/java", +// "${project.properties["plugins.dir"]}/index-static/src/java", +// "${project.properties["plugins.dir"]}/indexer-cloudsearch/src/java/", +// "${project.properties["plugins.dir"]}/indexer-csv/src/java", +// "${project.properties["plugins.dir"]}/indexer-dummy/src/java", +// "${project.properties["plugins.dir"]}/indexer-elastic/src/java/", +// "${project.properties["plugins.dir"]}/indexer-kafka/src/java/", +// "${project.properties["plugins.dir"]}/indexer-rabbit/src/java", +// "${project.properties["plugins.dir"]}/indexer-solr/src/java", +// "${project.properties["plugins.dir"]}/language-identifier/src/java", +// "${project.properties["plugins.dir"]}/lib-htmlunit/src/java", +// "${project.properties["plugins.dir"]}/lib-http/src/java", +// "${project.properties["plugins.dir"]}/lib-rabbitmq/src/java", +// "${project.properties["plugins.dir"]}/lib-regex-filter/src/java", +// "${project.properties["plugins.dir"]}/lib-selenium/src/java", +// "${project.properties["plugins.dir"]}/microformats-reltag/src/java", +// "${project.properties["plugins.dir"]}/mimetype-filter/src/java", +// "${project.properties["plugins.dir"]}/parse-ext/src/java", +// "${project.properties["plugins.dir"]}/parse-html/src/java", +// "${project.properties["plugins.dir"]}/parse-js/src/java", +// "${project.properties["plugins.dir"]}/parse-metatags/src/java", +// "${project.properties["plugins.dir"]}/parse-swf/src/java", +// "${project.properties["plugins.dir"]}/parse-tika/src/java", +// "${project.properties["plugins.dir"]}/parse-zip/src/java", +// "${project.properties["plugins.dir"]}/parsefilter-debug/src/java", +// "${project.properties["plugins.dir"]}/parsefilter-naivebayes/src/java", +// "${project.properties["plugins.dir"]}/parsefilter-regex/src/java", +// "${project.properties["plugins.dir"]}/protocol-file/src/java", +// "${project.properties["plugins.dir"]}/protocol-ftp/src/java", +// "${project.properties["plugins.dir"]}/protocol-htmlunit/src/java", +// "${project.properties["plugins.dir"]}/protocol-http/src/java", +// "${project.properties["plugins.dir"]}/protocol-httpclient/src/java", +// "${project.properties["plugins.dir"]}/protocol-interactiveselenium/src/java", +// "${project.properties["plugins.dir"]}/protocol-okhttp/src/java", +// "${project.properties["plugins.dir"]}/protocol-selenium/src/java", +// "${project.properties["plugins.dir"]}/publish-rabbitmq/src/java", +// "${project.properties["plugins.dir"]}/scoring-depth/src/java", +// "${project.properties["plugins.dir"]}/scoring-link/src/java", +// "${project.properties["plugins.dir"]}/scoring-opic/src/java", +// "${project.properties["plugins.dir"]}/scoring-orphan/src/java", +// "${project.properties["plugins.dir"]}/scoring-similarity/src/java", +// "${project.properties["plugins.dir"]}/scoring-metadata/src/java", +// "${project.properties["plugins.dir"]}/subcollection/src/java", +// "${project.properties["plugins.dir"]}/tld/src/java", +// "${project.properties["plugins.dir"]}/urlfilter-automaton/src/java", +// "${project.properties["plugins.dir"]}/urlfilter-domain/src/java", +// "${project.properties["plugins.dir"]}/urlfilter-domaindenylist/src/java", +// "${project.properties["plugins.dir"]}/urlfilter-fast/src/java", +// "${project.properties["plugins.dir"]}/urlfilter-ignoreexempt/src/java", +// "${project.properties["plugins.dir"]}/urlfilter-prefix/src/java", +// "${project.properties["plugins.dir"]}/urlfilter-regex/src/java", +// "${project.properties["plugins.dir"]}/urlfilter-suffix/src/java", +// "${project.properties["plugins.dir"]}/urlfilter-validator/src/java", +// "${project.properties["plugins.dir"]}/urlmeta/src/java", +// "${project.properties["plugins.dir"]}/urlnormalizer-ajax/src/java", +// "${project.properties["plugins.dir"]}/urlnormalizer-basic/src/java", +// "${project.properties["plugins.dir"]}/urlnormalizer-host/src/java", +// "${project.properties["plugins.dir"]}/urlnormalizer-pass/src/java", +// "${project.properties["plugins.dir"]}/urlnormalizer-protocol/src/java", +// "${project.properties["plugins.dir"]}/urlnormalizer-querystring/src/java", +// "${project.properties["plugins.dir"]}/urlnormalizer-regex/src/java", +// "${project.properties["plugins.dir"]}/urlnormalizer-slash/src/java" +// ) +//} tasks.register("package-src") { From 7b716f5aa69c7ee01dfc50465446b9f462356f02 Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sun, 1 May 2022 16:11:41 -0700 Subject: [PATCH 49/55] added non-trivial targets to group "gradleBuildSystem" --- build.gradle.kts | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e7885893d6..2b78022c13 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -164,6 +164,7 @@ val testClasspathCollection: FileCollection = layout.files( // legacy ant target "init" renamed to "init-nutch" to avoid gradle naming conflicts tasks.register("init-nutch") { + group = "gradleBuildSystem" description = "Stuff required by all targets" // making six directories @@ -184,6 +185,7 @@ tasks.register("init-nutch") { } tasks.register("resolve-default") { + group = "gradleBuildSystem" description = "Resolve and retrieve dependencies" dependsOn("clean-default-lib","init-nutch","copy-libs") from(configurations.compileClasspath) @@ -192,6 +194,7 @@ tasks.register("resolve-default") { } tasks.register("resolve-test") { + group = "gradleBuildSystem" description = "Resolve and retrieve dependencies" dependsOn("clean-test-lib","init-nutch","copy-libs") from(configurations.testCompileClasspath) @@ -200,11 +203,13 @@ tasks.register("resolve-test") { } tasks.register("compile") { + group = "gradleBuildSystem" description = "Compile all Java files" dependsOn("compile-core","compile-plugins") } tasks.register("compile-core") { + group = "gradleBuildSystem" description = "Compile core Java files only" dependsOn("init-nutch","resolve-default","compileJava") source = fileTree("${project.properties["src.dir"]}") @@ -232,6 +237,7 @@ tasks.register("compile-core") { } tasks.register("proxy") { + group = "gradleBuildSystem" description = "Run nutch proxy" dependsOn("compile-core-test","job") @@ -242,6 +248,7 @@ tasks.register("proxy") { } tasks.register("benchmark") { + group = "gradleBuildSystem" description = "Run nutch benchmarking analysis" mainClass.set("org.apache.nutch.tools.Benchmark") @@ -256,41 +263,49 @@ tasks.register("benchmark") { } tasks.clean { + group = "gradleBuildSystem" description = "Clean the project" dependsOn("clean-build","clean-lib","clean-dist","clean-runtime") } tasks.register("clean-lib") { + group = "gradleBuildSystem" description = "Clean the project libraries directories (dependencies: default + test)" dependsOn("clean-default-lib","clean-test-lib") } tasks.register("clean-default-lib") { + group = "gradleBuildSystem" description = "Clean the project libraries directory (dependencies)" delete("${project.properties["build.lib.dir"]}") } tasks.register("clean-test-lib") { + group = "gradleBuildSystem" description = "Clean the project test libraries directory (dependencies)" delete("${project.properties["test.build.lib.dir"]}") } tasks.register("clean-build") { + group = "gradleBuildSystem" description = "Clean the project built files" delete("${project.properties["build.dir"]}") } tasks.register("clean-dist") { + group = "gradleBuildSystem" description = "Clean the project dist files" delete("${project.properties["dist.dir"]}") } tasks.register("clean-runtime") { + group = "gradleBuildSystem" description = "Clean the project runtime area" delete("${project.properties["runtime.dir"]}") } tasks.register("copy-libs") { + group = "gradleBuildSystem" description = "Copy the libs in lib" from("${project.properties["lib.dir"]}") { include("**/*.jar") @@ -299,6 +314,7 @@ tasks.register("copy-libs") { } tasks.register("compile-plugins") { + group = "gradleBuildSystem" description = "Compile plugins only" dependsOn("init-nutch","resolve-default") //TODO Once plugins are finished, uncomment the following lines: @@ -307,6 +323,7 @@ tasks.register("compile-plugins") { } tasks.jar { + group = "gradleBuildSystem" description = "Make nutch.jar" dependsOn("compile-core") @@ -326,6 +343,7 @@ tasks.jar { } tasks.register("runtime") { + group = "gradleBuildSystem" description = "Default target for running Nutch" dependsOn("jar","job") mkdir("${project.properties["runtime.dir"]}") @@ -373,6 +391,7 @@ tasks.register("runtime") { } tasks.register("job") { + group = "gradleBuildSystem" description = "Make nutch.job jar" dependsOn("compile") @@ -400,6 +419,7 @@ tasks.register("job") { } tasks.register("compile-core-test") { + group = "gradleBuildSystem" description = "Compile test code" dependsOn("init-nutch","compile-core","resolve-test","compileTestJava") @@ -418,7 +438,7 @@ tasks.register("compile-core-test") { options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" } -tasks.test.configure() { +tasks.test.configure { description = "Run JUnit tests" dependsOn("test-core","test-plugins") } @@ -486,6 +506,7 @@ tasks.register("javadoc-dummy") { ) } tasks.javadoc.configure { + group = "gradleBuildSystem" description = "Generate Javadoc" dependsOn("javadoc-dummy") } @@ -639,6 +660,7 @@ tasks.javadoc.configure { tasks.register("package-src") { + group = "gradleBuildSystem" description = "Generate source distribution package" dependsOn("runtime","javadoc") @@ -677,6 +699,7 @@ tasks.register("package-src") } tasks.register("zip-src") { + group = "gradleBuildSystem" description = "Generate src.zip distribution package" dependsOn("package-src") From c4c27d323d5af64816e34b630983a7649e68e9fc Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sun, 1 May 2022 18:45:47 -0700 Subject: [PATCH 50/55] Deleted commented code --- build.gradle.kts | 147 ----------------------------------------------- 1 file changed, 147 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2b78022c13..2bb4374ced 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -510,153 +510,6 @@ tasks.javadoc.configure { description = "Generate Javadoc" dependsOn("javadoc-dummy") } -// TODO The following is the Gradle version of the javadoc target. For some unknown reason, it does -// not produce any results. -//tasks.javadoc { -// description = "Generate Javadoc" -// dependsOn("compile") -// -// val version:String = System.getProperty("java.version") -// if("1.7.0_25".compareTo(version) >= 0) -// throw GradleException( -// "Unsupported Java version: ${version}. Javadoc requires Java version 7u25 " + -// "or greater. See https://issues.apache.org/jira/browse/NUTCH-1590" -// ) -// -// setDestinationDir(file("${project.properties["build.javadoc"]}")) -// -// mkdir("${project.properties["build.javadoc"]}") -// mkdir("${project.properties["build.javadoc"]}/resources") -// -// options { -// this as StandardJavadocDocletOptions -// -// addStringOption("sourcepath","${project.properties["src.dir"]}") -// overview = "${project.properties["src.dir"]}/overview.html" -// destinationDirectory = file("${project.properties["build.javadoc"]}") -// windowTitle = "${project.properties["name"]} ${project.properties["version"]} API" -// isFailOnError = true -// //isFailOnWarning = true -// classpath = files("${project.properties["build.plugins"]}") { -// include("**/*.jar") -// exclude("any23/javax.annotation-api*.jar") -// }.distinct() -// isAuthor = true -// isVersion = true -// isUse = true -// docTitle = windowTitle -// bottom = "Copyright &copy; ${project.properties["year"]} The Apache Software Foundation" -// links("${project.properties["javadoc.link.java"]}","${project.properties["javadoc.link.hadoop"]}") -// groups = mutableMapOf( -// "Core" to mutableListOf("org.apache.nutch.*"), -// "Plugins API" to "${project.properties["plugins.api"]}" .split(":"), -// "Protocol Plugins" to "${project.properties["plugins.protocol"]}" .split(":"), -// "URL Filter Plugins" to "${project.properties["plugins.urlfilter"]}" .split(":"), -// "URL Normalizer Plugins" to "${project.properties["plugins.urlnormalizer"]}".split(":"), -// "Scoring Plugins" to "${project.properties["plugins.scoring"]}" .split(":"), -// "Parse Plugins" to "${project.properties["plugins.parse"]}" .split(":"), -// "Parse Filter Plugins" to "${project.properties["plugins.parsefilter"]}" .split(":"), -// "Publisher Plugins" to "${project.properties["plugins.publisher"]}" .split(":"), -// "Exchange Plugins" to "${project.properties["plugins.exchange"]}" .split(":"), -// "Indexing Filter Plugins" to "${project.properties["plugins.index"]}" .split(":"), -// "Indexer Plugins" to "${project.properties["plugins.indexer"]}" .split(":"), -// "Misc. Plugins" to "${project.properties["plugins.misc"]}" .split(":") -// ) -// addStringOption("${project.properties["javadoc.proxy.host"]}","") -// addStringOption("${project.properties["javadoc.proxy.port"]}","") -// addBooleanOption("allow-script-in-comments",true) -// } -// -// copy { -// from("${project.properties["plugins.dir"]}/plugin.dtd") -// into("${project.properties["build.javadoc"]}/org/apache/nutch/plugin/doc-files") -// } -// copy { -// from( -// "${project.properties["conf.dir"]}/nutch-default.xml", -// "${project.properties["conf.dir"]}/configuration.xsl" -// ) -// into("${project.properties["build.javadoc"]}/resources/") -// } -// -// include( -// "${project.properties["src.dir"]}", -// "${project.properties["plugins.dir"]}/any23/src/java/", -// "${project.properties["plugins.dir"]}/creativecommons/src/java", -// "${project.properties["plugins.dir"]}/feed/src/java", -// "${project.properties["plugins.dir"]}/headings/src/java", -// "${project.properties["plugins.dir"]}/exchange-jexl/src/java", -// "${project.properties["plugins.dir"]}/index-anchor/src/java", -// "${project.properties["plugins.dir"]}/index-basic/src/java", -// "${project.properties["plugins.dir"]}/index-geoip/src/java", -// "${project.properties["plugins.dir"]}/index-jexl-filter/src/java", -// "${project.properties["plugins.dir"]}/index-links/src/java", -// "${project.properties["plugins.dir"]}/index-metadata/src/java", -// "${project.properties["plugins.dir"]}/index-more/src/java", -// "${project.properties["plugins.dir"]}/index-replace/src/java", -// "${project.properties["plugins.dir"]}/index-static/src/java", -// "${project.properties["plugins.dir"]}/indexer-cloudsearch/src/java/", -// "${project.properties["plugins.dir"]}/indexer-csv/src/java", -// "${project.properties["plugins.dir"]}/indexer-dummy/src/java", -// "${project.properties["plugins.dir"]}/indexer-elastic/src/java/", -// "${project.properties["plugins.dir"]}/indexer-kafka/src/java/", -// "${project.properties["plugins.dir"]}/indexer-rabbit/src/java", -// "${project.properties["plugins.dir"]}/indexer-solr/src/java", -// "${project.properties["plugins.dir"]}/language-identifier/src/java", -// "${project.properties["plugins.dir"]}/lib-htmlunit/src/java", -// "${project.properties["plugins.dir"]}/lib-http/src/java", -// "${project.properties["plugins.dir"]}/lib-rabbitmq/src/java", -// "${project.properties["plugins.dir"]}/lib-regex-filter/src/java", -// "${project.properties["plugins.dir"]}/lib-selenium/src/java", -// "${project.properties["plugins.dir"]}/microformats-reltag/src/java", -// "${project.properties["plugins.dir"]}/mimetype-filter/src/java", -// "${project.properties["plugins.dir"]}/parse-ext/src/java", -// "${project.properties["plugins.dir"]}/parse-html/src/java", -// "${project.properties["plugins.dir"]}/parse-js/src/java", -// "${project.properties["plugins.dir"]}/parse-metatags/src/java", -// "${project.properties["plugins.dir"]}/parse-swf/src/java", -// "${project.properties["plugins.dir"]}/parse-tika/src/java", -// "${project.properties["plugins.dir"]}/parse-zip/src/java", -// "${project.properties["plugins.dir"]}/parsefilter-debug/src/java", -// "${project.properties["plugins.dir"]}/parsefilter-naivebayes/src/java", -// "${project.properties["plugins.dir"]}/parsefilter-regex/src/java", -// "${project.properties["plugins.dir"]}/protocol-file/src/java", -// "${project.properties["plugins.dir"]}/protocol-ftp/src/java", -// "${project.properties["plugins.dir"]}/protocol-htmlunit/src/java", -// "${project.properties["plugins.dir"]}/protocol-http/src/java", -// "${project.properties["plugins.dir"]}/protocol-httpclient/src/java", -// "${project.properties["plugins.dir"]}/protocol-interactiveselenium/src/java", -// "${project.properties["plugins.dir"]}/protocol-okhttp/src/java", -// "${project.properties["plugins.dir"]}/protocol-selenium/src/java", -// "${project.properties["plugins.dir"]}/publish-rabbitmq/src/java", -// "${project.properties["plugins.dir"]}/scoring-depth/src/java", -// "${project.properties["plugins.dir"]}/scoring-link/src/java", -// "${project.properties["plugins.dir"]}/scoring-opic/src/java", -// "${project.properties["plugins.dir"]}/scoring-orphan/src/java", -// "${project.properties["plugins.dir"]}/scoring-similarity/src/java", -// "${project.properties["plugins.dir"]}/scoring-metadata/src/java", -// "${project.properties["plugins.dir"]}/subcollection/src/java", -// "${project.properties["plugins.dir"]}/tld/src/java", -// "${project.properties["plugins.dir"]}/urlfilter-automaton/src/java", -// "${project.properties["plugins.dir"]}/urlfilter-domain/src/java", -// "${project.properties["plugins.dir"]}/urlfilter-domaindenylist/src/java", -// "${project.properties["plugins.dir"]}/urlfilter-fast/src/java", -// "${project.properties["plugins.dir"]}/urlfilter-ignoreexempt/src/java", -// "${project.properties["plugins.dir"]}/urlfilter-prefix/src/java", -// "${project.properties["plugins.dir"]}/urlfilter-regex/src/java", -// "${project.properties["plugins.dir"]}/urlfilter-suffix/src/java", -// "${project.properties["plugins.dir"]}/urlfilter-validator/src/java", -// "${project.properties["plugins.dir"]}/urlmeta/src/java", -// "${project.properties["plugins.dir"]}/urlnormalizer-ajax/src/java", -// "${project.properties["plugins.dir"]}/urlnormalizer-basic/src/java", -// "${project.properties["plugins.dir"]}/urlnormalizer-host/src/java", -// "${project.properties["plugins.dir"]}/urlnormalizer-pass/src/java", -// "${project.properties["plugins.dir"]}/urlnormalizer-protocol/src/java", -// "${project.properties["plugins.dir"]}/urlnormalizer-querystring/src/java", -// "${project.properties["plugins.dir"]}/urlnormalizer-regex/src/java", -// "${project.properties["plugins.dir"]}/urlnormalizer-slash/src/java" -// ) -//} tasks.register("package-src") { From 302136f5aa4d768bc035150fc45fab43827e8dbc Mon Sep 17 00:00:00 2001 From: AzureTriple Date: Sun, 1 May 2022 18:59:00 -0700 Subject: [PATCH 51/55] Changed name of javadoc proxy target --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2bb4374ced..29676a3d12 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -444,7 +444,7 @@ tasks.test.configure { } // Dummy target. This just ensures that the compile target always happens before the command line invocation -tasks.register("javadoc-dummy") { +tasks.register("javadocs") { dependsOn("compile") val version:String = System.getProperty("java.version") @@ -508,7 +508,7 @@ tasks.register("javadoc-dummy") { tasks.javadoc.configure { group = "gradleBuildSystem" description = "Generate Javadoc" - dependsOn("javadoc-dummy") + dependsOn("javadocs") } tasks.register("package-src") From 84a7e285292b7761a20dea7a0c83ce3ae6fe954e Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sun, 1 May 2022 18:59:43 -0700 Subject: [PATCH 52/55] NUTCH 2940 Develop Gradle Core Build for Apache Nutch Javadoc gradle implementation/fixes --- build.gradle.kts | 221 +++++++++++++++++++++++++++++++++++++--------- gradle.properties | 4 +- 2 files changed, 179 insertions(+), 46 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a8ca622231..d7d49ce17d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,9 +16,11 @@ */ plugins { - `maven-publish` application + base java + `maven-publish` + `java-library` } repositories { @@ -162,6 +164,7 @@ val testClasspathCollection: FileCollection = layout.files( // legacy ant target "init" renamed to "init-nutch" to avoid gradle naming conflicts tasks.register("init-nutch") { + group = "gradleBuildSystem" description = "Stuff required by all targets" // making six directories @@ -182,6 +185,7 @@ tasks.register("init-nutch") { } tasks.register("resolve-default") { + group = "gradleBuildSystem" description = "Resolve and retrieve dependencies" dependsOn("clean-default-lib","init-nutch","copy-libs") from(configurations.compileClasspath) @@ -190,19 +194,22 @@ tasks.register("resolve-default") { } tasks.register("resolve-test") { + group = "gradleBuildSystem" description = "Resolve and retrieve dependencies" dependsOn("clean-test-lib","init-nutch","copy-libs") from(configurations.testCompileClasspath) from(configurations.testRuntimeClasspath) - into(layout.buildDirectory.dir("${project.properties["test.lib.dir"]}")) + into(layout.projectDirectory.dir("${project.properties["test.build.lib.dir"]}")) } tasks.register("compile") { + group = "gradleBuildSystem" description = "Compile all Java files" dependsOn("compile-core","compile-plugins") } tasks.register("compile-core") { + group = "gradleBuildSystem" description = "Compile core Java files only" dependsOn("init-nutch","resolve-default","compileJava") @@ -216,6 +223,7 @@ tasks.register("compile-core") { options.annotationProcessorPath = classpathCollection options.sourcepath = layout.files("${project.properties["src.dir"]}") options.compilerArgs.add("-Xlint:-path") + options.compilerArgs.add("-Xpkginfo:always") options.encoding = "${project.properties["build.encoding"]}" options.isDebug = "${project.properties["javac.debug"]}" == "on" options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" @@ -231,6 +239,7 @@ tasks.register("compile-core") { } tasks.register("proxy") { + group = "gradleBuildSystem" description = "Run nutch proxy" dependsOn("compile-core-test","job") @@ -241,6 +250,7 @@ tasks.register("proxy") { } tasks.register("benchmark") { + group = "gradleBuildSystem" description = "Run nutch benchmarking analysis" mainClass.set("org.apache.nutch.tools.Benchmark") @@ -254,49 +264,50 @@ tasks.register("benchmark") { args("5") } -// tasks.javadoc { -// description = "Generate Javadoc" -// dependsOn("compile") -// mkdir("${project.properties["build.javadoc"]}") -// mkdir("${project.properties["build.javadoc"]}/resources") -// } - tasks.clean { + group = "gradleBuildSystem" description = "Clean the project" dependsOn("clean-build","clean-lib","clean-dist","clean-runtime") } tasks.register("clean-lib") { + group = "gradleBuildSystem" description = "Clean the project libraries directories (dependencies: default + test)" dependsOn("clean-default-lib","clean-test-lib") } tasks.register("clean-default-lib") { + group = "gradleBuildSystem" description = "Clean the project libraries directory (dependencies)" delete("${project.properties["build.lib.dir"]}") } tasks.register("clean-test-lib") { + group = "gradleBuildSystem" description = "Clean the project test libraries directory (dependencies)" delete("${project.properties["test.build.lib.dir"]}") } tasks.register("clean-build") { + group = "gradleBuildSystem" description = "Clean the project built files" delete("${project.properties["build.dir"]}") } tasks.register("clean-dist") { + group = "gradleBuildSystem" description = "Clean the project dist files" delete("${project.properties["dist.dir"]}") } tasks.register("clean-runtime") { + group = "gradleBuildSystem" description = "Clean the project runtime area" delete("${project.properties["runtime.dir"]}") } tasks.register("copy-libs") { + group = "gradleBuildSystem" description = "Copy the libs in lib" from("${project.properties["lib.dir"]}") { include("**/*.jar") @@ -305,6 +316,7 @@ tasks.register("copy-libs") { } tasks.register("compile-plugins") { + group = "gradleBuildSystem" description = "Compile plugins only" dependsOn("init-nutch","resolve-default") //TODO Once plugins are finished, uncomment the following lines: @@ -313,6 +325,7 @@ tasks.register("compile-plugins") { } tasks.jar { + group = "gradleBuildSystem" description = "Make nutch.jar" dependsOn("compile-core") @@ -321,18 +334,19 @@ tasks.jar { file(layout.projectDirectory.dir("${project.properties["conf.dir"]}/nutch-default.xml")), file(layout.projectDirectory.dir("${project.properties["conf.dir"]}/nutch-site.xml")) ) - // from("${project.properties["conf.dir"]}/nutch-default.xml") - // from("${project.properties["conf.dir"]}/nutch-site.xml") into("${project.properties["build.classes"]}") } archiveFileName.set("${project.properties["final.name"]}.jar") destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.dir"]}")) from(files("${project.properties["build.classes"]}")) + doLast { + delete("${project.properties["build.dir"]}/tmp") + } } -tasks.register("runtime") -{ +tasks.register("runtime") { + group = "gradleBuildSystem" description = "Default target for running Nutch" dependsOn("jar","job") mkdir("${project.properties["runtime.dir"]}") @@ -348,10 +362,6 @@ tasks.register("runtime") from(layout.projectDirectory.dir("src/bin")) } into("${project.properties["runtime.local"]}/lib") { - // from( - // file(layout.projectDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")), - // files("${project.properties["build.lib.dir"]}") - // ) from(layout.projectDirectory.dir("${project.properties["build.dir"]}/${project.properties["final.name"]}.jar")) } into("${project.properties["runtime.local"]}/lib/native") { @@ -383,42 +393,37 @@ tasks.register("runtime") } } -tasks.register("job") -{ - //TODO there is no support to create a ".job" directly +tasks.register("job") { + group = "gradleBuildSystem" description = "Make nutch.job jar" dependsOn("compile") duplicatesStrategy = DuplicatesStrategy.EXCLUDE archiveFileName.set("${project.properties["final.name"]}.job") destinationDirectory.set(layout.projectDirectory.dir("${project.properties["build.dir"]}")) - from( - files("${project.properties["build.classes"]}") { - exclude("nutch-default.xml","nutch-site.xml") - }, - files("${project.properties["conf.dir"]}") { - exclude("*.template","hadoop*.*") - }, - files("${project.properties["build.lib.dir"]}") { - eachFile { - relativePath = RelativePath(true,"lib") - } - include("**/*.jar") - exclude("hadoop-*.jar,slf4j*.jar","log4j*.jar") - }, - files("${project.properties["build.plugins"]}") { - eachFile { - relativePath = RelativePath(true,"classes","plugins") - } - } - ) + from(layout.projectDirectory.dir("${project.properties["build.classes"]}")) { + exclude("nutch-default.xml","nutch-site.xml") + } + from(layout.projectDirectory.dir("${project.properties["conf.dir"]}")) { + exclude("*.template","hadoop*.*") + } + from(layout.projectDirectory.dir("${project.properties["build.lib.dir"]}")) { + include("**/*.jar") + exclude("hadoop-*.jar","slf4j*.jar","log4j*.jar") + into("lib") + } + from(layout.projectDirectory.dir("${project.properties["build.plugins"]}")) { + exclude("nutch-default.xml","nutch-site.xml") + into("classes/plugins") + } + doLast { delete("${project.properties["build.dir"]}/tmp") } } -tasks.register("compile-core-test") -{ +tasks.register("compile-core-test") { + group = "gradleBuildSystem" description = "Compile test code" dependsOn("init-nutch","compile-core","resolve-test","compileTestJava") @@ -432,13 +437,141 @@ tasks.register("compile-core-test") options.annotationProcessorPath = testClasspathCollection options.sourcepath = layout.files("${project.properties["src.dir"]}") options.compilerArgs.add("-Xlint:-path") + options.compilerArgs.add("-Xpkginfo:always") options.encoding = "${project.properties["build.encoding"]}" options.isDebug = "${project.properties["javac.debug"]}" == "on" options.isDeprecation = "${project.properties["javac.deprecation"]}" == "on" } -tasks.test.configure() -{ +tasks.test.configure() { description = "Run JUnit tests" dependsOn("test-core","test-plugins") +} + +tasks.javadoc.configure { + group = "gradleBuildSystem" + description = "Generate Javadoc" + dependsOn("compile") + + val version:String = System.getProperty("java.version") + if("1.7.0_25".compareTo(version) >= 0) + throw GradleException( + "Unsupported Java version: ${version}. Javadoc requires Java version 7u25 " + + "or greater. See https://issues.apache.org/jira/browse/NUTCH-1590" + ) + + mkdir("${project.properties["build.javadoc"]}") + mkdir("${project.properties["build.javadoc"]}/resources") + + source(fileTree("${project.properties["src.dir"]}")) + // todo: add plugins to source + include("**/*.java") + setDestinationDir(file("${project.properties["build.javadoc"]}")) + classpath = classpathCollection.plus( + layout.files( + fileTree(mapOf("dir" to project.properties["build.plugins"], "include" to listOf("**/*.jar"), "exclude" to listOf("any23/javax.annotation-api*.jar"))) + ) + ) + options.overview = "${project.properties["src.dir"]}/overview.html" + options.windowTitle = "${project.properties["projname"]} ${project.properties["version"]} API" + (options as StandardJavadocDocletOptions).docTitle = options.windowTitle + (options as StandardJavadocDocletOptions).bottom = "Copyright \u00a9 ${project.properties["year"]} The Apache Software Foundation" + (options as StandardJavadocDocletOptions).isAuthor = true + (options as StandardJavadocDocletOptions).isVersion = true + (options as StandardJavadocDocletOptions).isUse = true + (options as StandardJavadocDocletOptions).links("${project.properties["javadoc.link.java"]}","${project.properties["javadoc.link.hadoop"]}") + (options as StandardJavadocDocletOptions).groups = mutableMapOf( + "Core" to mutableListOf("org.apache.nutch.*"), + "Plugins API" to "${project.properties["plugins.api"]}" .split(":"), + "Protocol Plugins" to "${project.properties["plugins.protocol"]}" .split(":"), + "URL Filter Plugins" to "${project.properties["plugins.urlfilter"]}" .split(":"), + "URL Normalizer Plugins" to "${project.properties["plugins.urlnormalizer"]}".split(":"), + "Scoring Plugins" to "${project.properties["plugins.scoring"]}" .split(":"), + "Parse Plugins" to "${project.properties["plugins.parse"]}" .split(":"), + "Parse Filter Plugins" to "${project.properties["plugins.parsefilter"]}" .split(":"), + "Publisher Plugins" to "${project.properties["plugins.publisher"]}" .split(":"), + "Exchange Plugins" to "${project.properties["plugins.exchange"]}" .split(":"), + "Indexing Filter Plugins" to "${project.properties["plugins.index"]}" .split(":"), + "Indexer Plugins" to "${project.properties["plugins.indexer"]}" .split(":"), + "Misc. Plugins" to "${project.properties["plugins.misc"]}" .split(":") + ) + (options as StandardJavadocDocletOptions).addBooleanOption("-allow-script-in-comments", true) + (options as StandardJavadocDocletOptions).addStringOption("${project.properties["javadoc.proxy.host"]}") + (options as StandardJavadocDocletOptions).addStringOption("${project.properties["javadoc.proxy.port"]}") + + doLast { + copy { + from(file(layout.projectDirectory.dir("${project.properties["plugins.dir"]}/plugin.dtd"))) + into("${project.properties["build.javadoc"]}/org/apache/nutch/plugin/doc-files") + } + copy { + from( + file(layout.projectDirectory.dir("${project.properties["conf.dir"]}/nutch-default.xml")), + file(layout.projectDirectory.dir("${project.properties["conf.dir"]}/configuration.xsl")) + ) + into("${project.properties["build.javadoc"]}/resources") + } + } +} + +tasks.register("package-src") { + group = "gradleBuildSystem" + description = "Generate source distribution package" + dependsOn("runtime","javadoc") + + destinationDir = file(".") + + mkdir("${project.properties["dist.dir"]}") + mkdir("${project.properties["src.dist.version.dir"]}") + mkdir("${project.properties["src.dist.version.dir"]}/lib") + mkdir("${project.properties["src.dist.version.dir"]}/docs") + mkdir("${project.properties["src.dist.version.dir"]}/docs/api") + mkdir("${project.properties["src.dist.version.dir"]}/ivy") + + from("lib") { + includeEmptyDirs = false + into("${project.properties["src.dist.version.dir"]}/lib") + } + from("${project.properties["conf.dir"]}") { + exclude("**/*.template") + into("${project.properties["src.dist.version.dir"]}/conf") + } + from("${project.properties["build.javadoc"]}") { + into("${project.properties["src.dist.version.dir"]}/docs/api") + } + from(".") { + include("*.txt") + into("${project.properties["src.dist.version.dir"]}") + } + from("src") { + includeEmptyDirs = true + into("${project.properties["src.dist.version.dir"]}/src") + } + from(".") { + include("build.gradle.kts","gradle.properties","settings.gradle.kts") + into("${project.properties["src.dist.version.dir"]}/") + } +} + +tasks.register("zip-src") { + group = "gradleBuildSystem" + description = "Generate src.zip distribution package" + dependsOn("package-src") + + archiveFileName.set("${project.properties["src.dist.version.dir"]}.zip") + destinationDirectory.set(layout.buildDirectory.dir("${project.properties["final.name"]}")) + + from( + files("${project.properties["src.dist.version.dir"]}") { + fileMode = 664 + exclude("src/bin/*") + //TODO delete the following line once Ivy is removed completely + exclude("ivy") + include("**") + }, + files("${project.properties["src.dist.version.dir"]}") { + fileMode = 755 + include("src/bin/*") + } + ) } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6bf57aae59..5d9d60ebb9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name=apache-nutch +projname=apache-nutch version=1.19-SNAPSHOT final.name=apache-nutch-1.19-SNAPSHOT year=2022 @@ -113,7 +113,7 @@ plugins.scoring=\ org.apache.nutch.scoring.orphan*:\ org.apache.nutch.scoring.similarity*:\ org.apache.nutch.scoring.tld*:\ - org.apache.nutch.scoring.urlmeta*\ + org.apache.nutch.scoring.urlmeta*:\ org.apache.nutch.scoring.metadata* # From dc9f58e402052e2b34cc584cf091a6fdad687c22 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sun, 1 May 2022 22:29:30 -0700 Subject: [PATCH 53/55] NUTCH 2940 Develop Gradle Core Build for Apache Nutch Small fixes to zip-src, javadoc tasks --- build.gradle.kts | 59 ++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3ffc141dc5..b584701cf6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -469,32 +469,36 @@ tasks.javadoc.configure { fileTree(mapOf("dir" to project.properties["build.plugins"], "include" to listOf("**/*.jar"), "exclude" to listOf("any23/javax.annotation-api*.jar"))) ) ) - options.overview = "${project.properties["src.dir"]}/overview.html" - options.windowTitle = "${project.properties["projname"]} ${project.properties["version"]} API" - (options as StandardJavadocDocletOptions).docTitle = options.windowTitle - (options as StandardJavadocDocletOptions).bottom = "Copyright \u00a9 ${project.properties["year"]} The Apache Software Foundation" - (options as StandardJavadocDocletOptions).isAuthor = true - (options as StandardJavadocDocletOptions).isVersion = true - (options as StandardJavadocDocletOptions).isUse = true - (options as StandardJavadocDocletOptions).links("${project.properties["javadoc.link.java"]}","${project.properties["javadoc.link.hadoop"]}") - (options as StandardJavadocDocletOptions).groups = mutableMapOf( - "Core" to mutableListOf("org.apache.nutch.*"), - "Plugins API" to "${project.properties["plugins.api"]}" .split(":"), - "Protocol Plugins" to "${project.properties["plugins.protocol"]}" .split(":"), - "URL Filter Plugins" to "${project.properties["plugins.urlfilter"]}" .split(":"), - "URL Normalizer Plugins" to "${project.properties["plugins.urlnormalizer"]}".split(":"), - "Scoring Plugins" to "${project.properties["plugins.scoring"]}" .split(":"), - "Parse Plugins" to "${project.properties["plugins.parse"]}" .split(":"), - "Parse Filter Plugins" to "${project.properties["plugins.parsefilter"]}" .split(":"), - "Publisher Plugins" to "${project.properties["plugins.publisher"]}" .split(":"), - "Exchange Plugins" to "${project.properties["plugins.exchange"]}" .split(":"), - "Indexing Filter Plugins" to "${project.properties["plugins.index"]}" .split(":"), - "Indexer Plugins" to "${project.properties["plugins.indexer"]}" .split(":"), - "Misc. Plugins" to "${project.properties["plugins.misc"]}" .split(":") - ) - (options as StandardJavadocDocletOptions).addBooleanOption("-allow-script-in-comments", true) - (options as StandardJavadocDocletOptions).addStringOption("${project.properties["javadoc.proxy.host"]}") - (options as StandardJavadocDocletOptions).addStringOption("${project.properties["javadoc.proxy.port"]}") + options { + this as StandardJavadocDocletOptions + overview = "${project.properties["src.dir"]}/overview.html" + windowTitle = "${project.properties["projname"]} ${project.properties["version"]} API" + docTitle = windowTitle + bottom = "Copyright \u00a9 ${project.properties["year"]} The Apache Software Foundation" + isAuthor = true + isVersion = true + isUse = true + links("${project.properties["javadoc.link.java"]}","${project.properties["javadoc.link.hadoop"]}") + groups = mutableMapOf( + "Core" to mutableListOf("org.apache.nutch.*"), + "Plugins API" to "${project.properties["plugins.api"]}" .split(":"), + "Protocol Plugins" to "${project.properties["plugins.protocol"]}" .split(":"), + "URL Filter Plugins" to "${project.properties["plugins.urlfilter"]}" .split(":"), + "URL Normalizer Plugins" to "${project.properties["plugins.urlnormalizer"]}".split(":"), + "Scoring Plugins" to "${project.properties["plugins.scoring"]}" .split(":"), + "Parse Plugins" to "${project.properties["plugins.parse"]}" .split(":"), + "Parse Filter Plugins" to "${project.properties["plugins.parsefilter"]}" .split(":"), + "Publisher Plugins" to "${project.properties["plugins.publisher"]}" .split(":"), + "Exchange Plugins" to "${project.properties["plugins.exchange"]}" .split(":"), + "Indexing Filter Plugins" to "${project.properties["plugins.index"]}" .split(":"), + "Indexer Plugins" to "${project.properties["plugins.indexer"]}" .split(":"), + "Misc. Plugins" to "${project.properties["plugins.misc"]}" .split(":") + ) + addBooleanOption("-allow-script-in-comments", true) + addStringOption("${project.properties["javadoc.proxy.host"]}") + addStringOption("${project.properties["javadoc.proxy.port"]}") + } + doLast { copy { @@ -508,6 +512,7 @@ tasks.javadoc.configure { ) into("${project.properties["build.javadoc"]}/resources") } + delete("${project.properties["build.dir"]}/tmp") } } @@ -556,7 +561,7 @@ tasks.register("zip-src") { dependsOn("package-src") archiveFileName.set("${project.properties["src.dist.version.dir"]}.zip") - destinationDirectory.set(layout.buildDirectory.dir("${project.properties["final.name"]}")) + destinationDirectory.set(layout.projectDirectory) from( files("${project.properties["src.dist.version.dir"]}") { From bb7c1d4aef3a17ddcfb12f48d2e022e67d5128eb Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Wed, 15 Jun 2022 19:15:05 -0700 Subject: [PATCH 54/55] NUTCH-2940 Develop Gradle Core Build for Apache Nutch --- src/plugin/sample-plugin/build.gradle.kts | 7 ------- .../src/java/org/apache/nutch/example/Hello.java | 7 ------- 2 files changed, 14 deletions(-) delete mode 100644 src/plugin/sample-plugin/build.gradle.kts delete mode 100644 src/plugin/sample-plugin/src/java/org/apache/nutch/example/Hello.java diff --git a/src/plugin/sample-plugin/build.gradle.kts b/src/plugin/sample-plugin/build.gradle.kts deleted file mode 100644 index fb9e85c348..0000000000 --- a/src/plugin/sample-plugin/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - id("application") -} - -application { - mainClass.set("java.org.apache.nutch.example") -} \ No newline at end of file diff --git a/src/plugin/sample-plugin/src/java/org/apache/nutch/example/Hello.java b/src/plugin/sample-plugin/src/java/org/apache/nutch/example/Hello.java deleted file mode 100644 index 1e86448b47..0000000000 --- a/src/plugin/sample-plugin/src/java/org/apache/nutch/example/Hello.java +++ /dev/null @@ -1,7 +0,0 @@ -package java.org.apache.nutch.example; - -public class Hello { - public static void main(String[] args) { - System.out.println("Hello, world!"); - } -} \ No newline at end of file From 1200c57243002ab1d68cb3fb377425f67546814c Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Wed, 15 Jun 2022 19:25:00 -0700 Subject: [PATCH 55/55] NUTCH-2940 Develop Gradle Core Build for Apache Nutch --- .gitattributes | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 00a51aff5e..0000000000 --- a/.gitattributes +++ /dev/null @@ -1,6 +0,0 @@ -# -# https://help.github.com/articles/dealing-with-line-endings/ -# -# These are explicitly windows files and should use crlf -*.bat text eol=crlf -