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
34 changes: 34 additions & 0 deletions .github/workflows/maven-verify-3.9.x.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

name: Verify 3.9.x

on:
push:
pull_request:

jobs:
build:
name: Verify
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
with:
maven-args: '-D"maven.test.redirectTestOutputToFile=false -Pmaven3"'
maven-matrix: '[ "3.9.1", "4.0.0-alpha-5" ]'
matrix-exclude: >
[
{"jdk": "8"}
]
6 changes: 3 additions & 3 deletions .github/workflows/maven-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

name: Verify
name: Verify 4.x

on:
push:
Expand All @@ -27,8 +27,8 @@ jobs:
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
with:
maven-args: '-D"maven.test.redirectTestOutputToFile=false"'
maven-matrix: '[ "3.9.0", "4.0.0-alpha-4" ]'
maven-matrix: '[ "3.9.1", "4.0.0-alpha-5" ]'
matrix-exclude: >
[
{"jdk": "8"}
]
]
11 changes: 4 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ under the License.
<minimalJavaBuildVersion>11</minimalJavaBuildVersion>
<classWorldsVersion>2.6.0</classWorldsVersion>

<!-- default maven version, can be override by maven3 profile -->
<mavenVersion>4.0.0-alpha-4</mavenVersion>
<!-- default maven version, will be override by maven3 profile -->
<mavenVersion>4.0.0-alpha-5</mavenVersion>
<maven.dir>maven4</maven.dir>
<maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>

Expand All @@ -79,14 +79,11 @@ under the License.
<cipherVersion>2.0</cipherVersion>
<modelloVersion>1.11</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.8.0</resolverVersion>
<resolverVersion>1.9.7</resolverVersion>
<slf4jVersion>1.7.32</slf4jVersion>
<xmlunitVersion>2.6.4</xmlunitVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>

<maven.site.path>extensions-archives/${project.artifactId}-LATEST</maven.site.path>
<!-- TODO remove when switching parent to maven-extensions:35 -->
<project.build.outputTimestamp>2022-10-27T09:45:25Z</project.build.outputTimestamp>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -418,7 +415,7 @@ under the License.
<profile>
<id>maven3</id>
<properties>
<mavenVersion>3.9.0</mavenVersion>
<mavenVersion>3.9.1</mavenVersion>
<maven.dir>maven3</maven.dir>
<maven.basedir>${project.build.directory}/${maven.dir}</maven.basedir>
</properties>
Expand Down
15 changes: 15 additions & 0 deletions src/site/markdown/remote-cache.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,21 @@ Review `buildsdiff.xml` file and eliminate detected discrepancies. You can also
low level insights. See techniques to configure cache in [How-To](how-to.md) and troubleshooting of typical issues
in the section below.

If you are using a webdav remote server (which is the most easiest to use to create directories on a remote server), from Maven 3.9.1 and 4.0.0-alpha5, support of webdav has been removed per default.
You need to use the following extra configuration:
```bash
-Daether.connector.http.supportWebDav=true
OR
-Dmaven.resolver.transport=wagon
```

Or configure your remote with the following configuration (`dav:url`)
```xml
<remote enabled="true">
<url>dav:http://your-buildcache-url</url>
</remote>
```

## Common issues

### Issue 1: Local checkout is with different line endings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@ public void doTestRemoteCache(String transport) throws VerificationException, IO

verifier.getCliOptions().clear();
verifier.addCliOption("--settings=" + settings);
if (!"wagon".equals(transport)) {
verifier.setSystemProperty("aether.connector.http.supportWebDav", "true");
}
verifier.addCliOption("-D" + HTTP_TRANSPORT_PRIORITY + "=" + ("wagon".equals(transport) ? "0" : "10"));
verifier.addCliOption("-D" + WAGON_TRANSPORT_PRIORITY + "=" + ("wagon".equals(transport) ? "10" : "0"));
verifier.addCliOption("-D" + MAVEN_BUILD_CACHE_REMOTE_SAVE_ENABLED + "=true");
Expand All @@ -197,6 +200,9 @@ public void doTestRemoteCache(String transport) throws VerificationException, IO

verifier.getCliOptions().clear();
verifier.addCliOption("--settings=" + settings);
if (!"wagon".equals(transport)) {
verifier.setSystemProperty("aether.connector.http.supportWebDav", "true");
}
verifier.addCliOption("-D" + HTTP_TRANSPORT_PRIORITY + "=" + ("wagon".equals(transport) ? "0" : "10"));
verifier.addCliOption("-D" + WAGON_TRANSPORT_PRIORITY + "=" + ("wagon".equals(transport) ? "10" : "0"));
verifier.addCliOption("-D" + MAVEN_BUILD_CACHE_REMOTE_SAVE_ENABLED + "=false");
Expand Down
36 changes: 34 additions & 2 deletions src/test/projects/remote-cache-dav/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,40 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>


<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.1</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>