Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .github/workflows/maven-ci-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,16 @@ jobs:
if: ${{ steps.cache-maven.outputs.cache-hit != 'true' }}
run: |
MAVEN_VERSION=3.9.10
wget https://downloads.apache.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz
tar xzvf apache-maven-$MAVEN_VERSION-bin.tar.gz
sudo mv apache-maven-$MAVEN_VERSION /opt/maven
if [ ! -d "/opt/maven/apache-maven-$MAVEN_VERSION" ]; then
wget https://downloads.apache.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz
tar xzvf apache-maven-$MAVEN_VERSION-bin.tar.gz
sudo mkdir -p /opt/maven
sudo mv apache-maven-$MAVEN_VERSION /opt/maven/
rm apache-maven-$MAVEN_VERSION-bin.tar.gz
fi
sudo rm -f /usr/bin/mvn
sudo ln -s /opt/maven/bin/mvn /usr/bin/mvn
sudo ln -sf /opt/maven/apache-maven-$MAVEN_VERSION/bin/mvn /usr/bin/mvn


#--- Step ------------------------------------------------------------------

Expand Down
8 changes: 4 additions & 4 deletions committer/apachekafka/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2013-2024 Norconex Inc.
Copyright 2013-2025 Norconex Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -125,10 +125,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>

</plugins>
Expand Down
8 changes: 4 additions & 4 deletions committer/azurecognitivesearch/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2017-2024 Norconex Inc.
Copyright 2017-2025 Norconex Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -111,10 +111,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>

</plugins>
Expand Down
6 changes: 3 additions & 3 deletions committer/core/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2014-2024 Norconex Inc.
Copyright 2014-2025 Norconex Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -106,8 +106,8 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>

</plugins>
Expand Down
6 changes: 3 additions & 3 deletions committer/elasticsearch/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2013-2024 Norconex Inc.
Copyright 2013-2025 Norconex Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -124,8 +124,8 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>

</plugins>
Expand Down
6 changes: 3 additions & 3 deletions committer/idol/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2013-2024 Norconex Inc.
Copyright 2013-2025 Norconex Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -119,8 +119,8 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>

</plugins>
Expand Down
6 changes: 3 additions & 3 deletions committer/neo4j/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2013-2024 Norconex Inc.
Copyright 2013-2025 Norconex Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -113,8 +113,8 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>

</plugins>
Expand Down
6 changes: 3 additions & 3 deletions committer/solr/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2014-2024 Norconex Inc.
Copyright 2014-2025 Norconex Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -126,8 +126,8 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>

</plugins>
Expand Down
6 changes: 3 additions & 3 deletions committer/sql/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2013-2024 Norconex Inc.
Copyright 2013-2025 Norconex Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -113,8 +113,8 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>

</plugins>
Expand Down
55 changes: 8 additions & 47 deletions crawler/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,44 +81,13 @@
<artifactId>picocli</artifactId>
</dependency>


<!-- TODO: remove from here as likely inherited from Importer or Nx Lang -->
<!--
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-parameter-names</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>8.0.1.Final</version>
</dependency>
<!-- Runtime -->
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<groupId>com.norconex.crawler</groupId>
<artifactId>nx-grid-jdbc</artifactId>
<scope>runtime</scope>
</dependency>
-->



<!-- Tests and provided. -->
<dependency>
Expand All @@ -135,14 +104,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>com.norconex.crawler</groupId>
<artifactId>nx-grid-jdbc</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
-->

<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -231,10 +192,10 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>

</plugins>
</build>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,14 @@ public void close() {
flushBatch();
if (scheduler != null) {
scheduler.shutdown();
try {
if (!scheduler.awaitTermination(5, TimeUnit.SECONDS)) {
scheduler.shutdownNow();
}
} catch (InterruptedException e) {
scheduler.shutdownNow();
Thread.currentThread().interrupt();
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ public void withCrawlContext(Consumer<CrawlContext> consumer) {
consumer.accept(ctx);
} finally {
// Ensure cleanup happens even if an exception occurs
CrawlContextDestroyer.destroy(ctx);
swallow(heartbeatScheduler::shutdown);
CrawlContextDestroyer.destroy(ctx);
}
}

Expand Down
6 changes: 3 additions & 3 deletions crawler/fs/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2013-2024 Norconex Inc.
Copyright 2013-2025 Norconex Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -287,8 +287,8 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>

<plugin>
Expand Down
6 changes: 3 additions & 3 deletions crawler/web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -320,10 +320,10 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
import org.openqa.selenium.remote.RemoteWebDriver;

public class MockWebDriver extends RemoteWebDriver implements TakesScreenshot {
}
}
4 changes: 2 additions & 2 deletions grid/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>

</plugins>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,20 +236,21 @@ public void viewAccepted(View view) {
initializedLatch.countDown();
}

var meOrNot = isCoordinator() ? "me!" : "not me";
var coordAddress = channel.view().getCoord();
if (cachedCoordAddress == null) {
LOG.info("Grid \"{}\" elected coordinator: {}",
gridName, view);
LOG.info("Grid \"{}\" elected coordinator ({}): {}",
gridName, meOrNot, coordAddress);
} else if (!Objects.equals(cachedCoordAddress, coordAddress)) {
LOG.info("New \"{}\" grid coordinator elected: {} -> "
+ "{}", gridName,
cachedCoordAddress, coordAddress);
LOG.info("Grid \"{}\" coordinator changed: {} -> {} ({})",
gridName, cachedCoordAddress, coordAddress, meOrNot);
//TODO need to handle the change??
}
cachedCoordAddress = coordAddress;

var currentSize = view.getMembers().size();
LOG.info("Current \"{}\" grid size: {}", gridName, currentSize);
LOG.debug("Current \"{}\" grid nodes: {}", gridName, view);

// Inform quorum waiters if applicable
synchronized (this) {
Expand Down
Loading