You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/02/13 17:13:59 UTC
[maven-indexer] branch MINDEXER-126 updated (612e54f -> a2e258c)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MINDEXER-126
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git.
discard 612e54f [MINDEXER-126] Remove guava dependency from indexer-core
discard c3199df Bump junit from 4.13 to 4.13.1
add dd9407f Bump junit from 4.13 to 4.13.1
add 5a00976 [MINDEXER-116] Move code to Java 7 syntax
add a3c3935 [MINDEXER-116] Require Java 8 at runtime
add 7200e02 [MINDEXER-116] Java 8 sugar + fix IDE warnings
add 311742f Bump slf4j to 1.7.30
add cdde412 Bump maven-shade-plugin from 3.2.3 to 3.2.4
add b2c0b01 Bump sisu-plexus from 0.3.3 to 0.3.4
add b7bd4b3 (doc) not yet ready for Java 16
new ea1d6b2 Bump jcl-over-slf4j to 1.7.30
new 609a69f Bump maven-checkstyle-plugin to 3.1.1
new d2fb0e8 Bump jmock from 2.5.1 to 2.12.0
new 6daff05 Bump animal-sniffer-maven-plugin from 1.16 to 1.20
new a2e258c [MINDEXER-126] Remove guava dependency from indexer-core
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (612e54f)
\
N -- N -- N refs/heads/MINDEXER-126 (a2e258c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 2 +-
.../apache/maven/index/cli/NexusIndexerCli.java | 4 +-
.../maven/index/cli/PartialImplementation.java | 6 +-
.../apache/maven/index/cli/NexusIndexerCliIT.java | 19 +-
.../maven/index/cli/NexusIndexerCliTest.java | 3 +-
.../java/org/apache/maven/index/ArtifactInfo.java | 13 +-
.../org/apache/maven/index/ArtifactInfoGroup.java | 2 +-
.../index/DefaultArtifactContextProducer.java | 19 +-
.../org/apache/maven/index/DefaultIndexer.java | 20 +-
.../apache/maven/index/DefaultIndexerEngine.java | 2 +-
.../maven/index/DefaultIteratorResultSet.java | 14 +-
.../apache/maven/index/DefaultNexusIndexer.java | 5 +-
.../apache/maven/index/DefaultQueryCreator.java | 2 +-
.../org/apache/maven/index/DefaultScanner.java | 2 +-
.../apache/maven/index/DefaultScannerListener.java | 8 +-
.../apache/maven/index/DefaultSearchEngine.java | 25 +--
.../org/apache/maven/index/FlatSearchRequest.java | 2 +-
.../apache/maven/index/GroupedSearchRequest.java | 2 +-
.../apache/maven/index/IndexerFieldVersion.java | 2 +-
.../apache/maven/index/IteratorSearchRequest.java | 2 +-
.../apache/maven/index/IteratorSearchResponse.java | 2 +-
.../org/apache/maven/index/MatchHighlightMode.java | 2 +-
.../java/org/apache/maven/index/QueryCreator.java | 2 +-
.../index/UniqueArtifactFilterPostprocessor.java | 4 +-
.../index/UniqueGAArtifactFilterPostprocessor.java | 2 +-
.../archetype/AbstractArchetypeDataSource.java | 2 +-
.../artifact/DefaultArtifactPackagingMapper.java | 15 +-
.../java/org/apache/maven/index/artifact/Gav.java | 210 +++------------------
.../maven/index/artifact/M1ArtifactRecognizer.java | 2 +-
.../maven/index/artifact/M1GavCalculator.java | 8 +-
.../maven/index/artifact/M2ArtifactRecognizer.java | 2 +-
.../maven/index/artifact/M2GavCalculator.java | 33 +---
.../index/context/DefaultIndexingContext.java | 21 +--
.../maven/index/context/MergedIndexingContext.java | 8 +-
.../maven/index/context/NexusIndexMultiReader.java | 6 +-
.../index/context/StaticContextMemberProvider.java | 2 +-
.../maven/index/context/TrackingLockFactory.java | 10 +-
.../maven/index/creator/AbstractIndexCreator.java | 2 +-
.../index/creator/JarFileContentsIndexCreator.java | 4 +-
.../MavenPluginArtifactInfoIndexCreator.java | 2 +-
.../creator/MinimalArtifactInfoIndexCreator.java | 13 +-
.../index/creator/OsgiArtifactIndexCreator.java | 11 +-
.../incremental/DefaultIncrementalHandler.java | 28 +--
.../maven/index/packer/DefaultIndexPacker.java | 16 +-
.../apache/maven/index/packer/DigesterUtils.java | 32 +---
.../maven/index/packer/IndexPackingRequest.java | 6 +-
.../maven/index/treeview/DefaultIndexTreeView.java | 60 +++---
.../org/apache/maven/index/treeview/TreeNode.java | 2 +-
.../maven/index/treeview/TreeViewRequest.java | 2 +-
.../maven/index/updater/DefaultIndexUpdater.java | 12 +-
.../maven/index/updater/FSDirectoryFactory.java | 9 +-
.../maven/index/updater/IndexDataReader.java | 13 +-
.../maven/index/updater/IndexDataWriter.java | 8 +-
.../apache/maven/index/updater/WagonHelper.java | 20 +-
.../maven/index/util/IndexCreatorSorter.java | 2 +-
.../maven/index/AbstractIndexCreatorHelper.java | 6 +-
.../maven/index/AbstractNexusIndexerTest.java | 3 -
.../maven/index/AbstractRepoNexusIndexerTest.java | 8 +-
.../org/apache/maven/index/ConcurrentUseTest.java | 3 +-
.../index/ConcurrentUseWithMergedContextTest.java | 1 -
.../maven/index/DefaultIndexNexusIndexerTest.java | 2 +-
.../maven/index/DefaultSearchEngineTest.java | 16 +-
.../apache/maven/index/DuplicateSearchTest.java | 4 +-
.../maven/index/Mindexer35NexusIndexerTest.java | 4 +-
.../maven/index/Nexus1179NexusIndexerTest.java | 2 +-
.../maven/index/Nexus13NexusIndexerTest.java | 9 +-
.../maven/index/Nexus1911IncrementalTest.java | 21 +--
.../maven/index/Nexus2046NexusIndexerTest.java | 2 +-
.../index/Nexus3293TimestampSnapshotTest.java | 2 +-
.../maven/index/Nexus3881NexusIndexerTest.java | 4 +-
.../maven/index/Nexus645NexusIndexerTest.java | 2 +-
.../maven/index/Nexus687NexusIndexerTest.java | 2 +-
.../org/apache/maven/index/NexusIndexerTest.java | 27 ++-
.../maven/index/SearchWithAnEmptyIndexTest.java | 4 +-
.../maven/index/UniqueArtifactFilterTest.java | 2 +-
.../maven/index/artifact/M1GavCalculatorTest.java | 2 +-
.../maven/index/artifact/M2GavCalculatorTest.java | 4 +-
.../maven/index/context/NexusAnalyzerTest.java | 2 +-
.../MavenPluginArtifactInfoIndexCreatorTest.java | 2 +-
.../creator/OsgiArtifactIndexCreatorTest.java | 2 +-
.../updater/DefaultIndexUpdaterEmbeddingIT.java | 2 +-
.../index/updater/DefaultIndexUpdaterTest.java | 3 +-
.../updater/DownloadRemoteIndexerManagerTest.java | 11 +-
.../index/updater/FullBootProofOfConcept.java | 20 +-
.../apache/maven/index/updater/IndexDataTest.java | 2 +-
.../maven/index/updater/LocalIndexCacheTest.java | 3 +-
.../maven/index/updater/TrackingFetcher.java | 2 +-
.../index/updater/fixtures/ServerTestFixture.java | 19 +-
.../maven/indexer/examples/BasicUsageExample.java | 23 +--
.../examples/indexing/IndexerConfiguration.java | 2 +-
.../org/apache/maven/index/reader/ChunkReader.java | 6 +-
.../org/apache/maven/index/reader/ChunkWriter.java | 4 +-
.../org/apache/maven/index/reader/IndexReader.java | 8 +-
.../org/apache/maven/index/reader/IndexWriter.java | 9 +-
.../java/org/apache/maven/index/reader/Record.java | 91 +++++----
.../apache/maven/index/reader/RecordCompactor.java | 32 ++--
.../apache/maven/index/reader/RecordExpander.java | 10 +-
.../java/org/apache/maven/index/reader/Utils.java | 6 +-
.../maven/index/reader/CachingResourceHandler.java | 19 +-
.../index/reader/DirectoryResourceHandler.java | 4 +-
.../apache/maven/index/reader/IndexReaderTest.java | 118 ++++++------
.../apache/maven/index/reader/IndexWriterTest.java | 12 +-
.../org/apache/maven/index/reader/TestSupport.java | 10 +-
.../org/apache/maven/index/reader/TestUtils.java | 90 ++++-----
.../apache/maven/index/reader/TransformTest.java | 25 +--
pom.xml | 21 ++-
106 files changed, 488 insertions(+), 927 deletions(-)
[maven-indexer] 02/05: Bump maven-checkstyle-plugin to 3.1.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MINDEXER-126
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
commit 609a69fe218d1d56c06107e60832423afb7b6b6d
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Feb 13 18:08:06 2021 +0100
Bump maven-checkstyle-plugin to 3.1.1
---
indexer-core/src/main/java/org/apache/maven/index/QueryCreator.java | 2 +-
.../java/org/apache/maven/index/context/DefaultIndexingContext.java | 4 ++--
pom.xml | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/indexer-core/src/main/java/org/apache/maven/index/QueryCreator.java b/indexer-core/src/main/java/org/apache/maven/index/QueryCreator.java
index bb1613d..1ed1b6d 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/QueryCreator.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/QueryCreator.java
@@ -40,7 +40,7 @@ public interface QueryCreator
* @param type
* @return
*/
- IndexerField selectIndexerField( final Field field, final SearchType type );
+ IndexerField selectIndexerField( Field field, SearchType type );
/**
* Constructs query by parsing the query string, using field as default field. This method should be use to
diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
index e118800..8e58206 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
@@ -918,8 +918,8 @@ public class DefaultIndexingContext
// Not locked
return;
}
- try ( final FileChannel fc =
- FileChannel.open( lockPath, StandardOpenOption.CREATE, StandardOpenOption.WRITE ) )
+ try ( FileChannel fc = FileChannel.open( lockPath, StandardOpenOption.CREATE,
+ StandardOpenOption.WRITE ) )
{
final FileLock lck = fc.tryLock();
if ( lck == null )
diff --git a/pom.xml b/pom.xml
index 6aabdd7..ef81b35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -395,11 +395,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>3.1.1</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-resources</artifactId>
- <version>2</version>
+ <version>3</version>
</dependency>
</dependencies>
</plugin>
[maven-indexer] 03/05: Bump jmock from 2.5.1 to 2.12.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MINDEXER-126
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
commit d2fb0e8f6e2d41ea2772bc3f08d219e3b2cee6fa
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Feb 13 18:11:00 2021 +0100
Bump jmock from 2.5.1 to 2.12.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ef81b35..b4b3f7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -284,7 +284,7 @@ under the License.
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
- <version>2.5.1</version>
+ <version>2.12.0</version>
<scope>test</scope>
</dependency>
[maven-indexer] 01/05: Bump jcl-over-slf4j to 1.7.30
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MINDEXER-126
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
commit ea1d6b286e606dfcd125830bffa7f3157acbe0f2
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Feb 13 18:03:55 2021 +0100
Bump jcl-over-slf4j to 1.7.30
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f482f3c..6aabdd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@ under the License.
as it would otherwise use commons-logging and do it's own other thing. -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.25</version>
+ <version>1.7.30</version>
<optional>true</optional>
</dependency>
[maven-indexer] 05/05: [MINDEXER-126] Remove guava dependency from
indexer-core
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MINDEXER-126
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
commit a2e258ca47a5d911b54ff35538085e4a78522bc4
Author: Alexander Kurtakov <ak...@redhat.com>
AuthorDate: Fri Jan 22 23:51:52 2021 +0200
[MINDEXER-126] Remove guava dependency from indexer-core
It suffers from multiple CVEs:
* guava < 24.1.1 is vulnerable to CVE-2018-10237.
* guava < 30.0 is vulnerable to CVE-2020-8908.
Moving to guava 30.1 will require moving to Java 8 so it's actually
simpler to just remove the dependency altogether.
Signed-off-by: Alexander Kurtakov <ak...@redhat.com>
---
indexer-core/pom.xml | 5 -----
.../src/main/java/org/apache/maven/index/ArtifactInfo.java | 5 ++---
.../org/apache/maven/index/context/TrackingLockFactory.java | 12 +++++++-----
.../org/apache/maven/index/packer/IndexPackingRequest.java | 10 +++++-----
.../java/org/apache/maven/index/updater/IndexDataReader.java | 7 +++----
5 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index d6f6fdc..c36de84 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -40,11 +40,6 @@ under the License.
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
<!-- DI -->
<dependency>
<groupId>javax.inject</groupId>
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java b/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
index c74e150..aa0f09f 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
@@ -37,8 +37,6 @@ import org.eclipse.aether.version.InvalidVersionSpecificationException;
import org.eclipse.aether.version.Version;
import org.eclipse.aether.version.VersionScheme;
-import com.google.common.base.Strings;
-
/**
* ArtifactInfo holds the values known about an repository artifact. This is a simple Value Object kind of stuff.
* Phasing out.
@@ -426,7 +424,8 @@ public class ArtifactInfo
public String toString()
{
final StringBuilder result = new StringBuilder( getUinfo() );
- if ( !Strings.isNullOrEmpty( getPackaging() ) )
+ String packaging = getPackaging();
+ if (packaging != null && !getPackaging().isEmpty())
{
result.append( "[" ).append( getPackaging() ).append( "]" );
}
diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/TrackingLockFactory.java b/indexer-core/src/main/java/org/apache/maven/index/context/TrackingLockFactory.java
index 9bc6a02..fc85f9c 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/context/TrackingLockFactory.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/context/TrackingLockFactory.java
@@ -1,5 +1,7 @@
package org.apache.maven.index.context;
+import static java.util.Objects.requireNonNull;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,13 +23,13 @@ package org.apache.maven.index.context;
import java.io.IOException;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.Lock;
import org.apache.lucene.store.LockFactory;
-import static com.google.common.base.Preconditions.checkNotNull;
-import java.util.HashSet;
/**
*
@@ -43,7 +45,7 @@ final class TrackingLockFactory
TrackingLockFactory( final LockFactory delegate )
{
- this.delegate = checkNotNull( delegate );
+ this.delegate = requireNonNull( delegate );
this.emittedLocks = Collections.newSetFromMap( new ConcurrentHashMap<TrackingLock, Boolean>() );
}
@@ -78,8 +80,8 @@ final class TrackingLockFactory
TrackingLock( final Lock delegate, final String name )
{
- this.delegate = checkNotNull( delegate );
- this.name = checkNotNull( name );
+ this.delegate = requireNonNull( delegate );
+ this.name = requireNonNull( name );
}
String getName()
diff --git a/indexer-core/src/main/java/org/apache/maven/index/packer/IndexPackingRequest.java b/indexer-core/src/main/java/org/apache/maven/index/packer/IndexPackingRequest.java
index effc344..7ed80bf 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/packer/IndexPackingRequest.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/packer/IndexPackingRequest.java
@@ -1,5 +1,7 @@
package org.apache.maven.index.packer;
+import static java.util.Objects.requireNonNull;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -26,8 +28,6 @@ import java.util.Collection;
import org.apache.lucene.index.IndexReader;
import org.apache.maven.index.context.IndexingContext;
-import static com.google.common.base.Preconditions.checkNotNull;
-
/**
* An index packing request.
*/
@@ -53,11 +53,11 @@ public class IndexPackingRequest
public IndexPackingRequest( final IndexingContext context, final IndexReader indexReader, final File targetDir )
{
- this.context = checkNotNull( context );
+ this.context = requireNonNull( context );
- this.indexReader = checkNotNull( indexReader );
+ this.indexReader = requireNonNull( indexReader );
- this.targetDir = checkNotNull( targetDir );
+ this.targetDir = requireNonNull( targetDir );
this.createIncrementalChunks = true;
diff --git a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java
index bddb378..84e77c6 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java
@@ -27,11 +27,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.UTFDataFormatException;
import java.util.Date;
-import java.util.zip.GZIPInputStream;
-
-import com.google.common.base.Strings;
import java.util.LinkedHashSet;
import java.util.Set;
+import java.util.zip.GZIPInputStream;
+
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
@@ -159,7 +158,7 @@ public class IndexDataReader
// Fix up UINFO field wrt MINDEXER-41
final Field uinfoField = (Field) doc.getField( ArtifactInfo.UINFO );
final String info = doc.get( ArtifactInfo.INFO );
- if ( uinfoField != null && !Strings.isNullOrEmpty( info ) )
+ if ( uinfoField != null && info != null && !info.isEmpty() )
{
final String[] splitInfo = ArtifactInfo.FS_PATTERN.split( info );
if ( splitInfo.length > 6 )
[maven-indexer] 04/05: Bump animal-sniffer-maven-plugin from 1.16
to 1.20
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MINDEXER-126
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
commit 6daff054986696ffeb913836612d94324568eda7
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Feb 13 18:12:21 2021 +0100
Bump animal-sniffer-maven-plugin from 1.16 to 1.20
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b4b3f7b..aeb901e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -390,7 +390,7 @@ under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.16</version>
+ <version>1.20</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>