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 18:06:39 UTC
[maven-indexer] branch MINDEXER-126 updated (a2e258c -> ca36e1d)
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 a2e258c [MINDEXER-126] Remove guava dependency from indexer-core
add 8b105ea Bump spring to 5.3.2 in indexer-examples-spring
add 7916a55 Bump jetty from 6.1.19 to 6.1.26
new ca36e1d [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 (a2e258c)
\
N -- N -- N refs/heads/MINDEXER-126 (ca36e1d)
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 1 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:
indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java | 2 +-
.../main/java/org/apache/maven/index/context/TrackingLockFactory.java | 4 ++--
.../main/java/org/apache/maven/index/packer/IndexPackingRequest.java | 4 ++--
indexer-examples/indexer-examples-spring/pom.xml | 2 +-
pom.xml | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
[maven-indexer] 01/01: [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 ca36e1d0d20b743070ae4426e8bb0fe433803adb
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 | 8 ++++----
.../java/org/apache/maven/index/updater/IndexDataReader.java | 7 +++----
5 files changed, 16 insertions(+), 21 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..56c3891 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..a2a4d62 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
@@ -21,13 +21,15 @@ 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;
+
+import static java.util.Objects.requireNonNull;
/**
*
@@ -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..231054b 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
@@ -26,7 +26,7 @@ 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;
+import static java.util.Objects.requireNonNull;
/**
* 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 )