159 lines
9.0 KiB
Diff
159 lines
9.0 KiB
Diff
From c8ecbea0dd63d065376768e8cae571a15aa48ae8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
|
Date: Fri, 13 May 2022 17:34:20 +0200
|
|
Subject: [PATCH 7/7] Fix build with qdox-2.0.1
|
|
|
|
---
|
|
.../org/apache/maven/plugin/DefaultExtensionRealmCache.java | 2 +-
|
|
.../org/apache/maven/plugin/DefaultPluginArtifactsCache.java | 2 +-
|
|
.../java/org/apache/maven/plugin/DefaultPluginRealmCache.java | 2 +-
|
|
.../java/org/apache/maven/plugin/ExtensionRealmCache.java | 4 ++--
|
|
.../java/org/apache/maven/plugin/PluginArtifactsCache.java | 4 ++--
|
|
.../main/java/org/apache/maven/plugin/PluginRealmCache.java | 4 ++--
|
|
.../org/apache/maven/project/DefaultProjectRealmCache.java | 2 +-
|
|
.../main/java/org/apache/maven/project/ProjectRealmCache.java | 2 +-
|
|
.../maven/project/artifact/DefaultProjectArtifactsCache.java | 2 +-
|
|
.../apache/maven/project/artifact/ProjectArtifactsCache.java | 4 ++--
|
|
10 files changed, 14 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
|
|
index 6ce63ebbf..e3241c070 100644
|
|
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
|
|
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
|
|
@@ -157,7 +157,7 @@ public void flush()
|
|
cache.clear();
|
|
}
|
|
|
|
- public void register( MavenProject project, Key key, CacheRecord record )
|
|
+ public void register( MavenProject project, Key key, CacheRecord record_ )
|
|
{
|
|
// default cache does not track extension usage
|
|
}
|
|
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
|
|
index ee11c4c89..2adb29369 100644
|
|
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
|
|
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
|
|
@@ -198,7 +198,7 @@ protected static boolean pluginEquals( Plugin a, Plugin b )
|
|
return CacheUtils.pluginEquals( a, b );
|
|
}
|
|
|
|
- public void register( MavenProject project, Key cacheKey, CacheRecord record )
|
|
+ public void register( MavenProject project, Key cacheKey, CacheRecord record_ )
|
|
{
|
|
// default cache does not track record usage
|
|
}
|
|
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
|
|
index 7862b40de..9432d307f 100644
|
|
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
|
|
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
|
|
@@ -200,7 +200,7 @@ protected static boolean pluginEquals( Plugin a, Plugin b )
|
|
return CacheUtils.pluginEquals( a, b );
|
|
}
|
|
|
|
- public void register( MavenProject project, Key key, CacheRecord record )
|
|
+ public void register( MavenProject project, Key key, CacheRecord record_ )
|
|
{
|
|
// default cache does not track plugin usage
|
|
}
|
|
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
|
|
index 4d01aca4f..c0fda73c6 100644
|
|
--- a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
|
|
+++ b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
|
|
@@ -94,8 +94,8 @@ CacheRecord put( Key key, ClassRealm extensionRealm, ExtensionDescriptor extensi
|
|
* cache.
|
|
*
|
|
* @param project The project that employs the plugin realm, must not be {@code null}.
|
|
- * @param record The cache record being used for the project, must not be {@code null}.
|
|
+ * @param record_ The cache record being used for the project, must not be {@code null}.
|
|
*/
|
|
- void register( MavenProject project, Key key, CacheRecord record );
|
|
+ void register( MavenProject project, Key key, CacheRecord record_ );
|
|
|
|
}
|
|
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
|
|
index 11f5d701f..cf17fe3d8 100644
|
|
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
|
|
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
|
|
@@ -97,8 +97,8 @@ Key createKey( Plugin plugin, DependencyFilter extensionFilter, List<RemoteRepos
|
|
* cache.
|
|
*
|
|
* @param project The project that employs the plugin realm, must not be {@code null}.
|
|
- * @param record The cache record being used for the project, must not be {@code null}.
|
|
+ * @param record_ The cache record being used for the project, must not be {@code null}.
|
|
*/
|
|
- void register( MavenProject project, Key cacheKey, CacheRecord record );
|
|
+ void register( MavenProject project, Key cacheKey, CacheRecord record_ );
|
|
|
|
}
|
|
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
|
|
index 78c3ae6f3..f4aa66f78 100644
|
|
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
|
|
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
|
|
@@ -90,8 +90,8 @@ Key createKey( Plugin plugin, ClassLoader parentRealm, Map<String, ClassLoader>
|
|
* cache.
|
|
*
|
|
* @param project The project that employs the plugin realm, must not be {@code null}.
|
|
- * @param record The cache record being used for the project, must not be {@code null}.
|
|
+ * @param record_ The cache record being used for the project, must not be {@code null}.
|
|
*/
|
|
- void register( MavenProject project, Key key, CacheRecord record );
|
|
+ void register( MavenProject project, Key key, CacheRecord record_ );
|
|
|
|
}
|
|
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
|
|
index a7f06156a..c74fd644f 100644
|
|
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
|
|
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
|
|
@@ -135,7 +135,7 @@ public void flush()
|
|
cache.clear();
|
|
}
|
|
|
|
- public void register( MavenProject project, Key key, CacheRecord record )
|
|
+ public void register( MavenProject project, Key key, CacheRecord record_ )
|
|
{
|
|
// default cache does not track record usage
|
|
}
|
|
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
|
|
index 28ac0d620..72d4002c6 100644
|
|
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
|
|
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
|
|
@@ -87,6 +87,6 @@ public DependencyFilter getExtensionArtifactFilter()
|
|
* @param project The project that employs the plugin realm, must not be {@code null}.
|
|
* @param record The cache record being used for the project, must not be {@code null}.
|
|
*/
|
|
- void register( MavenProject project, Key key, CacheRecord record );
|
|
+ void register( MavenProject project, Key key, CacheRecord record_ );
|
|
|
|
}
|
|
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
|
|
index ae59ada4d..83b1b4333 100644
|
|
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
|
|
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
|
|
@@ -240,7 +240,7 @@ public void flush()
|
|
}
|
|
|
|
@Override
|
|
- public void register( MavenProject project, Key cacheKey, CacheRecord record )
|
|
+ public void register( MavenProject project, Key cacheKey, CacheRecord record_ )
|
|
{
|
|
// default cache does not track record usage
|
|
}
|
|
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
|
|
index 8d8ad790e..690392da5 100644
|
|
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
|
|
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
|
|
@@ -96,8 +96,8 @@ Key createKey( MavenProject project, Collection<String> scopesToCollect, Collect
|
|
* cache.
|
|
*
|
|
* @param project The project that employs the plugin realm, must not be {@code null}.
|
|
- * @param record The cache record being used for the project, must not be {@code null}.
|
|
+ * @param record_ The cache record being used for the project, must not be {@code null}.
|
|
*/
|
|
- void register( MavenProject project, Key cacheKey, CacheRecord record );
|
|
+ void register( MavenProject project, Key cacheKey, CacheRecord record_ );
|
|
|
|
}
|
|
--
|
|
2.36.1
|
|
|