This is an automated email from the ASF dual-hosted git repository.
lewismc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git
The following commit(s) were added to refs/heads/master by this push:
new 271f92e11 NUTCH-3038 Address issues discovered during 1.20 release
management dryrun (#811)
271f92e11 is described below
commit 271f92e11c39b7a3583cfcd8d664262cfac59674
Author: Lewis John McGibbney <[email protected]>
AuthorDate: Mon Apr 8 16:21:13 2024 -0700
NUTCH-3038 Address issues discovered during 1.20 release management dryrun
(#811)
---
CHANGES.txt => CHANGES.md | 0
build.xml | 6 +++---
docker/Dockerfile | 2 +-
docker/README.md | 3 +--
ivy/mvn.template | 37 +++----------------------------------
5 files changed, 8 insertions(+), 40 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.md
similarity index 100%
rename from CHANGES.txt
rename to CHANGES.md
diff --git a/build.xml b/build.xml
index 49187d3ba..845bdfce8 100644
--- a/build.xml
+++ b/build.xml
@@ -329,7 +329,7 @@
<!-- sign and deploy the main artifact -->
<artifact:mvn mavenHome="${env.MVN_HOME}" fork="true" failonerror="true">
<jvmarg value="-Dmaven.multiModuleProjectDirectory=false" />
- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file" />
+ <arg
value="org.apache.maven.plugins:maven-gpg-plugin:3.2.2:sign-and-deploy-file" />
<arg value="-Durl=${maven-repository-url}" />
<arg value="-DrepositoryId=${maven-repository-id}" />
<arg value="-DpomFile=pom.xml" />
@@ -340,7 +340,7 @@
<!-- sign and deploy the sources artifact -->
<artifact:mvn mavenHome="${env.MVN_HOME}" fork="true" failonerror="true">
<jvmarg value="-Dmaven.multiModuleProjectDirectory=false" />
- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file" />
+ <arg
value="org.apache.maven.plugins:maven-gpg-plugin:3.2.2:sign-and-deploy-file" />
<arg value="-Durl=${maven-repository-url}" />
<arg value="-DrepositoryId=${maven-repository-id}" />
<arg value="-DpomFile=pom.xml" />
@@ -352,7 +352,7 @@
<!-- sign and deploy the javadoc artifact -->
<artifact:mvn mavenHome="${env.MVN_HOME}" fork="true" failonerror="true">
<jvmarg value="-Dmaven.multiModuleProjectDirectory=false" />
- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file" />
+ <arg
value="org.apache.maven.plugins:maven-gpg-plugin:3.2.2:sign-and-deploy-file" />
<arg value="-Durl=${maven-repository-url}" />
<arg value="-DrepositoryId=${maven-repository-id}" />
<arg value="-DpomFile=pom.xml" />
diff --git a/docker/Dockerfile b/docker/Dockerfile
index fb93fe98a..2eb218bad 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,7 +22,7 @@
# 2 == Same as mode 1 with addition of Nutch WebApp
ARG BUILD_MODE=0
-FROM alpine:3.13 AS base
+FROM alpine:3.19 AS base
ARG SERVER_PORT=8081
ARG SERVER_HOST=0.0.0.0
diff --git a/docker/README.md b/docker/README.md
index c8330bf9b..80e1a1d6d 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -3,7 +3,6 @@
-
@@ -25,7 +24,7 @@ Current configuration of this image consists of components:
## Base Image
-* [alpine:3.13](https://hub.docker.com/_/alpine/)
+* [alpine:3.19](https://hub.docker.com/_/alpine/tags)
## Tips
diff --git a/ivy/mvn.template b/ivy/mvn.template
index b38b37f6d..fafc79f83 100644
--- a/ivy/mvn.template
+++ b/ivy/mvn.template
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>31</version>
</parent>
<groupId>${ivy.pom.groupId}</groupId>
<artifactId>${ivy.pom.artifactId}</artifactId>
@@ -45,12 +45,7 @@
<url>https://github.com/apache/nutch.git</url>
</scm>
- <pluginRepositories>
- <pluginRepository>
- <id>miredot</id>
- <name>MireDot Releases</name>
- <url>http://nexus.qmino.com/content/repositories/miredot</url>
- </pluginRepository>
+ <pluginRepositories>2
<pluginRepository>
<id>maven2</id>
<url>https://repo.maven.apache.org/maven2/</url>
@@ -128,7 +123,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.13.0</version>
<configuration>
<source>11</source>
<target>11</target>
@@ -136,31 +131,5 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.qmino</groupId>
- <artifactId>miredot-plugin</artifactId>
- <version>2.4.0</version>
- <executions>
- <execution>
- <goals>
- <goal>restdoc</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-
<licence>cHJvamVjdHxvcmcuYXBhY2hlLm51dGNoLm51dGNofDIwMTktMTAtMzB8dHJ1ZXwtMSNNQ3dDRkJMb0FjM283ME1YRERRMkFJemY1QmxZUjAwK0FoUkJVMlJrVi81RlBQc25zMUZ2S2g0Q29weGFxZz09</licence>
- <restModel>
- <restFramework>
- <name>jax-rs</name>
- </restFramework>
- </restModel>
- <output>
- <html></html>
- </output>
- <!-- insert other configuration here (optional) -->
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
