Skip to content

Commit

Permalink
NUTCH-2963 Upgrade dependencies before release of 1.19
Browse files Browse the repository at this point in the history
- upgrade Nutch core dependencies
   httpcore-nio 4.4.9 -> 4.4.14
   cxf 2.9.0 -> 2.9.1
   commons-jexl3 3.2.1 -> 3.3
   log4j 2.17.2 -> 2.18.0
   t-digest 3.2 -> 3.3
- update / complete LICENSE-binary
  • Loading branch information
sebastian-nagel committed Aug 19, 2022
1 parent 59f7865 commit 0442562
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 42 deletions.
6 changes: 6 additions & 0 deletions LICENSE-binary
Expand Up @@ -360,6 +360,7 @@ org.apache.cxf:cxf-rt-transports-http-jetty
org.apache.cxf:cxf-rt-ws-addr
org.apache.cxf:cxf-rt-ws-policy
org.apache.cxf:cxf-rt-wsdl
org.apache.geronimo.specs:geronimo-jta_1.1_spec
org.apache.hadoop:hadoop-annotations
org.apache.hadoop:hadoop-auth
org.apache.hadoop:hadoop-common
Expand Down Expand Up @@ -679,8 +680,12 @@ Eclipse Distribution License v1.0

com.sun.activation:jakarta.activation
com.sun.istack:istack-commons-runtime
com.sun.xml.messaging.saaj:saaj-impl
jakarta.activation:jakarta.activation-api
jakarta.jws:jakarta.jws-api
jakarta.xml.bind:jakarta.xml.bind-api
jakarta.xml.soap:jakarta.xml.soap-api
jakarta.xml.ws:jakarta.xml.ws-api
org.eclipse.rdf4j:rdf4j-http-client
org.eclipse.rdf4j:rdf4j-http-protocol
org.eclipse.rdf4j:rdf4j-model
Expand Down Expand Up @@ -717,6 +722,7 @@ org.eclipse.rdf4j:rdf4j-sail-memory
org.eclipse.rdf4j:rdf4j-util
org.glassfish.jaxb:jaxb-runtime
org.glassfish.jaxb:txw2
org.jvnet.staxex:stax-ex


GNU General Public License, version 2 (GPL2), with the classpath exception
Expand Down
56 changes: 26 additions & 30 deletions NOTICE-binary
Expand Up @@ -408,12 +408,9 @@ ROME (http://rometools.github.io/rome/)
rome-utils (http://rometools.github.io/rome-utils/)
- license: The Apache Software License, Version 2.0

# com.squareup.okhttp:okhttp
OkHttp (https://square.github.io/okhttp/)
- license: Apache 2.0
# com.squareup.okhttp3:okhttp
OkHttp (https://square.github.io/okhttp/)
- license: Apache 2.0
- license: The Apache Software License, Version 2.0
# com.squareup.okhttp3:okhttp-brotli
okhttp-brotli (https://square.github.io/okhttp/)
- license: The Apache Software License, Version 2.0
Expand Down Expand Up @@ -460,6 +457,11 @@ JAXB RI (http://jaxb.java.net/)
- license: CDDL 1.1
(licenses-binary/LICENSE-cddl-1.1.txt)

# com.sun.xml.messaging.saaj:saaj-impl
Jakarta SOAP Implementation
- license: Eclipse Distribution License - v 1.0
(licenses-binary/LICENSE-eclipse-distribution-license-v1.0.txt)

# com.tdunning:t-digest
T-Digest (https://github.com/tdunning/t-digest)
- license: The Apache Software License, Version 2.0
Expand Down Expand Up @@ -526,6 +528,11 @@ Jakarta Annotations API (https://projects.eclipse.org/projects/ee4j.ca)
- license: EPL 2.0
(licenses-binary/LICENSE-epl-2.0.txt)

# jakarta.jws:jakarta.jws-api
Jakarta Web Services Metadata API (https://github.com/eclipse-ee4j/jws-api)
- license: Eclipse Distribution License - v 1.0
(licenses-binary/LICENSE-eclipse-distribution-license-v1.0.txt)

# jakarta.ws.rs:jakarta.ws.rs-api
jakarta.ws.rs-api (https://github.com/eclipse-ee4j/jaxrs-api)
- license: EPL 2.0
Expand All @@ -536,6 +543,16 @@ Jakarta XML Binding API
- license: Eclipse Distribution License - v 1.0
(licenses-binary/LICENSE-eclipse-distribution-license-v1.0.txt)

# jakarta.xml.soap:jakarta.xml.soap-api
Jakarta SOAP with Attachments API (https://github.com/eclipse-ee4j/saaj-api)
- license: Eclipse Distribution License - v 1.0
(licenses-binary/LICENSE-eclipse-distribution-license-v1.0.txt)

# jakarta.xml.ws:jakarta.xml.ws-api
Jakarta XML Web Services API (https://github.com/eclipse-ee4j/jax-ws-api)
- license: Eclipse Distribution License - v 1.0
(licenses-binary/LICENSE-eclipse-distribution-license-v1.0.txt)

# javax.activation:activation
JavaBeans Activation Framework (JAF) (http://java.sun.com/products/javabeans/jaf/index.jsp)
- license: Common Development and Distribution License (CDDL) v1.0
Expand Down Expand Up @@ -708,16 +725,9 @@ Animal Sniffer Annotations
(licenses-binary/LICENSE-mit-license.txt)

# org.codehaus.woodstox:stax2-api
Stax2 API (http://wiki.fasterxml.com/WoodstoxStax2)
- license: The BSD License
(licenses-binary/LICENSE-bsd-2-clause.txt)
# org.codehaus.woodstox:stax2-api
Stax2 API (http://github.com/FasterXML/stax2-api)
- license: The BSD License
(licenses-binary/LICENSE-bsd-2-clause.txt)
# org.codehaus.woodstox:woodstox-core-asl
Woodstox (http://woodstox.codehaus.org)
- license: The Apache Software License, Version 2.0

# org.codelibs:jhighlight
JHighlight (https://github.com/codelibs/jhighlight)
Expand All @@ -733,25 +743,16 @@ Jetty :: ALPN :: JDK9 Client Implementation
# org.eclipse.jetty:jetty-client
Jetty :: Asynchronous HTTP Client (http://www.eclipse.org/jetty)
- license: Apache Software License - Version 2.0
# org.eclipse.jetty:jetty-client
Jetty :: Asynchronous HTTP Client
- license: Apache Software License - Version 2.0
# org.eclipse.jetty:jetty-continuation
Jetty :: Continuation
- license: Apache Software License - Version 2.0
# org.eclipse.jetty:jetty-http
Jetty :: Http Utility (http://www.eclipse.org/jetty)
- license: Apache Software License - Version 2.0
# org.eclipse.jetty:jetty-http
Jetty :: Http Utility
- license: Apache Software License - Version 2.0
# org.eclipse.jetty:jetty-io
Jetty :: IO Utility (http://www.eclipse.org/jetty)
- license: Apache Software License - Version 2.0
# org.eclipse.jetty:jetty-io
Jetty :: IO Utility
- license: Apache Software License - Version 2.0
# org.eclipse.jetty:jetty-security
Jetty :: Security
- license: Apache Software License - Version 2.0
# org.eclipse.jetty:jetty-server
Expand All @@ -764,8 +765,6 @@ Jetty :: Servlet Handling
Jetty :: Utilities (http://www.eclipse.org/jetty)
- license: Apache Software License - Version 2.0
# org.eclipse.jetty:jetty-util
Jetty :: Utilities
- license: Apache Software License - Version 2.0
# org.eclipse.jetty:jetty-util-ajax
Jetty :: Utilities :: Ajax(JSON)
- license: Apache Software License - Version 2.0
Expand Down Expand Up @@ -953,18 +952,10 @@ Apache Tika plugin for Ogg, Vorbis and FLAC (https://github.com/Gagravarr/Vorbis

# org.glassfish.jaxb:jaxb-runtime
JAXB Runtime (https://eclipse-ee4j.github.io/jaxb-ri/)
- license: Eclipse Distribution License - v 1.0
(licenses-binary/LICENSE-eclipse-distribution-license-v1.0.txt)
# org.glassfish.jaxb:jaxb-runtime
JAXB Runtime
- license: Eclipse Distribution License - v 1.0
(licenses-binary/LICENSE-eclipse-distribution-license-v1.0.txt)
# org.glassfish.jaxb:txw2
TXW2 Runtime (https://eclipse-ee4j.github.io/jaxb-ri/)
- license: Eclipse Distribution License - v 1.0
(licenses-binary/LICENSE-eclipse-distribution-license-v1.0.txt)
# org.glassfish.jaxb:txw2
TXW2 Runtime
- license: Eclipse Distribution License - v 1.0
(licenses-binary/LICENSE-eclipse-distribution-license-v1.0.txt)

Expand Down Expand Up @@ -1013,6 +1004,11 @@ jsoup Java HTML Parser (https://jsoup.org/)
- license: The MIT License
(licenses-binary/LICENSE-mit-license.txt)

# org.jvnet.staxex:stax-ex
Extended StAX API
- license: Eclipse Distribution License - v 1.0
(licenses-binary/LICENSE-eclipse-distribution-license-v1.0.txt)

# org.lz4:lz4-java
LZ4 and xxHash (https://github.com/lz4/lz4-java)
- license: The Apache Software License, Version 2.0
Expand Down
24 changes: 12 additions & 12 deletions ivy/ivy.xml
Expand Up @@ -36,18 +36,18 @@
</publications>

<dependencies>
<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.17.2" conf="*->master" />
<dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.17.2" conf="*->master" />
<dependency org="org.apache.logging.log4j" name="log4j-slf4j-impl" rev="2.17.2" conf="*->master" />
<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.18.0" conf="*->master" />
<dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.18.0" conf="*->master" />
<dependency org="org.apache.logging.log4j" name="log4j-slf4j-impl" rev="2.18.0" conf="*->master" />
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.36" conf="*->master" />

<dependency org="org.apache.commons" name="commons-lang3" rev="3.12.0" conf="*->default" />
<dependency org="org.apache.commons" name="commons-collections4" rev="4.4" conf="*->master" />
<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.13" conf="*->master" />
<dependency org="commons-codec" name="commons-codec" rev="1.15" conf="*->default" />
<dependency org="org.apache.commons" name="commons-compress" rev="1.21" conf="*->default" />
<dependency org="org.apache.commons" name="commons-jexl3" rev="3.1" conf="*->default" />
<dependency org="com.tdunning" name="t-digest" rev="3.2" />
<dependency org="org.apache.commons" name="commons-jexl3" rev="3.2.1" conf="*->default" />
<dependency org="com.tdunning" name="t-digest" rev="3.3" />

<!-- Hadoop Dependencies -->
<dependency org="org.apache.hadoop" name="hadoop-common" rev="3.3.4" conf="*->default">
Expand All @@ -74,16 +74,16 @@

<dependency org="com.github.crawler-commons" name="crawler-commons" rev="1.3" />

<dependency org="com.google.code.gson" name="gson" rev="2.9.0"/>
<dependency org="com.google.code.gson" name="gson" rev="2.9.1"/>
<dependency org="com.martinkl.warc" name="warc-hadoop" rev="0.1.0">
<exclude module="hadoop-client" />
</dependency>

<dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="3.4.1" conf="*->default" />
<dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs" rev="3.4.1" conf="*->default" />
<dependency org="org.apache.cxf" name="cxf-rt-transports-http" rev="3.4.1" conf="*->default" />
<dependency org="org.apache.cxf" name="cxf-rt-transports-http-jetty" rev="3.4.1" conf="*->default" />
<dependency org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.4.1" conf="test->default" />
<dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="3.5.3" conf="*->default" />
<dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs" rev="3.5.3" conf="*->default" />
<dependency org="org.apache.cxf" name="cxf-rt-transports-http" rev="3.5.3" conf="*->default" />
<dependency org="org.apache.cxf" name="cxf-rt-transports-http-jetty" rev="3.5.3" conf="*->default" />
<dependency org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.5.3" conf="test->default" />
<dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.13.3" conf="*->default" />
<dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="2.13.3" conf="*->default" />
<dependency org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" rev="2.13.3" conf="*->default" />
Expand Down Expand Up @@ -117,7 +117,7 @@

<!--Added Because of Elasticsearch JEST client-->
<!--TODO refactor these to indexer-elastic-rest plugin somehow, currently doesn't resolve correctly-->
<dependency org="org.apache.httpcomponents" name="httpcore-nio" rev="4.4.9" />
<dependency org="org.apache.httpcomponents" name="httpcore-nio" rev="4.4.14" />
<dependency org="org.apache.httpcomponents" name="httpcore" rev="4.4.14" />

<dependency org="de.vandermeer" name="asciitable" rev="0.3.2" />
Expand Down

0 comments on commit 0442562

Please sign in to comment.