You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/04/12 23:17:25 UTC
[maven-ejb-plugin] branch deos created (now a7ad6b1)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch deos
in repository https://gitbox.apache.org/repos/asf/maven-ejb-plugin.git.
at a7ad6b1 update dependencies
This branch includes the following new commits:
new 7f8b7da wip
new 523c4aa merge master
new a7ad6b1 update dependencies
The 3 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.
[maven-ejb-plugin] 02/03: merge master
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch deos
in repository https://gitbox.apache.org/repos/asf/maven-ejb-plugin.git
commit 523c4aa763f3b8079de243e4a04d86f25ce57ca2
Merge: 7f8b7da 31e122e
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 12 19:12:34 2020 -0400
merge master
.../java/org/apache/maven/plugins/ejb/EjbMojo.java | 39 ++++------------------
.../maven/plugins/ejb/IncludesExcludesTest.java | 7 ++--
2 files changed, 9 insertions(+), 37 deletions(-)
diff --cc src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
index 34adb29,34adb29..430de25
--- a/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
+++ b/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
@@@ -21,12 -21,12 +21,11 @@@ package org.apache.maven.plugins.ejb
import static org.assertj.core.api.Assertions.assertThat;
++import java.util.Arrays;
import java.util.Collections;
import org.junit.Test;
--import com.google.inject.internal.util.Lists;
--
public class IncludesExcludesTest
{
@@@ -64,7 -64,7 +63,7 @@@
public void nonNullForDefaultExcludesShouldResultInExcludesWithDefaultExcludes()
{
IncludesExcludes ie = new IncludesExcludes( null, null, Collections.<String>emptyList(),
-- Lists.newArrayList( "**/package.html" ) );
++ Arrays.asList( "**/package.html" ) );
assertThat( ie.resultingIncludes() ).isEqualTo( new String[0] );
assertThat( ie.resultingExcludes() ).isEqualTo( new String[] { "**/package.html" } );
@@@ -73,7 -73,7 +72,7 @@@
@Test
public void nonNullForDefaultIncludesShouldResultInIncludesWithDefaultIncludes()
{
-- IncludesExcludes ie = new IncludesExcludes( null, null, Lists.newArrayList( "**/package.html" ),
++ IncludesExcludes ie = new IncludesExcludes( null, null, Arrays.asList( "**/package.html" ),
Collections.<String>emptyList() );
assertThat( ie.resultingIncludes() ).isEqualTo( new String[] { "**/package.html" } );
[maven-ejb-plugin] 03/03: update dependencies
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch deos
in repository https://gitbox.apache.org/repos/asf/maven-ejb-plugin.git
commit a7ad6b18eb770fe78f16b8e0546d7e3f35b2d8cd
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 12 19:16:49 2020 -0400
update dependencies
---
pom.xml | 2 +-
src/test/java/org/apache/maven/plugins/ejb/EjbMojoTest.java | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3686043..e86d183 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.3.0</version>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/java/org/apache/maven/plugins/ejb/EjbMojoTest.java b/src/test/java/org/apache/maven/plugins/ejb/EjbMojoTest.java
index bf41f79..d77f0b2 100644
--- a/src/test/java/org/apache/maven/plugins/ejb/EjbMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/ejb/EjbMojoTest.java
@@ -36,7 +36,6 @@ import org.codehaus.plexus.util.FileUtils;
/**
* EJB plugin Test Case
*/
-
public class EjbMojoTest
extends AbstractMojoTestCase
{
@@ -44,12 +43,6 @@ public class EjbMojoTest
static final String DEFAULT_JAR_NAME = "testJar";
- public void setUp()
- throws Exception
- {
- super.setUp();
- }
-
/**
* check test environment
*
[maven-ejb-plugin] 01/03: wip
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch deos
in repository https://gitbox.apache.org/repos/asf/maven-ejb-plugin.git
commit 7f8b7daaf4da408e2d369ef1d2074b900500385f
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 12 12:53:53 2020 -0400
wip
---
pom.xml | 16 ++++++++--------
src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java | 9 ++++-----
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e02c80..3686043 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
<properties>
<mavenArchiverVersion>3.2.0</mavenArchiverVersion>
<mavenFilteringVersion>3.1.1</mavenFilteringVersion>
- <mavenVersion>3.0</mavenVersion>
+ <mavenVersion>3.1.1</mavenVersion>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
@@ -103,33 +103,33 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.1.0</version>
+ <version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>3.6.0</version>
+ <version>4.2.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.25</version>
+ <version>1.26</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>1.7.1</version>
+ <version>2.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -141,7 +141,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.3.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java b/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
index d9c7da8..a13eba7 100644
--- a/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugins.ejb;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -49,8 +50,6 @@ import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.ManifestException;
import org.codehaus.plexus.util.FileUtils;
-import com.google.inject.internal.util.Lists;
-
/**
* Build an EJB (and optional client) from the current project.
*
@@ -64,12 +63,12 @@ public class EjbMojo
extends AbstractMojo
{
private static final List<String> DEFAULT_INCLUDES_LIST =
- Collections.unmodifiableList( Lists.newArrayList( "**/**" ) );
+ Collections.unmodifiableList( new ArrayList<String>( "**/**" ) );
//@formatter:off
private static final List<String> DEFAULT_CLIENT_EXCLUDES_LIST =
Collections.unmodifiableList(
- Lists.newArrayList(
+ new ArrayList<String>(
"**/*Bean.class",
"**/*CMP.class",
"**/*Session.class",
@@ -373,7 +372,7 @@ public class EjbMojo
try
{
- List<String> defaultExcludes = Lists.newArrayList( ejbJar, "**/package.html" );
+ List<String> defaultExcludes = new ArrayList<>( ejbJar, "**/package.html" );
List<String> defaultIncludes = DEFAULT_INCLUDES_LIST;
IncludesExcludes ie =