(maven-shade-plugin) branch master updated: Drop the cruft (#225)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 199ffae Drop the cruft (#225)
199ffae is described below
commit 199ffaecd26a912527173ed4edae366e48a00998
Author: Tamas Cservenak
AuthorDate: Mon May 27 23:21:12 2024 +0200
Drop the cruft (#225)
* Drop commons-collections
Single class mildly used it. Simple replacement added.
* Drop other deprecated dependency
* Null safe
* Maven Artifact should be deprecated, is a mixed bad of mixed concepts
* Remove inherited fluff
---
.github/workflows/maven-verify.yml | 1 -
pom.xml| 55 +-
.../apache/maven/plugins/shade/DefaultShader.java | 30 ++--
.../apache/maven/plugins/shade/mojo/ShadeMojo.java | 55 --
.../properties/io/NoCloseOutputStream.java | 2 +-
5 files changed, 57 insertions(+), 86 deletions(-)
diff --git a/.github/workflows/maven-verify.yml
b/.github/workflows/maven-verify.yml
index c021920..1204718 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -26,4 +26,3 @@ jobs:
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
with:
ff-jdk: "21"
- ff-jdk-distribution: "corretto"
diff --git a/pom.xml b/pom.xml
index 4581fde..2cfbf0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
-${mavenVersion}
+3.6.3
@@ -79,35 +79,14 @@
-3.6.3
+3.9.7
8
-0.3.5
${project.version}
9.7
-1.7.32
+1.7.36
2024-04-20T15:33:41Z
-
-
-
-org.eclipse.sisu
-org.eclipse.sisu.inject
-${sisu.version}
-
-
-org.eclipse.sisu
-org.eclipse.sisu.plexus
-${sisu.version}
-
-
-com.google.inject
-guice
-5.1.0
-
-
-
-
@@ -144,10 +123,7 @@
org.codehaus.plexus
plexus-utils
-
-
- org.codehaus.plexus
- plexus-xml
+ 3.5.1
@@ -181,25 +157,20 @@
2.0.6.1
- org.apache.maven.shared
- maven-dependency-tree
- 3.2.1
+ org.apache.commons
+ commons-compress
+ 1.26.2
commons-io
commons-io
- 2.13.0
+ 2.16.1
org.vafer
jdependency
2.10
-
- org.apache.commons
- commons-collections4
- 4.4
-
@@ -211,6 +182,7 @@
com.google.inject
guice
+ 5.1.0
test
@@ -228,13 +200,13 @@
org.xmlunit
xmlunit-legacy
- 2.9.1
+ 2.10.0
test
org.mockito
mockito-core
- 2.28.2
+ 3.12.4
test
@@ -255,11 +227,6 @@
3.3.0
test
-
- org.apache.commons
- commons-compress
- 1.26.1
-
diff --git a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
index c11978e..d8a9c65 100644
--- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
+++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
@@ -24,7 +24,6 @@ import javax.inject.Singleton;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -32,16 +31,19 @@ import java.io.OutputStreamWriter;
import java.io.PushbackInputStream;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Callable;
@@ -54,8 +56,6 @@ import java.util.zip.CRC32;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
-import org.apache.commons.collections4.MultiValuedMap;
-import org.apache.commons.collections4.multimap.HashSetValuedHashMap;
import org.apache.commons.compress.archivers.zip.ExtraFieldUtils;
import org.apache.commons.compress.archivers.zip.X5455_ExtendedTimestamp;
import org.apache.commons.compress.archivers.zip.ZipExtraField;
@@ -137,26 +137,26 @@ public class DefaultShader implements Shader {
goThroughAllJarEntriesForManifestTransformer(shad
(maven-verifier) branch MSHARED-1403-log-file deleted (was 823aa13)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch MSHARED-1403-log-file in repository https://gitbox.apache.org/repos/asf/maven-verifier.git was 823aa13 fix javadoc The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-verifier) branch master updated: [MSHARED-1403] Configure log file as as File (not only file name relative to base directory) (#89)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-verifier.git
The following commit(s) were added to refs/heads/master by this push:
new 260453a [MSHARED-1403] Configure log file as as File (not only file
name relative to base directory) (#89)
260453a is described below
commit 260453aa439d5f83f53a9dbaf430a713887fb249
Author: Olivier Lamy
AuthorDate: Sat May 25 11:11:05 2024 +0200
[MSHARED-1403] Configure log file as as File (not only file name relative
to base directory) (#89)
* [MSHARED-1403] Configure log file as as File (not only file name relative
to base directory)
-
Signed-off-by: Olivier Lamy
---
pom.xml| 1 +
.../org/apache/maven/shared/verifier/Verifier.java | 33 ++
.../apache/maven/shared/verifier/VerifierTest.java | 24
3 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index dbf7117..54392fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,6 +145,7 @@
${maven.home}
+
${session.repositorySession.localRepository.basedir.absolutePath}
diff --git a/src/main/java/org/apache/maven/shared/verifier/Verifier.java
b/src/main/java/org/apache/maven/shared/verifier/Verifier.java
index 29abaf8..362b11d 100644
--- a/src/main/java/org/apache/maven/shared/verifier/Verifier.java
+++ b/src/main/java/org/apache/maven/shared/verifier/Verifier.java
@@ -60,6 +60,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.regex.Pattern;
@@ -113,6 +114,8 @@ public class Verifier {
private String logFileName = LOG_FILENAME;
+private File logFile;
+
private String mavenHome;
// will launch mvn with -X
@@ -209,7 +212,7 @@ public class Verifier {
* use
* {@link #Verifier(String)}
* {@link #setSettingsFile(String)} to set settings file
- * {@link #setForkJvm(Boolean)} to set forkJvm status
+ * {@link #setForkJvm(boolean)} to set forkJvm status
*
*/
@Deprecated
@@ -224,7 +227,7 @@ public class Verifier {
* use
* {@link #Verifier(String basedir)}
* {@link #setSettingsFile(String settingsFile)} to set settings
file
- * {@link #setForkJvm(Boolean)} to set forkJvm status and
+ * {@link #setForkJvm(boolean)} to set forkJvm status and
* {@link #setDefaultCliArguments(String[] defaultCliArguments)} to
set settings file
*
*/
@@ -303,7 +306,7 @@ public class Verifier {
}
public void verifyErrorFreeLog() throws VerificationException {
-List lines = loadFile(getBasedir(), getLogFileName(), false);
+List lines = loadFile(getLogFile(), false);
for (String line : lines) {
// A hack to keep stupid velocity resource loader errors from
triggering failure
@@ -331,7 +334,7 @@ public class Verifier {
* @throws VerificationException if text is not found in log
*/
public void verifyTextInLog(String text) throws VerificationException {
-List lines = loadFile(getBasedir(), getLogFileName(), false);
+List lines = loadFile(getLogFile(), false);
boolean result = false;
for (String line : lines) {
@@ -1122,7 +1125,7 @@ public class Verifier {
}
int ret;
-File logFile = new File(getBasedir(), getLogFileName());
+File logFile = getLogFile();
try {
MavenLauncher launcher = getMavenLauncher(environmentVariables);
@@ -1466,6 +1469,24 @@ public class Verifier {
this.logFileName = logFileName;
}
+/**
+ *
+ * @param logFile configure the log file used to log build output
+ * @since 2.0 ish (not really sure if this will be this)
+ */
+public void setLogFile(File logFile) {
+this.logFile = Objects.requireNonNull(logFile, "log file cannot be
null");
+}
+
+/**
+ *
+ * @return The log file used to log build output
+ * @since 2.0 ish (not really sure if this will be this)
+ */
+public File getLogFile() {
+return logFile == null ? new File(getBasedir(), logFileName) : logFile;
+}
+
/**
* @deprecated will be removed without replacement
*/
@@ -1493,7 +1514,7 @@ public class Verifier {
this.mavenDebug = mavenDebug;
}
-public void setForkJvm(Boolean forkJvm) {
+public void setForkJvm(boolean forkJvm) {
this.forkJvm = forkJvm;
}
diff --git a/src/test/java/org/apache/maven/shared/verifier/VerifierTest.java
b/src/test/java/org/apache/maven/shared/verifier/VerifierTest.java
index 0d6107d..1ce198d 100644
--- a/src/test/java/
(maven-verifier) branch MSHARED-1403-log-file updated (e025c52 -> 823aa13)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch MSHARED-1403-log-file in repository https://gitbox.apache.org/repos/asf/maven-verifier.git from e025c52 [MSHARED-1403] Configure log file as as File (not only file name relative to base directory) add 823aa13 fix javadoc No new revisions were added by this update. Summary of changes: src/main/java/org/apache/maven/shared/verifier/Verifier.java | 4 ++-- src/test/java/org/apache/maven/shared/verifier/VerifierTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
(maven-verifier) branch MSHARED-1403-log-file created (now e025c52)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch MSHARED-1403-log-file in repository https://gitbox.apache.org/repos/asf/maven-verifier.git at e025c52 [MSHARED-1403] Configure log file as as File (not only file name relative to base directory) No new revisions were added by this update.
svn commit: r69113 - /release/maven/buildcache/
Author: olamy Date: Mon May 13 00:55:44 2024 New Revision: 69113 Log: build cache extension 1.2.0 Added: release/maven/buildcache/maven-build-cache-extension-1.2.0-source-release.zip (with props) release/maven/buildcache/maven-build-cache-extension-1.2.0-source-release.zip.asc release/maven/buildcache/maven-build-cache-extension-1.2.0-source-release.zip.sha512 Removed: release/maven/buildcache/maven-build-cache-extension-1.1.0-source-release.zip release/maven/buildcache/maven-build-cache-extension-1.1.0-source-release.zip.asc release/maven/buildcache/maven-build-cache-extension-1.1.0-source-release.zip.sha512 Added: release/maven/buildcache/maven-build-cache-extension-1.2.0-source-release.zip == Binary file - no diff available. Propchange: release/maven/buildcache/maven-build-cache-extension-1.2.0-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/buildcache/maven-build-cache-extension-1.2.0-source-release.zip.asc == --- release/maven/buildcache/maven-build-cache-extension-1.2.0-source-release.zip.asc (added) +++ release/maven/buildcache/maven-build-cache-extension-1.2.0-source-release.zip.asc Mon May 13 00:55:44 2024 @@ -0,0 +1,6 @@ +-BEGIN PGP SIGNATURE- + +iF0EABEKAB0WIQTyVLNWF9wlXZNEvPqHOo6GtDchRgUCZjwYdgAKCRCHOo6GtDch +Rkl5AJ931ZF3QUSI5mlMhQnCawOM18JVOwCeJMlgVzsYkAO46R+axTtZ3aRwCjI= +=C8gv +-END PGP SIGNATURE- Added: release/maven/buildcache/maven-build-cache-extension-1.2.0-source-release.zip.sha512 == --- release/maven/buildcache/maven-build-cache-extension-1.2.0-source-release.zip.sha512 (added) +++ release/maven/buildcache/maven-build-cache-extension-1.2.0-source-release.zip.sha512 Mon May 13 00:55:44 2024 @@ -0,0 +1 @@ +bc1a4b84c4f21a73964d8f65c3d37e372dfa8fc6d64e13db3f2d7ff2111485b41eb6bd24872626597070fd28cdcb55e0702cf9a2f106bedc7ec1483fbcd2aeb2 \ No newline at end of file
(maven-assembly-plugin) branch MASSEMBLY-1030 deleted (was 6bbbe8cc)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch MASSEMBLY-1030 in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git was 6bbbe8cc force war plugin version to get it working with more recent Java version The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(maven-assembly-plugin) branch master updated: [MASSEMBLY-1030] Manifest entries from archive configuration are not added in final MANIFEST (#205)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 6f86188d [MASSEMBLY-1030] Manifest entries from archive configuration
are not added in final MANIFEST (#205)
6f86188d is described below
commit 6f86188d097f58453c7fcf662c02c691020877d1
Author: Olivier Lamy
AuthorDate: Sun May 12 13:17:31 2024 +0200
[MASSEMBLY-1030] Manifest entries from archive configuration are not added
in final MANIFEST (#205)
* [MASSEMBLY-1030] Manifest entries from archive configuration are not
added in final MANIFEST
Signed-off-by: Olivier Lamy
* force war plugin version to get it working with more recent Java version
Signed-off-by: Olivier Lamy
-
Signed-off-by: Olivier Lamy
---
src/it/it-project-parent/pom.xml | 5 ++
.../pom.xml| 86 ++
.../src/main/assembly/web-bundle.xml | 40 ++
.../src/main/java/test/App.java| 33 +
.../src/main/webapp/WEB-INF/web.xml| 27 +++
.../src/main/webapp/index.jsp | 20 +
.../verify.bsh | 39 ++
.../archive/ManifestCreationFinalizer.java | 10 +++
8 files changed, 260 insertions(+)
diff --git a/src/it/it-project-parent/pom.xml b/src/it/it-project-parent/pom.xml
index 511da0d6..37af8699 100644
--- a/src/it/it-project-parent/pom.xml
+++ b/src/it/it-project-parent/pom.xml
@@ -79,6 +79,11 @@ under the License.
maven-surefire-plugin
@version.maven-surefire@
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 3.4.0
+
diff --git
a/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/pom.xml
b/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/pom.xml
new file mode 100644
index ..d446ff21
--- /dev/null
+++
b/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/pom.xml
@@ -0,0 +1,86 @@
+
+
+
+
+ 4.0.0
+
+org.apache.maven.plugin.assembly.test
+it-project-parent
+1
+
+
+ test
+ manifest-with-customEntry-manifest-file
+ war
+ 1
+
+
+
+org.apache.felix
+maven-bundle-plugin
+5.1.9
+true
+
+
+war
+
+
+
jakarta.servlet.jsp.*;version="[3,4)",org.eclipse.jetty.*;version="[$(version;===;1.0),$(version;==+;1.0))",*
+!org.example.*
+/ee10-demo-jsp
+.,WEB-INF/classes
+
+
+
+
+
+ manifest
+
+process-classes
+
+
+
+
+maven-assembly-plugin
+
+
+assembly
+package
+
+ single
+
+
+
+src/main/assembly/web-bundle.xml
+
+
+
${project.build.outputDirectory}/META-INF/MANIFEST.MF
+
+ beer
+
+
+
+
+
+
+
+
+
+
diff --git
a/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/src/main/assembly/web-bundle.xml
b/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/src/main/assembly/web-bundle.xml
new file mode 100644
index ..41660b10
--- /dev/null
+++
b/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/src/main/assembly/web-bundle.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+webbundle
+
+jar
+
+false
+
+
+
${basedir}/${project.build.directory}/${project.build.finalName}/
+
+
+**/*.*
+
+
+WEB-INF/lib/**
+
+
+
+
diff --git
a/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/src/main/java/test/App.java
b/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/src/main/java/test/App.java
new file mode 100644
index ..d0442f33
--- /dev/null
+++
b/src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/src/main/java/test/App.java
@@ -0,0 +1,33 @@
+package test;
+
+/*
+ * 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
(maven-assembly-plugin) branch MASSEMBLY-1030 updated (15e92f51 -> 6bbbe8cc)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch MASSEMBLY-1030 in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git from 15e92f51 [MASSEMBLY-1030] Manifest entries from archive configuration are not added in final MANIFEST add 6bbbe8cc force war plugin version to get it working with more recent Java version No new revisions were added by this update. Summary of changes: src/it/it-project-parent/pom.xml | 5 ++ .../pom.xml| 8 --- .../src/test/java/test/AppTest.java| 58 -- 3 files changed, 5 insertions(+), 66 deletions(-) delete mode 100644 src/it/projects/mojo-configuration/manifest-with-customEntry-manifest-file/src/test/java/test/AppTest.java
(maven-assembly-plugin) branch MASSEMBLY-1030 created (now 15e92f51)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch MASSEMBLY-1030 in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git at 15e92f51 [MASSEMBLY-1030] Manifest entries from archive configuration are not added in final MANIFEST No new revisions were added by this update.
svn commit: r1917666 - /maven/website/components/extensions-archives/maven-build-cache-extension-1.1.0/
Author: olamy Date: Sat May 11 08:41:16 2024 New Revision: 1917666 Log: restore 1.1.0 Added: maven/website/components/extensions-archives/maven-build-cache-extension-1.1.0/ - copied from r1914145, maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/
svn commit: r1917665 - /maven/website/components/extensions-archives/maven-build-cache-extension-1.2.0/
Author: olamy Date: Sat May 11 08:39:12 2024 New Revision: 1917665 Log: backup as 1.2.0 Added: maven/website/components/extensions-archives/maven-build-cache-extension-1.2.0/ - copied from r1917664, maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/
svn commit: r1917588 [34/42] - in /maven/website/components/extensions-archives/maven-build-cache-extension-LATEST: ./ apidocs/ apidocs/jquery/ apidocs/legal/ apidocs/org/apache/maven/buildcache/ apid
Modified:
maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/xref/org/apache/maven/buildcache/xml/CacheConfigImpl.html
==
---
maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/xref/org/apache/maven/buildcache/xml/CacheConfigImpl.html
(original)
+++
maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/xref/org/apache/maven/buildcache/xml/CacheConfigImpl.html
Thu May 9 00:34:30 2024
@@ -50,575 +50,609 @@
42 import
org.apache.maven.buildcache.xml.config.CacheConfig;
43 import
org.apache.maven.buildcache.xml.config.Configuration;
44 import
org.apache.maven.buildcache.xml.config.CoordinatesBase;
-45 import
org.apache.maven.buildcache.xml.config.Exclude;
-46 import
org.apache.maven.buildcache.xml.config.Executables;
-47 import
org.apache.maven.buildcache.xml.config.ExecutionConfigurationScan;
-48 import
org.apache.maven.buildcache.xml.config.ExecutionControl;
-49 import
org.apache.maven.buildcache.xml.config.ExecutionIdsList;
-50 import
org.apache.maven.buildcache.xml.config.GoalReconciliation;
-51 import
org.apache.maven.buildcache.xml.config.GoalsList;
-52 import
org.apache.maven.buildcache.xml.config.Include;
-53 import
org.apache.maven.buildcache.xml.config.Input;
-54 import
org.apache.maven.buildcache.xml.config.Local;
-55 import
org.apache.maven.buildcache.xml.config.MultiModule;
-56 import
org.apache.maven.buildcache.xml.config.PathSet;
-57 import
org.apache.maven.buildcache.xml.config.PluginConfigurationScan;
-58 import
org.apache.maven.buildcache.xml.config.PluginSet;
-59 import
org.apache.maven.buildcache.xml.config.ProjectVersioning;
-60 import
org.apache.maven.buildcache.xml.config.PropertyName;
-61 import
org.apache.maven.buildcache.xml.config.Remote;
-62 import
org.apache.maven.buildcache.xml.config.TrackedProperty;
-63 import org.apache.maven.execution.MavenSession;
-64 import org.apache.maven.model.Plugin;
-65 import org.apache.maven.model.PluginExecution;
-66 import org.apache.maven.plugin.MojoExecution;
-67 import org.apache.maven.rtinfo.RuntimeInformation;
-68 import org.slf4j.Logger;
-69 import org.slf4j.LoggerFactory;
-70
-71 import static
java.lang.Boolean.TRUE;
-72 import static
org.apache.maven.buildcache.CacheUtils.getMultimoduleRoot;
-73
-74 /**
-75 * CacheConfigImpl
-76 */
-77 @SessionScoped
-78 @Named
-79
@SuppressWarnings("unused")
-80 public class
CacheConfigImpl
implements
org.apache.maven.buildcache.xml.CacheConfig {
-81
-82 public static
final String CONFIG_PATH_PROPERTY_NAME =
"maven.build.cache.configPath";
-83 public static
final String CACHE_ENABLED_PROPERTY_NAME =
"maven.build.cache.enabled";
-84 public static
final String CACHE_LOCATION_PROPERTY_NAME
= "maven.build.cache.location";
-85 public static
final String REMOTE_ENABLED_PROPERTY_NAME
= "maven.build.cache.remote.enabled";
-86 public static
final String REMOTE_URL_PROPERTY_NAME =
"maven.build.cache.remote.url";
-87 public static
final String
REMOTE_SERVER_ID_PROPERTY_NAME = "maven.build.cache.remote.server.id";
-88 public static
final String SAVE_TO_REMOTE_PROPERTY_NAME
= "maven.build.cache.remote.save.enabled";
-89 public static
final String SAVE_NON_OVERRIDEABLE_NAME =
"maven.build.cache.remote.save.final";
-90 public static
final String FAIL_FAST_PROPERTY_NAME =
"maven.build.cache.failFast";
-91 public static
final String
BASELINE_BUILD_URL_PROPERTY_NAME = "maven.build.cache.baselineUrl";
-92 public static
final String LAZY_RESTORE_PROPERTY_NAME =
"maven.build.cache.lazyRestore";
-93 public static
final String
RESTORE_GENERATED_SOURCES_PROPERTY_NAME = "maven.build.cache.restoreGeneratedSources";
-94 public static
final String ALWAYS_RUN_PLUGINS = "maven.build.cache.alwaysRunPlugins";
-95
-96 /**
-97 * Flag to control if we should skip lookup for
cached artifacts globally or for a particular project even if
-98 * qualifying artifacts exist in build
cache.
-99 * E.g. to trigger a forced build (full or for a
particular module)
-100 * May be also activated via properties for
projects via a profile e.g. on CI when some files produced by the build
-101 * are required (e.g. smth. from target folder
as additional CI build artifacts):
-102 * {@code
maven.build.cache.skipCachetruemaven.build.cache.skipCache/}
-103 */
-104 public static
final String CACHE_SKIP = "maven.build.cache.skipCache";
-105
-106 private static final
Logger LOGGER = LoggerFactory.getLogger(CacheConfigImpl.class);
-107
-108 private final
XmlService
xmlService;
-109 private final
MavenSession session;
-110 private final
RuntimeInformation rtInfo;
-111
-112 private volatile CacheState
state;
-113 private CacheConfig
cacheConfig;
-114
svn commit: r1917588 [39/42] - in /maven/website/components/extensions-archives/maven-build-cache-extension-LATEST: ./ apidocs/ apidocs/jquery/ apidocs/legal/ apidocs/org/apache/maven/buildcache/ apid
Added:
maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/xref/org/apache/maven/buildcache/xml/config/DirName.html
==
---
maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/xref/org/apache/maven/buildcache/xml/config/DirName.html
(added)
+++
maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/xref/org/apache/maven/buildcache/xml/config/DirName.html
Thu May 9 00:34:30 2024
@@ -0,0 +1,111 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;>
+http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
+
+DirName xref
+
+
+
+View
Javadoc
+1 // === DO NOT EDIT THIS FILE
+2 // Generated by Modello 2.1.2,
+3 // any modifications will be overwritten.
+4 //
==
+5
+6 package org.apache.maven.buildcache.xml.config;
+7
+8 /**
+9* Path to a directory containing files which needs
to be
+10 * saved/restored (relative to the build
directory).
+11 * br
+12 * Examples :
+13 * ul
+14 *
+15 *
licodelt;dirNamegt;classeslt;/dirNamegt;/code
: files
+16 * in
${project.basedir}/target/classes/li
+17 *
licodelt;dirName
+18 *
glob="jacoco.xml"gt;lt;/dirNamegt;/code : jacoco
report
+19 * files in ${project.basedir}/target/li
+20 *
+21 *
licodelt;dirNamegt;../src/main/javagenlt;/dirNamegt;/code
+22 * : files in ${project.basedir}/src/main/javagen
(in this exemple,
+23 * javagen is a folder saved in git but erased on
clean) /li
+24 * /ul
+25 * brbr
+26 *
+27 *
+28 *
+29 * @version $Revision$ $Date$
+30 */
+31 @SuppressWarnings(
"all" )
+32 public class
DirName
+33 implements java.io.Serializable
+34 {
+35
+36//--/
+37 //- Class/Member Variables -/
+38 //--/
+39
+40 /**
+41 * Directory name in build output directory to
attach to cached
+42 * artifacts.
+43 */
+44 private String value;
+45
+46 /**
+47 * Entries are filtered by matching this
glob.
+48 */
+49 private String glob = "*";
+50
+51
+52//---/
+53 //- Methods -/
+54 //---/
+55
+56 /**
+57 * Get entries are filtered by matching this
glob.
+58 *
+59 * @return String
+60 */
+61 public String getGlob()
+62 {
+63 return this.glob;
+64 } //-- String getGlob()
+65
+66 /**
+67 * Get directory name in build output directory
to attach to
+68 * cached artifacts.
+69 *
+70 * @return String
+71 */
+72 public String getValue()
+73 {
+74 return this.value;
+75 } //-- String getValue()
+76
+77 /**
+78 * Set entries are filtered by matching this
glob.
+79 *
+80 * @param glob a glob object.
+81 */
+82 public void
setGlob( String glob )
+83 {
+84 this.glob = glob;
+85 } //-- void setGlob( String )
+86
+87 /**
+88 * Set directory name in build output directory
to attach to
+89 * cached artifacts.
+90 *
+91 * @param value a value object.
+92 */
+93 public void
setValue( String value )
+94 {
+95 this.value = value;
+96 } //-- void setValue( String )
+97
+98 }
+
+
+Copyright 20212024 https://www.apache.org/;>The Apache Software Foundation. All rights
reserved.
+
+
\ No newline at end of file
Modified:
maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/xref/org/apache/maven/buildcache/xml/config/DirScanConfig.html
==
---
maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/xref/org/apache/maven/buildcache/xml/config/DirScanConfig.html
(original)
+++
maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/xref/org/apache/maven/buildcache/xml/config/DirScanConfig.html
Thu May 9 00:34:30 2024
@@ -245,6 +245,6 @@
237 }
-Copyright 20212023 https://www.apache.org/;>The Apache Software Foundation. All rights
reserved.
+Copyright 20212024 https://www.apache.org/;>The Apache Software Foundation. All rights
reserved.
\ No newline at end of file
Modified:
maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/xref/org/apache/maven/buildcache/xml/config/Discovery.html
==
---
maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/xref/org/apache/maven/buildcache/xml/config/Discovery.html
(original)
+++
svn commit: r1917588 [14/42] - in /maven/website/components/extensions-archives/maven-build-cache-extension-LATEST: ./ apidocs/ apidocs/jquery/ apidocs/legal/ apidocs/org/apache/maven/buildcache/ apid
Modified: maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/apidocs/org/apache/maven/buildcache/xml/build/io/xpp3/package-summary.html == --- maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/apidocs/org/apache/maven/buildcache/xml/build/io/xpp3/package-summary.html (original) +++ maven/website/components/extensions-archives/maven-build-cache-extension-LATEST/apidocs/org/apache/maven/buildcache/xml/build/io/xpp3/package-summary.html Thu May 9 00:34:30 2024 @@ -3,7 +3,7 @@ -org.apache.maven.buildcache.xml.build.io.xpp3 (Apache Maven Build Cache Extension 1.1.0 API) +org.apache.maven.buildcache.xml.build.io.xpp3 (Apache Maven Build Cache Extension 1.2.0 API) @@ -21,7 +21,7 @@ -Copyright © 2021–2023 https://www.apache.org/";>The Apache Software Foundation. All rights reserved.
+Copyright © 2021–2024 https://www.apache.org/";>The Apache Software Foundation. All rights reserved.