You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/05/10 06:53:12 UTC
[maven-build-cache-extension] branch master updated: [MBUILDCACHE-16] Fix config file name (#11)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git
The following commit(s) were added to refs/heads/master by this push:
new 3fe6c31 [MBUILDCACHE-16] Fix config file name (#11)
3fe6c31 is described below
commit 3fe6c311b883e299646ae74ad50d14fa2cc0314a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue May 10 08:53:09 2022 +0200
[MBUILDCACHE-16] Fix config file name (#11)
---
src/main/mdo/build-cache-config.mdo | 2 +-
src/site/markdown/getting-started.md | 2 +-
src/site/markdown/remote-cache.md | 2 +-
.../resources/{maven-cache-config.xml => maven-build-cache-config.xml} | 3 ---
src/site/site.xml | 2 +-
.../.mvn/{maven-cache-config.xml => maven-build-cache-config.xml} | 0
.../.mvn/{maven-cache-config.xml => maven-build-cache-config.xml} | 0
7 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/mdo/build-cache-config.mdo b/src/main/mdo/build-cache-config.mdo
index b7815e7..54c0430 100644
--- a/src/main/mdo/build-cache-config.mdo
+++ b/src/main/mdo/build-cache-config.mdo
@@ -23,7 +23,7 @@ under the License.
xml.schemaLocation="https://maven.apache.org/xsd/build-cache-config-${version}.xsd">
<id>build-cache-config</id>
<name>BuildCacheConfig</name>
- <description><![CDATA[Maven Incremental Build and Cache configuration, stored in <code>.mvn/maven-cache-config.xml</code>
+ <description><![CDATA[Maven Incremental Build and Cache configuration, stored in <code>.mvn/maven-build-cache-config.xml</code>
]]></description>
<defaults>
diff --git a/src/site/markdown/getting-started.md b/src/site/markdown/getting-started.md
index eb83536..7bf272b 100644
--- a/src/site/markdown/getting-started.md
+++ b/src/site/markdown/getting-started.md
@@ -38,7 +38,7 @@ either in `pom.xml`'s `<project>/<build>/<extensions>` or in `.mvn/extensions.xm
### Adding build cache config
-Copy [default config `maven-cache-config.xml`](./maven-cache-config.xml)
+Copy [default config `maven-build-cache-config.xml`](./maven-build-cache-config.xml)
to [`.mvn/`](https://maven.apache.org/configure.html) directory of your project.
To get overall understanding of build cache machinery, it is recommended to review the config and read comments. In typical
scenario you need to adjust:
diff --git a/src/site/markdown/remote-cache.md b/src/site/markdown/remote-cache.md
index 3cadd1f..ffe85cf 100644
--- a/src/site/markdown/remote-cache.md
+++ b/src/site/markdown/remote-cache.md
@@ -104,7 +104,7 @@ iteratively achieve working configuration.
[INFO] [CACHE] Saved to remote cache https://your-cache-url/<...>/915296a3-4596-4eb5-bf37-f6e13ebe087e/build-cache-report.xml
```
-Copy the link to a `cbuild-ache-report.xml` and provide it to your local build as a baseline for comparison.
+Copy the link to a `build-cache-report.xml` and provide it to your local build as a baseline for comparison.
* Run local build. Command line should look similar to this:
diff --git a/src/site/resources/maven-cache-config.xml b/src/site/resources/maven-build-cache-config.xml
similarity index 97%
rename from src/site/resources/maven-cache-config.xml
rename to src/site/resources/maven-build-cache-config.xml
index ae82b95..ed1d221 100644
--- a/src/site/resources/maven-cache-config.xml
+++ b/src/site/resources/maven-build-cache-config.xml
@@ -26,9 +26,6 @@
<enabled>true</enabled>
<hashAlgorithm>SHA-256</hashAlgorithm>
<validateXml>true</validateXml>
- <projectDiscoveryStrategy>
- <specificVersion>PROJECT-LOCAL</specificVersion>
- </projectDiscoveryStrategy>
<remote enabled="true">
<url>http://host:port</url>
</remote>
diff --git a/src/site/site.xml b/src/site/site.xml
index 1ca0081..e65c9f2 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -48,7 +48,7 @@ under the License.
</menu>
<menu name="Reference">
- <item name="maven-cache-config.xml" href="build-cache-config.html"/>
+ <item name="maven-build-cache-config.xml" href="build-cache-config.html"/>
</menu>
<menu name="Cache Internals">
diff --git a/src/test/projects/build-extension/.mvn/maven-cache-config.xml b/src/test/projects/build-extension/.mvn/maven-build-cache-config.xml
similarity index 100%
rename from src/test/projects/build-extension/.mvn/maven-cache-config.xml
rename to src/test/projects/build-extension/.mvn/maven-build-cache-config.xml
diff --git a/src/test/projects/core-extension/.mvn/maven-cache-config.xml b/src/test/projects/core-extension/.mvn/maven-build-cache-config.xml
similarity index 100%
rename from src/test/projects/core-extension/.mvn/maven-cache-config.xml
rename to src/test/projects/core-extension/.mvn/maven-build-cache-config.xml