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
apache · Jan 31, 2025 · 52453e5 · 52453e5
1 parent 28b67eb
commit 52453e5
Show file tree

Hide file tree

Showing 23 changed files with 34 additions and 34 deletions.
diff --git 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
@@ -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
@@ -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
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.stormcrawler</groupId>
     <artifactId>stormcrawler</artifactId>
-    <version>3.2.1-SNAPSHOT</version>
+    <version>3.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>stormcrawler-archetype</artifactId>
   <name>stormcrawler-archetype</name>

diff --git 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.
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<stormcrawler.version>${project.version}</stormcrawler.version>
-		<storm.version>2.7.1</storm.version>
+		<storm.version>2.8.0</storm.version>
 	</properties>
 
 	<build>

diff --git a/core/pom.xml b/core/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.stormcrawler</groupId>
 		<artifactId>stormcrawler</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>stormcrawler-core</artifactId>

diff --git a/external/aws/pom.xml b/external/aws/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.stormcrawler</groupId>
 		<artifactId>stormcrawler-external</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/external/langid/pom.xml b/external/langid/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.stormcrawler</groupId>
 		<artifactId>stormcrawler-external</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/external/opensearch/archetype/pom.xml b/external/opensearch/archetype/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.stormcrawler</groupId>
     <artifactId>stormcrawler</artifactId>
-    <version>3.2.1-SNAPSHOT</version>
+    <version>3.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 

diff --git 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.
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<stormcrawler.version>${StormCrawlerVersion}</stormcrawler.version>
-		<storm.version>2.7.1</storm.version>
+		<storm.version>2.8.0</storm.version>
 	</properties>
 
 	<build>

diff --git a/external/opensearch/pom.xml b/external/opensearch/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.stormcrawler</groupId>
 		<artifactId>stormcrawler-external</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/external/playwright/pom.xml b/external/playwright/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.stormcrawler</groupId>
 		<artifactId>stormcrawler-external</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/external/pom.xml b/external/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.stormcrawler</groupId>
 		<artifactId>stormcrawler</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git 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
@@ -25,7 +25,7 @@ under the License.
     <parent>
         <groupId>org.apache.stormcrawler</groupId>
         <artifactId>stormcrawler</artifactId>
-        <version>3.2.1-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

diff --git 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
@@ -34,7 +34,7 @@ under the License.
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <stormcrawler.version>${StormCrawlerVersion}</stormcrawler.version>
-    <storm.version>2.7.1</storm.version>
+    <storm.version>2.8.0</storm.version>
   </properties>
 
   <build>

diff --git a/external/solr/pom.xml b/external/solr/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.stormcrawler</groupId>
 		<artifactId>stormcrawler-external</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/external/sql/pom.xml b/external/sql/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.stormcrawler</groupId>
 		<artifactId>stormcrawler-external</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/external/tika/pom.xml b/external/tika/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.stormcrawler</groupId>
 		<artifactId>stormcrawler-external</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/external/urlfrontier/pom.xml b/external/urlfrontier/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.stormcrawler</groupId>
 		<artifactId>stormcrawler-external</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/external/warc/pom.xml b/external/warc/pom.xml
@@ -25,7 +25,7 @@ under the License.
 	<parent>
 		<groupId>org.apache.stormcrawler</groupId>
 		<artifactId>stormcrawler-external</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@ under the License.
 
 	<groupId>org.apache.stormcrawler</groupId>
 	<artifactId>stormcrawler</artifactId>
-	<version>3.2.1-SNAPSHOT</version>
+	<version>3.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>stormcrawler</name>
@@ -50,7 +50,7 @@ under the License.
 		<developerConnection>
 			scm:git:[email protected]:apache/incubator-stormcrawler.git</developerConnection>
 		<url>https://github.com/apache/incubator-stormcrawler</url>
-		<tag>stormcrawler-3.1.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<issueManagement>
@@ -65,7 +65,7 @@ under the License.
 		<additionalparam>-Xdoclint:none</additionalparam>
 		<!-- dependency versions -->
 		<junit.version>5.11.4</junit.version>
-		<storm-client.version>2.7.1</storm-client.version>
+		<storm-client.version>2.8.0</storm-client.version>
 		<jackson.version>2.18.1</jackson.version>
 		<tika.version>3.0.0</tika.version>
 		<mockito.version>5.15.2</mockito.version>
@@ -85,8 +85,8 @@ under the License.
 
 		<skip.format.code>true</skip.format.code>
 
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 
 		<apache-jar-resource-bundle.version>1.7</apache-jar-resource-bundle.version>
 		<apache-incubator-disclaimer-resource-bundle.version>1.7</apache-incubator-disclaimer-resource-bundle.version>
@@ -108,9 +108,9 @@ under the License.
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.13.0</version>
 					<configuration>
-						<source>11</source>
-						<target>11</target>
-						<release>11</release>
+						<source>17</source>
+						<target>17</target>
+						<release>17</release>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -119,7 +119,7 @@ under the License.
 					<version>3.11.2</version>
 					<configuration>
 						<doclint>none</doclint>
-						<source>11</source>
+						<source>17</source>
 						<sourcepath>src/main/java</sourcepath>
 					</configuration>
 					<executions>