Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NUTCH-3038 Address issues discovered during 1.20 release management dryrun #811

Merged
merged 1 commit into from
Apr 8, 2024
Merged

NUTCH-3038 Address issues discovered during 1.20 release management dryrun #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 CHANGES.txt → CHANGES.md
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand All @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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

Expand Down
37 changes: 3 additions & 34 deletions ivy/mvn.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Loading