NUTCH-3038 Address issues discovered during 1.20 release management d…

…ryrun (apache#811)
commoncrawl · Apr 8, 2024 · 271f92e · 271f92e
1 parent c9e2f4e
commit 271f92e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 40 deletions.
diff --git a/CHANGES.txt → CHANGES.md b/CHANGES.txt → CHANGES.md
diff --git 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
@@ -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
@@ -3,7 +3,6 @@
 ![Docker Pulls](https://img.shields.io/docker/pulls/apache/nutch?style=for-the-badge)
 ![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/apache/nutch?style=for-the-badge)
 ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/apache/nutch?style=for-the-badge)
-![MicroBadger Layers](https://img.shields.io/microbadger/layers/apache/nutch?style=for-the-badge)
 ![Docker Stars](https://img.shields.io/docker/stars/apache/nutch?style=for-the-badge)
 ![Docker Automated build](https://img.shields.io/docker/automated/apache/nutch?style=for-the-badge)
 
@@ -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
@@ -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,39 +123,13 @@
         <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>
           </configuration>
         </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>