You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2017/03/17 21:08:27 UTC
tomee git commit: no need of these deps
Repository: tomee
Updated Branches:
refs/heads/master 938168f59 -> 06e48946c
no need of these deps
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/06e48946
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/06e48946
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/06e48946
Branch: refs/heads/master
Commit: 06e48946cb5e76c893f1ca35f6b6f14b2dd172f4
Parents: 938168f
Author: rmannibucau <rm...@apache.org>
Authored: Fri Mar 17 22:08:22 2017 +0100
Committer: rmannibucau <rm...@apache.org>
Committed: Fri Mar 17 22:08:22 2017 +0100
----------------------------------------------------------------------
.../moviefun/MoviesArquillianHtmlUnitTest.java | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/06e48946/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
----------------------------------------------------------------------
diff --git a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
index 32b31d5..06947ab 100644
--- a/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
+++ b/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
@@ -27,17 +27,13 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
import org.jboss.shrinkwrap.api.importer.ExplodedImporter;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.ejb.EJB;
-import java.io.File;
import java.net.URL;
-import java.util.Arrays;
-import java.util.Collection;
import static org.junit.Assert.assertTrue;
@@ -48,17 +44,9 @@ public class MoviesArquillianHtmlUnitTest {
@Deployment
public static WebArchive createDeployment() {
-
- Collection<String> dependencies = Arrays.asList("taglibs:standard", "commons-lang:commons-lang");
-
- File[] libs = Maven.resolver()
- .loadPomFromFile(Basedir.basedir("pom.xml")).resolve(dependencies)
- .withTransitivity().asFile();
-
WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(Movie.class, MoviesBean.class, MoviesArquillianHtmlUnitTest.class, ActionServlet.class)
- .addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml")
- .addAsLibraries(libs);
+ .addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml");
war.merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class)
.importDirectory(Basedir.basedir(WEBAPP_SRC)).as(GenericArchive.class),