From 52453e54268c3ebb2bbb52e9d78a1792f8cd3aea Mon Sep 17 00:00:00 2001
From: Richard Zowalla <13417392+rzo1@users.noreply.github.com>
Date: Fri, 31 Jan 2025 16:36:27 +0100
Subject: [PATCH] Storm 2.8.0 (#1457)
* Increase version to 2.3.0-SNAPSHOT because raising Java level is a breaking change.
* Upgrade to Storm 2.8.0
---
.github/workflows/maven.yml | 2 +-
README.md | 2 +-
THIRD-PARTY.txt | 8 ++++----
archetype/pom.xml | 2 +-
.../main/resources/archetype-resources/pom.xml | 2 +-
core/pom.xml | 2 +-
external/aws/pom.xml | 2 +-
external/langid/pom.xml | 2 +-
external/opensearch/archetype/pom.xml | 2 +-
.../main/resources/archetype-resources/pom.xml | 2 +-
external/opensearch/pom.xml | 2 +-
external/playwright/pom.xml | 2 +-
external/pom.xml | 2 +-
external/solr/README.md | 2 +-
external/solr/archetype/pom.xml | 2 +-
.../resources/archetype-resources/README.md | 2 +-
.../main/resources/archetype-resources/pom.xml | 2 +-
external/solr/pom.xml | 2 +-
external/sql/pom.xml | 2 +-
external/tika/pom.xml | 2 +-
external/urlfrontier/pom.xml | 2 +-
external/warc/pom.xml | 2 +-
pom.xml | 18 +++++++++---------
23 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a152e95c4..986afe96b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -48,7 +48,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
- java: [ 11, 17 ]
+ java: [ 17 ]
experimental: [false]
steps:
- uses: actions/checkout@v4
diff --git a/README.md b/README.md
index fd2e44a82..c1f1919aa 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Apache StormCrawler (Incubating) is an open source collection of resources for b
## Quickstart
-NOTE: These instructions assume that you have [Apache Maven](https://maven.apache.org/install.html) installed. You will need to install [Apache Storm 2.7.1](http://storm.apache.org/) to run the crawler.
+NOTE: These instructions assume that you have [Apache Maven](https://maven.apache.org/install.html) installed. You will need to install [Apache Storm 2.8.0](http://storm.apache.org/) to run the crawler.
StormCrawler requires Java 11 or above. To execute tests, it requires you to have a locally installed and working Docker environment.
diff --git a/THIRD-PARTY.txt b/THIRD-PARTY.txt
index f6104a4d3..92dd8820f 100644
--- a/THIRD-PARTY.txt
+++ b/THIRD-PARTY.txt
@@ -252,15 +252,15 @@ List of third-party dependencies grouped by their license type.
* rome (com.rometools:rome:2.1.0 - http://rometools.com/rome)
* rome-utils (com.rometools:rome-utils:2.1.0 - http://rometools.com/rome-utils)
* server (org.opensearch:opensearch:2.18.0 - https://github.com/opensearch-project/OpenSearch.git)
- * Shaded Deps for Storm Client (org.apache.storm:storm-shaded-deps:2.7.1 - https://storm.apache.org/storm-shaded-deps)
+ * Shaded Deps for Storm Client (org.apache.storm:storm-shaded-deps:2.8.0 - https://storm.apache.org/storm-shaded-deps)
* SLF4J 1 Binding for Log4j API (org.apache.logging.log4j:log4j-slf4j-impl:2.24.1 - https://logging.apache.org/log4j/2.x/log4j/log4j-slf4j-impl/)
* SnakeYAML (org.yaml:snakeyaml:2.3 - https://bitbucket.org/snakeyaml/snakeyaml)
* snappy-java (org.xerial.snappy:snappy-java:1.1.10.4 - https://github.com/xerial/snappy-java)
* sniffer (org.opensearch.client:opensearch-rest-client-sniffer:2.18.0 - https://github.com/opensearch-project/OpenSearch.git)
* SparseBitSet (com.zaxxer:SparseBitSet:1.3 - https://github.com/brettwooldridge/SparseBitSet)
- * storm-autocreds (org.apache.storm:storm-autocreds:2.7.1 - https://storm.apache.org/external/storm-autocreds)
- * Storm Client (org.apache.storm:storm-client:2.7.1 - https://storm.apache.org/storm-client)
- * storm-hdfs (org.apache.storm:storm-hdfs:2.7.1 - https://storm.apache.org/external/storm-hdfs)
+ * storm-autocreds (org.apache.storm:storm-autocreds:2.8.0 - https://storm.apache.org/external/storm-autocreds)
+ * Storm Client (org.apache.storm:storm-client:2.8.0 - https://storm.apache.org/storm-client)
+ * storm-hdfs (org.apache.storm:storm-hdfs:2.8.0 - https://storm.apache.org/external/storm-hdfs)
* swagger-annotations-jakarta (io.swagger.core.v3:swagger-annotations-jakarta:2.2.22 - https://github.com/swagger-api/swagger-core/modules/swagger-annotations-jakarta)
* TagSoup (org.ccil.cowan.tagsoup:tagsoup:1.2.1 - http://home.ccil.org/~cowan/XML/tagsoup/)
* T-Digest (com.tdunning:t-digest:3.2 - https://github.com/tdunning/t-digest)
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 425bf7f3e..78cdae5c7 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -24,7 +24,7 @@ under the License.
org.apache.stormcrawler
stormcrawler
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
stormcrawler-archetype
stormcrawler-archetype
diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
index 02fa2bd3f..4148c67e8 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@ under the License.
UTF-8
${project.version}
- 2.7.1
+ 2.8.0
diff --git a/core/pom.xml b/core/pom.xml
index 0a1d40b4d..89c0e0b8f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
stormcrawler-core
diff --git a/external/aws/pom.xml b/external/aws/pom.xml
index 35b2b8db1..3c2c4a791 100644
--- a/external/aws/pom.xml
+++ b/external/aws/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler-external
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/external/langid/pom.xml b/external/langid/pom.xml
index 22e3036dd..c6bca85c1 100644
--- a/external/langid/pom.xml
+++ b/external/langid/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler-external
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/external/opensearch/archetype/pom.xml b/external/opensearch/archetype/pom.xml
index 83df874ea..d2288d663 100644
--- a/external/opensearch/archetype/pom.xml
+++ b/external/opensearch/archetype/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
../../../pom.xml
diff --git a/external/opensearch/archetype/src/main/resources/archetype-resources/pom.xml b/external/opensearch/archetype/src/main/resources/archetype-resources/pom.xml
index f6126db7b..1cd543a4e 100644
--- a/external/opensearch/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/external/opensearch/archetype/src/main/resources/archetype-resources/pom.xml
@@ -34,7 +34,7 @@ under the License.
UTF-8
${StormCrawlerVersion}
- 2.7.1
+ 2.8.0
diff --git a/external/opensearch/pom.xml b/external/opensearch/pom.xml
index 545ec371b..a11258765 100644
--- a/external/opensearch/pom.xml
+++ b/external/opensearch/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler-external
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/external/playwright/pom.xml b/external/playwright/pom.xml
index 690f5e6ff..32327cdec 100644
--- a/external/playwright/pom.xml
+++ b/external/playwright/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler-external
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/external/pom.xml b/external/pom.xml
index f8e8a07a9..32977df51 100644
--- a/external/pom.xml
+++ b/external/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/external/solr/README.md b/external/solr/README.md
index 48b6e6541..75c683424 100644
--- a/external/solr/README.md
+++ b/external/solr/README.md
@@ -12,7 +12,7 @@ You'll be asked to enter a groupId (e.g. com.mycompany.crawler), an artefactId (
This will not only create a fully formed project containing a POM with the dependency above but also a set of resources, configuration files and sample topology classes. Enter the directory you just created (should be the same as the artefactId you specified earlier) and follow the instructions on the README file.
-You will of course need to have both Apache Storm (2.7.1) and Apache Solr (9.7.0) installed.
+You will of course need to have both Apache Storm (2.8.0) and Apache Solr (9.7.0) installed.
Official references:
* [Apache Storm: Setting Up a Development Environment](https://storm.apache.org/releases/current/Setting-up-development-environment.html)
diff --git a/external/solr/archetype/pom.xml b/external/solr/archetype/pom.xml
index 7ebcb7f65..a3a36482b 100644
--- a/external/solr/archetype/pom.xml
+++ b/external/solr/archetype/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
../../../pom.xml
diff --git a/external/solr/archetype/src/main/resources/archetype-resources/README.md b/external/solr/archetype/src/main/resources/archetype-resources/README.md
index 2e91bbf0a..5ea0c942d 100644
--- a/external/solr/archetype/src/main/resources/archetype-resources/README.md
+++ b/external/solr/archetype/src/main/resources/archetype-resources/README.md
@@ -1,7 +1,7 @@
This has been generated by the StormCrawler Maven Archetype as a starting point for building your own crawler with [Apache Solr](https://solr.apache.org/) as a backend.
Have a look at the code and resources and modify them to your heart's content.
-You need to have Apache Storm (2.7.1) installed, as well as a running instance of Apache Solr (9.7.0).
+You need to have Apache Storm (2.8.0) installed, as well as a running instance of Apache Solr (9.7.0).
## Generated resources
diff --git a/external/solr/archetype/src/main/resources/archetype-resources/pom.xml b/external/solr/archetype/src/main/resources/archetype-resources/pom.xml
index 123dd3146..d0fcd5325 100644
--- a/external/solr/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/external/solr/archetype/src/main/resources/archetype-resources/pom.xml
@@ -34,7 +34,7 @@ under the License.
UTF-8
${StormCrawlerVersion}
- 2.7.1
+ 2.8.0
diff --git a/external/solr/pom.xml b/external/solr/pom.xml
index c42b96197..bcd08558c 100644
--- a/external/solr/pom.xml
+++ b/external/solr/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler-external
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/external/sql/pom.xml b/external/sql/pom.xml
index 9a5b0d63f..242a99c00 100644
--- a/external/sql/pom.xml
+++ b/external/sql/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler-external
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/external/tika/pom.xml b/external/tika/pom.xml
index 2e5be5515..b8d967a6e 100644
--- a/external/tika/pom.xml
+++ b/external/tika/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler-external
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/external/urlfrontier/pom.xml b/external/urlfrontier/pom.xml
index 9bc248c97..750570dba 100644
--- a/external/urlfrontier/pom.xml
+++ b/external/urlfrontier/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler-external
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/external/warc/pom.xml b/external/warc/pom.xml
index e8b3ac0c3..0ff060763 100644
--- a/external/warc/pom.xml
+++ b/external/warc/pom.xml
@@ -25,7 +25,7 @@ under the License.
org.apache.stormcrawler
stormcrawler-external
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/pom.xml b/pom.xml
index 1c25878b1..ba911db36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
org.apache.stormcrawler
stormcrawler
- 3.2.1-SNAPSHOT
+ 3.3.0-SNAPSHOT
pom
stormcrawler
@@ -50,7 +50,7 @@ under the License.
scm:git:git@github.com:apache/incubator-stormcrawler.git
https://github.com/apache/incubator-stormcrawler
- stormcrawler-3.1.0
+ HEAD
@@ -65,7 +65,7 @@ under the License.
-Xdoclint:none
5.11.4
- 2.7.1
+ 2.8.0
2.18.1
3.0.0
5.15.2
@@ -85,8 +85,8 @@ under the License.
true
- 11
- 11
+ 17
+ 17
1.7
1.7
@@ -108,9 +108,9 @@ under the License.
maven-compiler-plugin
3.13.0
- 11
- 11
- 11
+ 17
+ 17
+ 17
@@ -119,7 +119,7 @@ under the License.
3.11.2
none
- 11
+ 17
src/main/java