SHA256
1
0
forked from pool/maven

Accepting request 945987 from home:fstrba:maven:test

3.8.4

OBS-URL: https://build.opensuse.org/request/show/945987
OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=33
This commit is contained in:
Fridrich Strba 2022-01-13 07:51:31 +00:00 committed by Git OBS Bridge
parent bdf2b9d223
commit e26206550a
10 changed files with 729 additions and 28 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:558c9e3d63fcba23f6b8d3143b8362d362826db19fe3d66af71a0999ed09e9a1
size 5220

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c58ea18cee78d678af33b4080b083a104ab80919e4bb57468109338e0bbad19f
size 2775996

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAABCgAGBQJhUg5WAAoJEBoqHJS96JaIRiYH/idQfMFY5+gd2YbIzvG5Rtq2
asq+nhaJjXX7dY9O3rkjQ8/kufBnF6ebPxDaENGZOYj9N3VSWsQ81VgPMpcVMESd
FYcMorcN9erbiHSuH17th8y341a9YjmxuhiYZzGRCg7qT6HQfTgw/Ja4TKspBt5A
hbGZbc5eWGwHkfjBxPgmf57Vppj+kYej0eXmCUJoPPSzWLlh+hsIa1CXIGF68S8J
jK4QRw6X9KORZvRQUpfRxyRxFyoYXT3w1JdUPIz4AF546hRZZuWEqBakThYgSaWD
uyFJj4L9euTMg0kUB0R+6MRJ0zfzxDYuyV7GFgos5U8Pw/1VGr45x8L7NN2wm8Y=
=tv0x
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be20b051f6afd6ecb0fd8127e2f8e1618f1af8eb3d17dfb24f81609fcae62b9a
size 5120

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:298bfb6172c134655f4f5608342f9c7bc798918ac165b8ded4af800be184ab9b
size 2774526

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAABCgAGBQJhkNSDAAoJEBoqHJS96JaIvpsIAKbTcPc3dfJEp7O3oH6PTcvU
5zeycOGGptm/9k/hCNlzV79YEMDnyZSnEtCBv7/Y3cqEO+WLYeX/0YWxuAIKnBYH
telpXcXVRauV7+eAxgu3nJuIu56eJtGrwndpdYRwkJ94hRhWMG7RsksX3/GtW12u
fH/J/0pYrW1uSIMihk0mEV4lShqhC+mnF6LMM1T3Vl5c9FvTEx0OZWlHd9r10wfD
bX9yXeAt7ckq7EVg0JhW+dpl4Gp5oTwXvNydUMTlOt0NkkC+GHxTDn/BipUt2yau
Sg/J/BKP7/8W0MhnY0tM7x2s8gzc4z7Y3xuzJ+UNCWbO1LREowre8CPVMXoEuSA=
=29QL
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,163 @@
-------------------------------------------------------------------
Thu Jan 13 07:12:09 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 3.8.4
* Sub-task
+ [MNG-6281] - ArrayIndexOutOfBoundsException caused by pom.xml
with invalid/duplicate XML
* Bug
+ [MNG-4706] - Multithreaded building can create bad files for
downloaded artifacts in local repository
+ [MNG-5307] - NPE during resolution of dependencies - parallel
mode
+ [MNG-5315] - Artifact resolution sporadically fails in
parallel builds
+ [MNG-5838] - Maven on No-File-Lock Systems
+ [MNG-5868] - Adding serval times the same artifact via
MavenProjectHelper (attachArtifact) keep adding to the List
duplicate artifacts
+ [MNG-6071] - GetResource ('/) returns 'null' if build is
started with -f
+ [MNG-6216] - ArrayIndexOutOfBoundsException when parsing POM
+ [MNG-6239] - Jansi messes up System.err and System.out
+ [MNG-6380] - Option -Dstyle.color=always doesn't force color
output
+ [MNG-6604] - Intermittent failures while downloading GAVs from
Nexus
+ [MNG-6648] - 'mavenrc_pre' script does not receive arguments
like mavenrc in Bourne shell does
+ [MNG-6719] - mvn color output escape keys w/ "| tee xxx.log"
on Win with git/bash
+ [MNG-6737] - StackOverflowError when version ranges are
unsolvable and graph contains a cycle
+ [MNG-6767] - Plugin with ${project.groupId} resolved
improperly
+ [MNG-6819] - NullPointerException for
DefaultArtifactDescriptorReader.loadPom
+ [MNG-6828] - DependencyResolutionException breaks
serialization
+ [MNG-6842] - ProjectBuilderTest uses Guava, but Guava is not
defined in dependencies
+ [MNG-6843] - Parallel build fails due to missing JAR artifacts
in compilePath
+ [MNG-6850] - Prevent printing the EXEC_DIR when it's just a
disk letter
+ [MNG-6921] - Maven compile with properties ${artifactId} and
${project.build.finalName} occurs
java.lang.NullPointerException
+ [MNG-6937] - StringSearchModelInterpolatorTest fails on
symlinked paths
+ [MNG-6964] - Maven version sorting is internally inconsistent
+ [MNG-6983] - Plugin key can get out of sync with artifactId
and groupId
+ [MNG-7000] - metadata.mdo contains invalid link to schema
+ [MNG-7032] - Option -B still showing formatting when used
with --version
+ [MNG-7034] - StackOverflowError thrown if a cycle exists in
BOM imports
+ [MNG-7045] - Drop CDI API from Maven
+ [MNG-7090] - mvnDebug does not work on Java 11+
+ [MNG-7127] - NullPointerException in
MavenCliTest.testStyleColors in JDK 16
+ [MNG-7155] - make sources jar reproducible (upgrade
maven-source-plugin to 3.2.1)
+ [MNG-7161] - Error thrown during uninstalling of JAnsi
+ [MNG-7214] - Bad transitive dependency parent from CDI API
+ [MNG-7215] - [Regression] Maven Site Plugin cannot resolve
parent site descriptor without locale
+ [MNG-7216] - Revert MNG-7170
+ [MNG-7218] - [Regression]
o.a.m.model.Build.getSourceDirectory() incorrectly returns
absolute dir on 3.8.2
+ [MNG-7219] - [Regression] plexus-cipher missing from
transitive dependencies
+ [MNG-7220] - [REGRESSION] test-classpath incorrectly resolved
+ [MNG-7251] - Fix threadLocalArtifactsHolder leaking into
cloned project
+ [MNG-7253] - Relocation message is never shown
+ [MNG-7270] - Maven startup script (init) calls which(1) which
is an external command
+ [MNG-7285] - [Regression] MavenProject.getArtifacts() not
returning correct value across multiple threads
+ [MNG-7300] - [Regression] Reloading web application (Enter)
fails due to java.lang.ClassNotFoundException
* New Feature
+ [MNG-7149] - Introduce MAVEN_DEBUG_ADDRESS in mvnDebug scripts
+ [MNG-7164] - Add constructor MojoExecutionException(Throwable)
* Improvement
+ [MNG-2802] - Concurrent-safe access to local Maven repository
+ [MNG-6471] - Parallel builder should use the module name as
thread name
+ [MNG-6754] - Set the same timestamp in multi module builds
+ [MNG-6810] - Remove profiles in maven-model
+ [MNG-6811] - Remove unnecessary filtering configuration
+ [MNG-6816] - Prefer System.lineSeparator() over system
properties
+ [MNG-6827] - Replace deprecated StringUtils#defaultString()
from Plexus Utils
+ [MNG-6837] - Simplify detection of the MAVEN_HOME and make it
fully qualified on Windows
+ [MNG-6844] - Use StandardCharsets and remove outdated
@SuppressWarnings
+ [MNG-6853] - Don't box primitives where it's not needed
+ [MNG-6859] - Build not easily reproducible when built from
source release archive
+ [MNG-6873] - Inconsistent library versions notice
+ [MNG-6967] - Improve the command line output from
maven-artifact
+ [MNG-6987] - Reorder groupId before artifactId when writing an
exclusion using maven-model
+ [MNG-7010] - Omit "NB: JAVA_HOME should point to a JDK not a
JRE" except when that is the problem
+ [MNG-7064] - Use HTTPS for schema location in global
settings.xml
+ [MNG-7080] - Add a --color option
+ [MNG-7170] - Allow to associate pomFile/${basedir} with
DefaultProjectBuilder.build(ModelSource, ...)
+ [MNG-7180] - Make --color option behave more like BSD/GNU
grep's --color option
+ [MNG-7181] - Make --version support -q
+ [MNG-7185] - Describe explicit and recommended version for
VersionRange.createFromVersionSpec()
+ [MNG-7190] - Load mavenrc from /usr/local/etc also in Bourne
shell script
+ [MNG-7235] - Speed improvements when calculating the sorted
project graph
+ [MNG-7236] - The DefaultPluginVersionResolver should cache
results for the session
* Task
+ [MNG-6598] - Maven 3.6.0 and Surefire problem
+ [MNG-6884] - Cleanup POM File after version upgrade
+ [MNG-7172] - Remove expansion of Jansi native libraries
+ [MNG-7184] - document .mavenrc/maven_pre.bat|cmd scripts and
MAVEN_SKIP_RC environment variable
+ [MNG-7252] - Fix warnings issued by dependency:analyze
+ [MNG-7254] - Expand Windows native libraries for Jansi due to
JDK-8195129 (workaround)
+ [MNG-7312] - Revert ThreadLocal approach from MNG-6843 and
MNG-7251
* Dependency upgrade
+ [MNG-6818] - Upgrade Plexus Utils to 3.3.0
+ [MNG-6841] - Upgrade Plexus Interpolation to 1.26
+ [MNG-6872] - Found CVEs in your dependencies - plexus-utils
(tests)
+ [MNG-6874] - Upgrade Maven Parent to 34
+ [MNG-6886] - Upgrade plexus-cipher 1.8
+ [MNG-6993] - Upgrade SLF4J to 1.7.30
+ [MNG-7152] - Upgrade Maven Resolver to 1.6.3
+ [MNG-7177] - Upgrade Maven Shared Utils to 3.3.4
+ [MNG-7179] - Upgrade Jansi to 2.3.3
+ [MNG-7186] - Upgrade Guice to 4.2.2
+ [MNG-7196] - Upgrade Jansi to 2.3.4
+ [MNG-7198] - Upgrade SLF4J to 1.7.32
+ [MNG-7246] - Upgrade Plexus Cipher and Sec Dispatcher to 2.0
+ [MNG-7250] - Upgrade Sisu Inject/Plexus to 0.3.5
+ [MNG-7331] - Upgrade Jansi to 2.4.0
- Added patch:
* qdox-2.0.1.patch
+ Fix syntax error with qdox 2.0.1 and method declarations
containing the new keyword "record" as name of variables
-------------------------------------------------------------------
Sun Nov 21 08:49:59 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
@ -6,7 +166,7 @@ Sun Nov 21 08:49:59 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
-------------------------------------------------------------------
Tue Sep 14 14:44:11 UTC 2021 - Stefan Schubert <schubi@suse.de>
- Use libalternatives instead of update-alternatives.
- Use libalternatives instead of update-alternatives.
-------------------------------------------------------------------
Tue May 11 09:57:12 UTC 2021 - Fridrich Strba <fstrba@suse.com>

View File

@ -8,6 +8,9 @@ svn cat https://svn.apache.org/repos/asf/maven/project/KEYS > KEYS
then commit: This is a PMC activity. If you are not a PMC member then email
private@maven.apache.org with a request to update this file for you
Note: This file UTF-8 encoded.
---
sec 4096R/1D821345 2017-03-14 [expires: 2021-03-14]
uid Karl Heinz Marbaise (Apache Key) <khmarbaise@apache.org>
ssb 4096R/3E71052E 2017-03-14
@ -1424,10 +1427,10 @@ qk2TG672K5OH1rxc8V4=
-----END PGP PUBLIC KEY BLOCK-----
pub 1024D/3571506F 2008-09-22
uid Raphal PiŽroni <rafale@apache.org>
sig 3 3571506F 2008-09-22 Raphal PiŽroni <rafale@apache.org>
uid Raphaël Piéroni <rafale@apache.org>
sig 3 3571506F 2008-09-22 Raphaël Piéroni <rafale@apache.org>
sub 2048g/FAFAC767 2008-09-22
sig 3571506F 2008-09-22 Raphal PiŽroni <rafale@apache.org>
sig 3571506F 2008-09-22 Raphaël Piéroni <rafale@apache.org>
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.6 (Darwin)
@ -1827,10 +1830,10 @@ SISUgpbSa2ZJTWFVpETC84GWTOcaF8iIclt1PSmURW5akxuUzKa358zFKUiH0Zhh
-----END PGP PUBLIC KEY BLOCK-----
pub 4096R/2CF0CC82 2009-11-17
uid Arnaud Héritier (CODE SIGNING KEY) <aheritier@apache.org>
sig 3 2CF0CC82 2009-11-17 Arnaud Héritier (CODE SIGNING KEY) <aheritier@apache.org>
uid Arnaud Héritier (CODE SIGNING KEY) <aheritier@apache.org>
sig 3 2CF0CC82 2009-11-17 Arnaud Héritier (CODE SIGNING KEY) <aheritier@apache.org>
sub 4096R/37540EAE 2009-11-17
sig 2CF0CC82 2009-11-17 Arnaud Héritier (CODE SIGNING KEY) <aheritier@apache.org>
sig 2CF0CC82 2009-11-17 Arnaud Héritier (CODE SIGNING KEY) <aheritier@apache.org>
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.8 (Darwin)
@ -2304,7 +2307,7 @@ MTiatN44MuW2D5THxkQn74IS9rVSHzRrCH9wMl1hIl7CgAkfTFwRdLS721dXPlzj
pub 4096R/F65C0178 2012-07-10
uid Tony Chemit (CODE SIGNING KEY) <tchemit@apache.org>
sub 4096R/C59244F2 2012-07-10
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: SKS 1.1.0
@ -3129,6 +3132,252 @@ DAHwD80IXAi3LV2AKb81
=I9Tv
-----END PGP PUBLIC KEY BLOCK-----
pub rsa4096 2013-08-29 [SCA] [expires: 2022-12-31]
D53C5C58A3E173D18AEDF6E993450DF2DF9A3FA3
uid [ultimate] Andreas Dangel <adangel@apache.org>
sub rsa4096 2013-08-29 [E] [expires: 2022-12-31]
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
9Mry/JsrnY6MO4AjJ6o=
=b1Pm
-----END PGP PUBLIC KEY BLOCK-----
pub rsa2048 2016-11-12 [SC]
FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A
uid [ ultime ] Herve Boutemy <hboutemy@apache.org>
@ -3319,4 +3568,174 @@ cuq/II1ZDuRuliJqClfOuDR6UOS+SSyvSE8ji3QdDPDg7wmQmgjbbxJC30rHP41L
unjMt3DLBzaJoE6yzf5poXaOu4gEVr4I52oIG2oLRG+HYaF+2Ee0ik0Wvcu+7vLp
yM/tiCDNdDcO
=Qw20
-----END PGP PUBLIC KEY BLOCK-----
-----END PGP PUBLIC KEY BLOCK-----
pub rsa2048 2020-07-12 [SC] [expires: 2026-04-16]
82C9EC0E52C47A936A849E0113D979595E6D01E1
uid [ultimate] Maarten Mulders <mthmulders@apache.org>
sub rsa2048 2020-07-12 [E] [expires: 2026-04-16]
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQENBF8LXXYBCACuy3HnrpWl7boi98G4wG1ZrhBiYImyfQd1M+dvH3GF3Vqt2NYv
Nv8vryhUkMi8uu233KrYx2/kVK0RomMYWtUrSbQIdykytd0/VsoEk82ysN21ld9P
PfnNF7L0egnw1KEhcPzghqOsEY3ahqgTYqoiHLD/isLifMUJkJuoLlGx4XfQdpcy
RrSyjzf4/7XUYaYZ5OkhRHCZKGy75PNwibalNMm8H3+paqbwextv3PswVXOZWR6o
uyeiPgoemoM0T2ZcZdKIxrUZiVae8HJltyEca9hjqQF7zzofiTXW3qS3J3bPsylO
lPLr/NZ3vyUtuGc3V7nuUIVvpjy8nAzZOtGrABEBAAG0J01hYXJ0ZW4gTXVsZGVy
cyA8bXRobXVsZGVyc0BhcGFjaGUub3JnPokBVAQTAQgAPgIbAwULCQgHAgYVCgkI
CwIEFgIDAQIeAQIXgBYhBILJ7A5SxHqTaoSeARPZeVlebQHhBQJgezrCBQkK1d7M
AAoJEBPZeVlebQHhm54IAJEZYJRMu2hMeYwmbnnnJtnABkYxGiA7OzzRuC2FlLGK
8lZ8UsZx2D4reDXDjGcK7Nrw0noadflSoiQBvYuZZNNfjnCR6C7q+i3NhaXRLxIf
AAt5yfJ4/1rkRvjNFQdmgdow1qOHgA9JBTsW3TFlzGlHup4ELV9E2JvzhRz683ZJ
GgTHhCjuiWeZLScKZO2ex28WIP12Al3iyJK1PVJDLd4OVxZ06wXq8kyi7xDxRa93
6DBi0u2FoGjOVbUTJe7dVYi16diea3L5gfCLGUmfV3wTUKfB0ebMU64UDXo4IhXN
nqfO5ObKB+cUArPw6DpCCQdXcUecMPDW4a/HmghqDnW5AQ0EXwtddgEIAKcoShcS
rQcXOseptJuBvCxgdejytGbblL0VJkPflX316Iy0COd6ePpTfpu6HEEqIDkNtRMr
ENNcEPZhaGcpsr+BOGJgobwUz50hWeY5JqYSiAG0+RtDuX2iuzJb5pZ69k6PH8MU
48goNHgLSeDXzRehyspYvH8eeE/LTpvaksV2K4vgJEONvBdSlGqaZaG/STrEn5xI
jLmni9AvUI6Al8um0uZbLUll+mXlwiGLcFTRZXY8u3vz2qzy9XMxtXeT8Asw1V1O
+rKr74qXWNJHJn/vbB7E9Gx8Qvr6ZswtHtQtigwDWiOUa1Lbpni9gANNWs8CrY6Y
tvsX7BlIiQfDTzEAEQEAAYkBPAQYAQgAJgIbDBYhBILJ7A5SxHqTaoSeARPZeVle
bQHhBQJgezp6BQkK1d6EAAoJEBPZeVlebQHhRo8IAKP0JJAfLPphBwmzT9eknEL2
5w3Awo6kZikW/2FaiR1S1kmtLDhBwmsrLImpVCCeF/hTbXT8zjcH86g9TLQGs5df
lbYvy6TihFMFihAf/Ifw8DrRSnqG6JlpclvAKu9hB5nNFjG4VXJr4toe9BvH+rxM
EjeFcDvHrZjbuB6F9PaQaN3goB+orP8fb/YsThy3XQlpsm4ehjy3CA7xoyWfMRzU
xZSP3Ybt4J6x6gGl0EPvW87/eWeEhuTrucNDtVvgO2lAlFRaiiSqB71bEmKdTSuV
o6+gyYu0KoA0onZsdWmw7LomZHOY5lPBjkE2WhUG3AN3oxBXag5g64x+LRh4kkU=
=z1Yg
-----END PGP PUBLIC KEY BLOCK-----
pub 4096R/29B5CB5F 2021-04-16
uid Martin Kanters <martinkanters@apache.org>
sig 3 29B5CB5F 2021-04-16 Martin Kanters <martinkanters@apache.org>
sub 4096R/D9D1690C 2021-04-16
sig 29B5CB5F 2021-04-16 Martin Kanters <martinkanters@apache.org>
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
yb/ZbbXG/Ic=
=Ih9U
-----END PGP PUBLIC KEY BLOCK-----
pub rsa4096/0x9EB80E92EB2135B1 2021-12-22 [SC]
84789D24DF77A32433CE1F079EB80E92EB2135B1
uid [ultimate] Slawomir Jaranowski <sjaranowski@apache.org>
sig 3 0x9EB80E92EB2135B1 2021-12-22 Slawomir Jaranowski <sjaranowski@apache.org>
uid [ultimate] Slawomir Jaranowski <s.jaranowski@gmail.com>
sig 3 0x9EB80E92EB2135B1 2021-12-22 Slawomir Jaranowski <sjaranowski@apache.org>
sub rsa4096/0xE3F6790A5A167F5A 2021-12-22 [E]
sig 0x9EB80E92EB2135B1 2021-12-22 Slawomir Jaranowski <sjaranowski@apache.org>
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
=c5jm
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,7 +1,7 @@
#
# spec file for package maven
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,7 +26,7 @@
%endif
%bcond_with logback
Name: maven
Version: 3.8.3
Version: 3.8.4
Release: 0
Summary: Java project management and project comprehension tool
# maven itself is ASL 2.0
@ -44,6 +44,7 @@ Patch1: 0001-Adapt-mvn-script.patch
# Downstream-specific, avoids dependency on logback
# Used only when %%without logback is in effect
Patch2: 0002-Invoke-logback-via-reflection.patch
Patch3: qdox-2.0.1.patch
Patch4: 0004-Use-non-shaded-HTTP-wagon.patch
BuildRequires: ant
BuildRequires: apache-commons-cli
@ -199,6 +200,7 @@ BuildArch: noarch
%setup -q -n apache-%{name}-%{version} -a10
%patch1 -p1
%patch3 -p1
%patch4 -p1
# not really used during build, but a precaution

120
qdox-2.0.1.patch Normal file
View File

@ -0,0 +1,120 @@
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java 2022-01-13 07:08:06.182993103 +0100
@@ -157,7 +157,7 @@
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
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java 2022-01-13 07:10:30.471820999 +0100
@@ -198,7 +198,7 @@
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
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java 2022-01-13 07:10:02.863663262 +0100
@@ -200,7 +200,7 @@
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
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java 2022-01-13 07:11:56.088310105 +0100
@@ -94,8 +94,8 @@
* 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_ );
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java 2022-01-13 08:09:14.744957009 +0100
@@ -97,8 +97,8 @@
* 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_ );
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java 2022-01-13 07:36:03.136896661 +0100
@@ -90,8 +90,8 @@
* 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_ );
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java 2022-01-13 07:12:29.108498755 +0100
@@ -240,7 +240,7 @@
}
@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
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java 2022-01-13 07:07:32.302798450 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java 2022-01-13 07:12:55.192647787 +0100
@@ -96,8 +96,8 @@
* 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_ );
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java 2022-01-13 07:11:14.312071457 +0100
@@ -135,7 +135,7 @@
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
}
--- apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java 2022-01-13 07:07:32.298798428 +0100
+++ apache-maven-3.8.4/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java 2022-01-13 07:11:45.096247306 +0100
@@ -85,8 +85,8 @@
* 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_ );
}