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/04/05 13:01:23 UTC
[maven-indexer] branch guava updated (953fd87 -> 708d51f)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch guava
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git.
discard 953fd87 Reomve Guava from tests
discard 3bdbc3a remove unused guava dependency
add 07bc974 (doc) checkstyle-plugin use latest Checkstyle 8.41.1
add 3d5bcc6 (doc) fix checkstyle issue
new c65dfd1 remove unused guava dependency
new 708d51f Reomve Guava from tests
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 (953fd87)
\
N -- N -- N refs/heads/guava (708d51f)
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 2 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:
.../main/java/org/apache/maven/index/artifact/M2GavCalculator.java | 4 ++--
.../apache/maven/indexer/examples/indexing/IndexerConfiguration.java | 4 +---
pom.xml | 5 +++++
3 files changed, 8 insertions(+), 5 deletions(-)
[maven-indexer] 01/02: remove unused guava dependency
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch guava
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
commit c65dfd1923c2f760f3edede1e3f24b066515c8a8
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sat Apr 11 19:51:16 2020 -0400
remove unused guava dependency
---
indexer-reader/pom.xml | 5 -----
pom.xml | 6 ------
2 files changed, 11 deletions(-)
diff --git a/indexer-reader/pom.xml b/indexer-reader/pom.xml
index 11f1f5b..e8b7024 100644
--- a/indexer-reader/pom.xml
+++ b/indexer-reader/pom.xml
@@ -43,11 +43,6 @@ under the License.
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 1b02b44..e461e1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,12 +134,6 @@ under the License.
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>20.0</version>
- </dependency>
-
- <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
[maven-indexer] 02/02: Reomve Guava from tests
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch guava
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
commit 708d51f4414ceb7e128e8de39eb508b23a208604
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Feb 3 01:42:12 2020 +0100
Reomve Guava from tests
---
.../apache/maven/index/reader/IndexReaderTest.java | 1 -
.../apache/maven/index/reader/IndexWriterTest.java | 1 -
.../java/org/apache/maven/index/reader/TestUtils.java | 19 ++++++++++---------
.../org/apache/maven/index/reader/TransformTest.java | 1 -
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
index cc5c2d2..e7f4917 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
@@ -33,7 +33,6 @@ import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import static com.google.common.collect.Iterables.transform;
import static org.apache.maven.index.reader.TestUtils.expandFunction;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.hamcrest.core.IsNot.not;
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexWriterTest.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexWriterTest.java
index 48aadb2..548022f 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexWriterTest.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexWriterTest.java
@@ -26,7 +26,6 @@ import java.util.Arrays;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import static com.google.common.collect.Iterables.transform;
import static org.apache.maven.index.reader.TestUtils.expandFunction;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/TestUtils.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/TestUtils.java
index 2e6912b..cc58d36 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/TestUtils.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/TestUtils.java
@@ -25,14 +25,13 @@ import java.util.Map;
import java.util.TreeSet;
import java.util.function.Function;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-import static com.google.common.collect.Iterables.concat;
-import static java.util.Collections.singletonList;
import static org.apache.maven.index.reader.Utils.*;
/**
- * Helpers to transform records from one to another representation, and, some helpers for publishing using Guava.
+ * Helpers to transform records from one to another representation, and, some helpers.
*/
public final class TestUtils
{
@@ -60,12 +59,14 @@ public final class TestUtils
{
final TreeSet<String> allGroupsSet = new TreeSet<>();
final TreeSet<String> rootGroupsSet = new TreeSet<>();
- return StreamSupport.stream(
- concat( singletonList( descriptor( repoId ) ), iterable, singletonList( allGroups( allGroupsSet ) ),
- // placeholder, will be recreated at the end with proper content
- singletonList( rootGroups( rootGroupsSet ) )
- // placeholder, will be recreated at the end with proper content
- ).spliterator(), false ).map( rec ->
+ return Stream.of(
+ Stream.of( descriptor( repoId ) ),
+ StreamSupport.stream( iterable.spliterator(), false ),
+ Stream.of( allGroups( allGroupsSet ) ),
+ // placeholder, will be recreated at the end with proper content
+ Stream.of( rootGroups( rootGroupsSet ) )
+ // placeholder, will be recreated at the end with proper content
+ ).flatMap( s -> s ).map( rec ->
{
if ( Type.DESCRIPTOR == rec.getType() )
{
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
index 1ea6155..f75e45b 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
@@ -31,7 +31,6 @@ import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import static com.google.common.collect.Iterables.transform;
import static org.apache.maven.index.reader.TestUtils.compactFunction;
import static org.apache.maven.index.reader.TestUtils.decorate;
import static org.hamcrest.CoreMatchers.nullValue;