Skip to content

Commit

Permalink
Prepare for Nutch 1.18 release
Browse files Browse the repository at this point in the history
  • Loading branch information
lewismc committed Jan 19, 2021
1 parent e9f125c commit 43f3550
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 10 deletions.
25 changes: 16 additions & 9 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
<property name="maven-javadoc-jar" value="${release.dir}/${artifactId}-${version}-javadoc.jar" />
<property name="maven-sources-jar" value="${release.dir}/${artifactId}-${version}-sources.jar" />

<property environment="env"/>

<property name="dependency-check.home" value="${ivy.dir}/dependency-check-ant/"/>

<property name="spotbugs.version" value="4.1.1" />
Expand Down Expand Up @@ -311,8 +313,9 @@
</ivy:makepom>

<!-- sign and deploy the main artifact -->
<artifact:mvn>
<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.5:sign-and-deploy-file" />
<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="-Durl=${maven-repository-url}" />
<arg value="-DrepositoryId=${maven-repository-id}" />
<arg value="-DpomFile=pom.xml" />
Expand All @@ -321,8 +324,9 @@
</artifact:mvn>

<!-- sign and deploy the sources artifact -->
<artifact:mvn>
<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.5:sign-and-deploy-file" />
<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="-Durl=${maven-repository-url}" />
<arg value="-DrepositoryId=${maven-repository-id}" />
<arg value="-DpomFile=pom.xml" />
Expand All @@ -332,8 +336,9 @@
</artifact:mvn>

<!-- sign and deploy the javadoc artifact -->
<artifact:mvn>
<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.5:sign-and-deploy-file" />
<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="-Durl=${maven-repository-url}" />
<arg value="-DrepositoryId=${maven-repository-id}" />
<arg value="-DpomFile=pom.xml" />
Expand Down Expand Up @@ -362,10 +367,12 @@
</dependency>
</artifact:dependencies-->

<artifact:mvn>
<arg value="test"/>
<artifact:mvn mavenHome="${env.MVN_HOME}" fork="true" failonerror="true">
<jvmarg value="-Dmaven.multiModuleProjectDirectory=false" />
<arg value="package"/>
<arg value="-DskipTests"/>
<arg value="-e"/>
<arg value="-o"/>
<!--arg value="-o"/-->
<!-- run offline (-o): must not download dependencies as this is
done from http://repo1.maven.org/ hardwired in
maven-ant-tasks-2.1.3.jar, see NUTCH-2722.
Expand Down
12 changes: 11 additions & 1 deletion ivy/mvn.template
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>23</version>
</parent>
<groupId>${ivy.pom.groupId}</groupId>
<artifactId>${ivy.pom.artifactId}</artifactId>
<packaging>${ivy.pom.packaging}</packaging>
Expand Down Expand Up @@ -46,6 +51,10 @@
<name>MireDot Releases</name>
<url>http://nexus.qmino.com/content/repositories/miredot</url>
</pluginRepository>
<pluginRepository>
<id>maven2</id>
<url>https://repo.maven.apache.org/maven2/</url>
</pluginRepository>
</pluginRepositories>

<developers>
Expand Down Expand Up @@ -119,6 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -130,7 +140,7 @@
<plugin>
<groupId>com.qmino</groupId>
<artifactId>miredot-plugin</artifactId>
<version>2.0.1</version>
<version>2.4.0</version>
<executions>
<execution>
<goals>
Expand Down

0 comments on commit 43f3550

Please sign in to comment.