From fc5572ae9139ded08099dc03610a176afbff3d23 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Sun, 20 May 2012 21:15:39 -0400 Subject: [PATCH] minor enhancements, fixes and dep upgrades - upgrade to JBoss AS 7.1.1.Final - update build.gradle to work with Arquillian 1.0.0.Final - fix jaxws project - add test for named query in jpa project - add fest library to autodiscover extension - don't includle version of dep in UI test war - fix spacing in pom files --- cdi/build.gradle | 13 +- .../failure/AmbiguousDependencyTestCase.java | 1 + ejb/pom.xml | 24 +- extensions/autodiscover/pom.xml | 7 +- .../autodiscover/client/ArchiveProcessor.java | 25 +- .../autodiscover/AutodiscoverCDITestCase.java | 6 +- .../src/test/resources/arquillian.xml | 2 +- .../src/test/resources/arquillian.xml | 2 +- .../src/test/resources/arquillian.xml | 2 +- .../src/test/resources/arquillian.xml | 2 +- extensions/pom.xml | 6 +- .../src/test/resources/arquillian.xml | 2 +- jaxrs/src/test/resources/arquillian.xml | 6 +- jaxws/pom.xml | 52 +- .../jaxws/EchoWebServiceEndpointTestCase.java | 19 +- jaxws/src/test/resources/arquillian.xml | 15 +- jpa/src/main/java/com/acme/jpa/Game.java | 3 + .../com/acme/jpa/GamePersistenceTestCase.java | 21 +- jpa/src/test/resources/arquillian.xml | 2 +- multinode/src/test/resources/arquillian.xml | 6 +- parent/pom.xml | 1084 ++++++++--------- pom.xml | 3 - servlet/src/test/resources/arquillian.xml | 2 +- ui/src/test/java/com/acme/ui/Deployments.java | 2 +- ui/src/test/resources/arquillian.xml | 2 +- 25 files changed, 708 insertions(+), 601 deletions(-) diff --git a/cdi/build.gradle b/cdi/build.gradle index a50c4ab..485c677 100644 --- a/cdi/build.gradle +++ b/cdi/build.gradle @@ -3,9 +3,9 @@ apply plugin: JavaPlugin buildDir = 'target/gradle-build' libraryVersions = [ - junit: '4.8.1', arquillian: '1.0.0.CR1', jbossJavaeeSpec: '1.0.0.Final', weld: '1.1.1.Final', - slf4j: '1.5.10', log4j: '1.2.14', jbossas: '6.0.0.Final', glassfish: '3.1', cdi: '1.0-SP4', - hamcrest: '1.2', jbossAS7: '7.0.0.CR1' + junit: '4.8.1', arquillian: '1.0.0.Final', jbossJavaeeSpec: '1.0.0.Final', weld: '1.1.1.Final', + slf4j: '1.5.10', log4j: '1.2.14', jbossAS6: '6.0.0.Final', glassfish: '3.1.2', cdi: '1.0-SP4', + hamcrest: '1.2', jbossAS7: '7.1.1.Final', shrinkwrapDesc: '2.0.0-alpha-2' ] repositories { @@ -32,8 +32,11 @@ dependencies { testCompile group: 'junit', name: 'junit', version: libraryVersions.junit testCompile group: 'org.hamcrest', name: 'hamcrest-core', version: libraryVersions.hamcrest testCompile group: 'org.jboss.arquillian.junit', name: 'arquillian-junit-container', version: libraryVersions.arquillian + testCompile group: 'org.jboss.shrinkwrap.descriptors', name: 'shrinkwrap-descriptors-api-javaee', version: libraryVersions.shrinkwrapDesc - weldEmbeddedTestRuntime group: 'org.jboss.arquillian.container', name: 'arquillian-weld-ee-embedded-1.1', version: libraryVersions.arquillian + testRuntime group: 'org.jboss.shrinkwrap.descriptors', name: 'shrinkwrap-descriptors-impl-javaee', version: libraryVersions.shrinkwrapDesc + + weldEmbeddedTestRuntime group: 'org.jboss.arquillian.container', name: 'arquillian-weld-ee-embedded-1.1', version: '1.0.0.CR3' weldEmbeddedTestRuntime group: 'org.jboss.spec', name: 'jboss-javaee-6.0', version: libraryVersions.jbossJavaeeSpec weldEmbeddedTestRuntime group: 'org.jboss.weld', name: 'weld-core', version: libraryVersions.weld weldEmbeddedTestRuntime group: 'org.slf4j', name: 'slf4j-log4j12', version: libraryVersions.slf4j @@ -41,7 +44,7 @@ dependencies { jbossAS6RemoteTestRuntime group: 'org.jboss.arquillian.container', name: 'arquillian-jbossas-remote-6', version: libraryVersions.arquillian jbossAS6RemoteTestRuntime group: 'org.jboss.spec', name: 'jboss-javaee-6.0', version: libraryVersions.jbossJavaeeSpec - jbossAS6RemoteTestRuntime group: 'org.jboss.jbossas', name: 'jboss-as-profileservice-client', version: libraryVersions.jbossas + jbossAS6RemoteTestRuntime group: 'org.jboss.jbossas', name: 'jboss-as-profileservice-client', version: libraryVersions.jbossAS6 jbossAS7ManagedTestRuntime group: 'org.jboss.as', name: 'jboss-as-arquillian-container-managed', version: libraryVersions.jbossAS7 jbossAS7ManagedTestRuntime group: 'org.jboss.spec', name: 'jboss-javaee-6.0', version: libraryVersions.jbossJavaeeSpec diff --git a/cdi/src/test/java/com/acme/cdi/failure/AmbiguousDependencyTestCase.java b/cdi/src/test/java/com/acme/cdi/failure/AmbiguousDependencyTestCase.java index d56e738..a2a96f6 100644 --- a/cdi/src/test/java/com/acme/cdi/failure/AmbiguousDependencyTestCase.java +++ b/cdi/src/test/java/com/acme/cdi/failure/AmbiguousDependencyTestCase.java @@ -21,5 +21,6 @@ public static JavaArchive createDeployment() { @Test public void shouldFailDeployment() { + // this method forces the deployment to be attempted } } diff --git a/ejb/pom.xml b/ejb/pom.xml index 269a7e7..7e73f14 100644 --- a/ejb/pom.xml +++ b/ejb/pom.xml @@ -15,19 +15,19 @@ Arquillian Showcase: EJB Examples that demonstrate how to test EJB components using Arquillian - - - apache-snapshots-repository - Apache Snapshots Repository - https://repository.apache.org/content/groups/snapshots - + + + apache-snapshots-repository + Apache Snapshots Repository + https://repository.apache.org/content/groups/snapshots + false - - - true - - - + + + true + + + diff --git a/extensions/autodiscover/pom.xml b/extensions/autodiscover/pom.xml index 531f32d..43b178d 100644 --- a/extensions/autodiscover/pom.xml +++ b/extensions/autodiscover/pom.xml @@ -39,7 +39,12 @@ 1.8.3 provided - + + org.easytesting + fest-assert + 1.4 + test + junit junit diff --git a/extensions/autodiscover/src/main/java/org/jboss/arquillian/showcase/extension/autodiscover/client/ArchiveProcessor.java b/extensions/autodiscover/src/main/java/org/jboss/arquillian/showcase/extension/autodiscover/client/ArchiveProcessor.java index cf6c303..432522f 100644 --- a/extensions/autodiscover/src/main/java/org/jboss/arquillian/showcase/extension/autodiscover/client/ArchiveProcessor.java +++ b/extensions/autodiscover/src/main/java/org/jboss/arquillian/showcase/extension/autodiscover/client/ArchiveProcessor.java @@ -36,20 +36,41 @@ public class ArchiveProcessor implements ApplicationArchiveProcessor { private static final String ANNOTATION_CLASS_NAME = "org.mockito.Mock"; private static final String MOCKITO_ARTIFACT = "org.mockito:mockito-all"; + + private static final String FEST_ASSERTIONS_CLASS_NAME = "org.fest.assertions.Assertions"; + private static final String FEST_ARTIFACT = "org.easytesting:fest-assert"; @Override public void process(Archive applicationArchive, TestClass testClass) { + if(ReflectionHelper.isClassPresent(FEST_ASSERTIONS_CLASS_NAME)) + { + appendFestLibrary(applicationArchive); + } + if(ReflectionHelper.isClassPresent(ANNOTATION_CLASS_NAME)) { if(ReflectionHelper.getFieldsWithAnnotation(testClass.getJavaClass(), Mock.class).size() > 0) { - appendLibrary(applicationArchive); + appendMockitoLibrary(applicationArchive); } } } + + private void appendFestLibrary(Archive applicationArchive) + { + if(applicationArchive instanceof LibraryContainer) + { + LibraryContainer container = (LibraryContainer) applicationArchive; + container.addAsLibraries( + DependencyResolvers.use(MavenDependencyResolver.class) + .loadMetadataFromPom("pom.xml") + .artifact(FEST_ARTIFACT) + .resolveAsFiles()); + } + } - private void appendLibrary(Archive applicationArchive) + private void appendMockitoLibrary(Archive applicationArchive) { if(applicationArchive instanceof LibraryContainer) { diff --git a/extensions/autodiscover/src/test/java/org/jboss/arquillian/showcase/extension/autodiscover/AutodiscoverCDITestCase.java b/extensions/autodiscover/src/test/java/org/jboss/arquillian/showcase/extension/autodiscover/AutodiscoverCDITestCase.java index 1709379..32f0002 100644 --- a/extensions/autodiscover/src/test/java/org/jboss/arquillian/showcase/extension/autodiscover/AutodiscoverCDITestCase.java +++ b/extensions/autodiscover/src/test/java/org/jboss/arquillian/showcase/extension/autodiscover/AutodiscoverCDITestCase.java @@ -17,6 +17,8 @@ */ package org.jboss.arquillian.showcase.extension.autodiscover; +import static org.fest.assertions.Assertions.assertThat; + import javax.enterprise.inject.Produces; import org.jboss.arquillian.container.test.api.Deployment; @@ -24,7 +26,6 @@ import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,7 +33,6 @@ import org.mockito.Mockito; /** - * * @author Aslak Knutsen * @version $Revision: $ */ @@ -56,6 +56,6 @@ public void setupMock() { @Test public void shouldBeAbleToMock(Manager manager) throws Exception { - Assert.assertEquals(100, manager.execute(100)); + assertThat(manager.execute(100)).isEqualTo(100); } } diff --git a/extensions/autodiscover/src/test/resources/arquillian.xml b/extensions/autodiscover/src/test/resources/arquillian.xml index 0bbb56d..05c07e7 100644 --- a/extensions/autodiscover/src/test/resources/arquillian.xml +++ b/extensions/autodiscover/src/test/resources/arquillian.xml @@ -7,7 +7,7 @@ - target/jboss-as-${jboss.version:7.1.0.Final} + target/jboss-as-${jboss.version:7.1.1.Final} diff --git a/extensions/declarative/src/test/resources/arquillian.xml b/extensions/declarative/src/test/resources/arquillian.xml index 0bbb56d..05c07e7 100644 --- a/extensions/declarative/src/test/resources/arquillian.xml +++ b/extensions/declarative/src/test/resources/arquillian.xml @@ -7,7 +7,7 @@ - target/jboss-as-${jboss.version:7.1.0.Final} + target/jboss-as-${jboss.version:7.1.1.Final} diff --git a/extensions/deploymentscenario/src/test/resources/arquillian.xml b/extensions/deploymentscenario/src/test/resources/arquillian.xml index 88b64be..ed37f3b 100644 --- a/extensions/deploymentscenario/src/test/resources/arquillian.xml +++ b/extensions/deploymentscenario/src/test/resources/arquillian.xml @@ -7,7 +7,7 @@ - target/jboss-as-${jboss.version:7.1.0.Final} + target/jboss-as-${jboss.version:7.1.1.Final} diff --git a/extensions/lifecycle/src/test/resources/arquillian.xml b/extensions/lifecycle/src/test/resources/arquillian.xml index 0bbb56d..05c07e7 100644 --- a/extensions/lifecycle/src/test/resources/arquillian.xml +++ b/extensions/lifecycle/src/test/resources/arquillian.xml @@ -7,7 +7,7 @@ - target/jboss-as-${jboss.version:7.1.0.Final} + target/jboss-as-${jboss.version:7.1.1.Final} diff --git a/extensions/pom.xml b/extensions/pom.xml index e6ae1c1..d88a6fc 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -19,12 +19,12 @@ declarative - autodiscover + autodiscover lifecycle - deploymentscenario + deploymentscenario systemproperties resteasy - weld-servlet + weld-servlet diff --git a/extensions/systemproperties/src/test/resources/arquillian.xml b/extensions/systemproperties/src/test/resources/arquillian.xml index d8e5e44..4cd450f 100644 --- a/extensions/systemproperties/src/test/resources/arquillian.xml +++ b/extensions/systemproperties/src/test/resources/arquillian.xml @@ -5,7 +5,7 @@ - target/jboss-as-${jboss.version:7.1.0.Final} + target/jboss-as-${jboss.version:7.1.1.Final} diff --git a/jaxrs/src/test/resources/arquillian.xml b/jaxrs/src/test/resources/arquillian.xml index 217c2a6..b51de2e 100644 --- a/jaxrs/src/test/resources/arquillian.xml +++ b/jaxrs/src/test/resources/arquillian.xml @@ -12,13 +12,13 @@ - target/jboss-as-${jboss.version:7.1.0.Final} + target/jboss-as-${jboss.version:7.1.1.Final} - 19999 + 10099 1190 8180 @@ -26,7 +26,7 @@ - 29999 + 10199 1290 8280 diff --git a/jaxws/pom.xml b/jaxws/pom.xml index b056498..37dc513 100644 --- a/jaxws/pom.xml +++ b/jaxws/pom.xml @@ -24,6 +24,13 @@ org.jboss.arquillian.junit arquillian-junit-container + test + + + + org.jboss.shrinkwrap.descriptors + shrinkwrap-descriptors-impl-javaee + test @@ -47,7 +54,7 @@ - + arq-jbossas-managed-7 true @@ -59,14 +66,51 @@ org.jboss.spec - jboss-javaee-web-6.0 + jboss-javaee-6.0 pom + + + + maven-surefire-plugin + + + ${version.jbossas_7} + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + process-test-classes + + unpack + + + + + org.jboss.as + jboss-as-dist + ${version.jbossas_7} + zip + false + ${project.build.directory} + + + + + + + + - + arq-jbossas-remote-7 @@ -75,7 +119,7 @@ org.jboss.spec - jboss-javaee-web-6.0 + jboss-javaee-6.0 pom diff --git a/jaxws/src/test/java/com/acme/jaxws/EchoWebServiceEndpointTestCase.java b/jaxws/src/test/java/com/acme/jaxws/EchoWebServiceEndpointTestCase.java index 958ccd5..8f22161 100644 --- a/jaxws/src/test/java/com/acme/jaxws/EchoWebServiceEndpointTestCase.java +++ b/jaxws/src/test/java/com/acme/jaxws/EchoWebServiceEndpointTestCase.java @@ -7,11 +7,12 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor; +import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -20,25 +21,29 @@ * Tests simple stateless web service endpoint invocation. * * @author Richard Opalka + * @author Dan Allen */ @RunWith(Arquillian.class) public class EchoWebServiceEndpointTestCase { - @Deployment + private static final String ECHO_SERVICE_NAME = "EchoService"; + + @Deployment(testable = false) public static WebArchive createDeployment() { WebAppDescriptor webXml = Descriptors.create(WebAppDescriptor.class); return ShrinkWrap.create(WebArchive.class, "jaxws-endpoint-test.war") .addPackage(EchoWebServiceEndpointBean.class.getPackage()) - .setWebXML(new StringAsset(webXml - .servlet("EchoService", EchoWebServiceEndpointBean.class.getName(), new String[] { "/EchoService" }) + .setWebXML(new StringAsset(webXml.createServlet() + .servletName(ECHO_SERVICE_NAME).servletClass(EchoWebServiceEndpointBean.class.getName()).up() + .createServletMapping().servletName(ECHO_SERVICE_NAME).urlPattern("/" + ECHO_SERVICE_NAME).up() .exportAsString())); } @Test - public void testSimpleStatelessWebServiceEndpoint() throws Exception { - final QName serviceName = new QName("com.acme.jaxws", "EchoService"); - final URL wsdlURL = new URL("http://localhost:8080/jaxws-endpoint-test/EchoService?wsdl"); + public void testSimpleStatelessWebServiceEndpoint(@ArquillianResource URL deploymentUrl) throws Exception { + final QName serviceName = new QName("com.acme.jaxws", ECHO_SERVICE_NAME); + final URL wsdlURL = new URL(deploymentUrl, ECHO_SERVICE_NAME + "?wsdl"); final Service service = Service.create(wsdlURL, serviceName); final EchoWebServiceEndpoint port = service.getPort(EchoWebServiceEndpoint.class); final String result = port.echo("hello"); diff --git a/jaxws/src/test/resources/arquillian.xml b/jaxws/src/test/resources/arquillian.xml index aef8c6d..914c480 100644 --- a/jaxws/src/test/resources/arquillian.xml +++ b/jaxws/src/test/resources/arquillian.xml @@ -3,7 +3,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> - + + + + + target/jboss-as-${jboss.version:7.1.1.Final} + + + diff --git a/jpa/src/main/java/com/acme/jpa/Game.java b/jpa/src/main/java/com/acme/jpa/Game.java index b2062f7..1a3d105 100644 --- a/jpa/src/main/java/com/acme/jpa/Game.java +++ b/jpa/src/main/java/com/acme/jpa/Game.java @@ -17,13 +17,16 @@ package com.acme.jpa; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.NamedQuery; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @Entity +@NamedQuery(name = "games", query = "select g from Game g order by g.id") public class Game implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jpa/src/test/java/com/acme/jpa/GamePersistenceTestCase.java b/jpa/src/test/java/com/acme/jpa/GamePersistenceTestCase.java index 2eb81aa..4f7c911 100644 --- a/jpa/src/test/java/com/acme/jpa/GamePersistenceTestCase.java +++ b/jpa/src/test/java/com/acme/jpa/GamePersistenceTestCase.java @@ -75,17 +75,32 @@ public void commitTransaction() throws Exception { } @Test - public void shouldFindAllGamesUsingJpqlQuery() throws Exception { + public void shouldFindAllGamesUsingExplicitJpqlQuery() throws Exception { // given String fetchingAllGamesInJpql = "select g from Game g order by g.id"; // when - System.out.println("Selecting (using JPQL)..."); + System.out.println("Selecting (using explicit JPQL)..."); List games = em.createQuery(fetchingAllGamesInJpql, Game.class) .getResultList(); // then - System.out.println("Found " + games.size() + " games (using JPQL)"); + System.out.println("Found " + games.size() + " games (using explicit JPQL)"); + assertContainsAllGames(games); + } + + @Test + public void shouldFindAllGamesUsingNamedJpqlQuery() throws Exception { + // given + String gamesNamedQuery = "games"; + + // when + System.out.println("Selecting (using named JPQL)..."); + List games = em.createNamedQuery(gamesNamedQuery, Game.class) + .getResultList(); + + // then + System.out.println("Found " + games.size() + " games (using named JPQL)"); assertContainsAllGames(games); } diff --git a/jpa/src/test/resources/arquillian.xml b/jpa/src/test/resources/arquillian.xml index 640f2ce..03a6ec0 100644 --- a/jpa/src/test/resources/arquillian.xml +++ b/jpa/src/test/resources/arquillian.xml @@ -14,7 +14,7 @@ - target/jboss-as-${jboss.version:7.1.0.Final} + target/jboss-as-${jboss.version:7.1.1.Final} diff --git a/multinode/src/test/resources/arquillian.xml b/multinode/src/test/resources/arquillian.xml index ed8d25a..36fb5b7 100644 --- a/multinode/src/test/resources/arquillian.xml +++ b/multinode/src/test/resources/arquillian.xml @@ -8,21 +8,21 @@ - target/node1/jboss-as-${jboss.version:7.1.0.Final} + target/node1/jboss-as-${jboss.version:7.1.1.Final} -Djboss.socket.binding.port-offset=10000 -Xmx512m -XX:MaxPermSize=128m 19999 - target/node2/jboss-as-${jboss.version:7.1.0.Final} + target/node2/jboss-as-${jboss.version:7.1.1.Final} -Djboss.socket.binding.port-offset=20000 -Xmx512m -XX:MaxPermSize=128m 29999 - target/node3/jboss-as-${jboss.version:7.1.0.Final} + target/node3/jboss-as-${jboss.version:7.1.1.Final} -Djboss.socket.binding.port-offset=30000 -Xmx512m -XX:MaxPermSize=128m 39999 diff --git a/parent/pom.xml b/parent/pom.xml index 2b67b1f..f8aa1a9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,554 +1,554 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - 4.0.0 + 4.0.0 - org.jboss.arquillian.showcase - arquillian-showcase-parent - 1.0.0-SNAPSHOT - pom - Arquillian Showcase Parent - http://jboss.org/arquillian - Parent build for the Arquillian showcase + org.jboss.arquillian.showcase + arquillian-showcase-parent + 1.0.0-SNAPSHOT + pom + Arquillian Showcase Parent + http://jboss.org/arquillian + Parent build for the Arquillian showcase - - UTF-8 - 1.0.0.Final - 1.0.0.CR2 - 1.0.0.CR2 - 1.0.0.CR2 - 1.0.0.CR2 - 1.0.0.CR2 - 1.0.0.CR1 - 1.0.0.CR4 - 1.0.0.CR2-SNAPSHOT - 1.0.0-beta-3-SNAPSHOT - 1.0.0-SNAPSHOT - 1.0.0.CR3 - 1.0.0.CR2 - 3.1 - 1.2 - 1.1.1.Final - 2.0.0.Final - 6.0.0.Final - 7.1.0.Final - 1.0.3.GA - 1.6 - 8.0.0.M3 - 2.0.0-SNAPSHOT - 4.8.1 - 1.2.14 - 3.1.4 - 4.0.0 - 1.1.1 - 4.0.20 - 2.0.1.GA - 1.5.10 - 5.14.6 - 6.0.29 - 1.1.1.Final - 1.1.Final - + + UTF-8 + 1.0.0.Final + 1.0.0.CR2 + 1.0.0.CR2 + 1.0.0.CR2 + 1.0.0.CR2 + 1.0.0.CR2 + 1.0.0.CR1 + 1.0.0.CR4 + 1.0.0.CR2-SNAPSHOT + 1.0.0-beta-3-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0.CR3 + 1.0.0.CR2 + 3.1 + 1.2 + 1.1.1.Final + 2.0.0.Final + 6.0.0.Final + 7.1.1.Final + 1.0.3.GA + 1.6 + 8.0.0.M3 + 2.0.0-SNAPSHOT + 4.8.1 + 1.2.14 + 3.1.4 + 4.0.0 + 1.1.1 + 4.0.20 + 2.0.1.GA + 1.5.10 + 5.14.6 + 6.0.29 + 1.1.1.Final + 1.1.Final + - - - jboss-public-repository - JBoss Repository - http://repository.jboss.org/nexus/content/groups/public - - never - - - - true - - - + + + jboss-public-repository + JBoss Repository + http://repository.jboss.org/nexus/content/groups/public + + never + + + + true + + + - - - jboss-public-repository - JBoss Repository - http://repository.jboss.org/nexus/content/groups/public - - never - - - false - - - + + + jboss-public-repository + JBoss Repository + http://repository.jboss.org/nexus/content/groups/public + + never + + + false + + + - - - - ${project.groupId} - container-bom-weld-se-embedded-1.1 - ${project.version} - pom - - - ${project.groupId} - container-bom-weld-ee-embedded-1.1 - ${project.version} - pom - - - ${project.groupId} - container-bom-openwebbeans-embedded-1 - ${project.version} - pom - - - ${project.groupId} - container-bom-openejb-embedded-3.1 - ${project.version} - pom - - - ${project.groupId} - container-bom-openejb-embedded-4 - ${project.version} - pom - - - ${project.groupId} - container-bom-jbossas-remote-6 - ${project.version} - pom - - - ${project.groupId} - container-bom-jbossas-managed-6 - ${project.version} - pom - - - ${project.groupId} - container-bom-glassfish-embedded-3.1 - ${project.version} - pom - - - ${project.groupId} - container-bom-glassfish-remote-3.1 - ${project.version} - pom - - - ${project.groupId} - container-bom-tomcat-embedded-6 - ${project.version} - pom - - - ${project.groupId} - container-bom-jetty-embedded-7 - ${project.version} - pom - - - ${project.groupId} - container-bom-resin-embedded-4 - ${project.version} - pom - - - org.jboss.spec - jboss-javaee-6.0 - ${version.jboss_javaee6_spec} - pom - provided - - - org.apache.xalan - xalan - - - - - org.jboss.spec - jboss-javaee-web-6.0 - ${version.jboss_javaee6_spec} - pom - provided - - - org.apache.xalan - xalan - - - - - org.hibernate - hibernate-jpamodelgen - ${version.hibernate_jpamodelgen} - provided - - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - - - - - org.jboss.arquillian - arquillian-bom - ${version.arquillian_core} - pom - import - - - org.jboss.arquillian.extension - arquillian-drone-bom - ${version.arquillian_drone} - pom - import - - - org.jboss.arquillian.ajocado - arquillian-ajocado-junit - ${version.arquillian_ajocado} - pom - test - - - org.jboss.arquillian.container - arquillian-weld-se-embedded-1.1 - ${version.arquillian_container_weld} - test - - - org.jboss.arquillian.container - arquillian-weld-ee-embedded-1.1 - ${version.arquillian_container_weld} - test - - - org.jboss.arquillian.container - arquillian-openejb-embedded-3.1 - ${version.arquillian_container_openejb} - test - - - org.apache.openejb - arquillian-openejb-container - ${version.arquillian_container_openejb_tomee} - test - - - org.jboss.arquillian.container - arquillian-openwebbeans-embedded-1 - ${version.arquillian_container_openwebbeans} - test - - - org.jboss.arquillian.container - arquillian-osgi-embedded-4.2 - ${version.arquillian_container_osgi} - test - - - org.jboss.arquillian.container - arquillian-jbossas-remote-5.1 - ${version.arquillian_container_jbossas} - test - - - org.jboss.arquillian.container - arquillian-jbossas-remote-6 - ${version.arquillian_container_jbossas} - test - - - org.jboss.arquillian.container - arquillian-jbossas-embedded-6 - ${version.arquillian_container_jbossas} - test - - - org.jboss.arquillian.container - arquillian-jbossas-managed-6 - ${version.arquillian_container_jbossas} - test - - - org.jboss.as - jboss-as-arquillian-container-remote - ${version.jbossas_7} - test - - - org.jboss.as - jboss-as-arquillian-container-managed - ${version.jbossas_7} - test - - - org.jboss.arquillian.container - arquillian-glassfish-remote-3.1 - ${version.arquillian_container_glassfish} - test - - - org.jboss.arquillian.container - arquillian-glassfish-embedded-3.1 - ${version.arquillian_container_glassfish} - test - - - org.jboss.arquillian.container - arquillian-tomcat-embedded-6 - ${version.arquillian_container_tomcat} - test - - - org.jboss.arquillian.container - arquillian-jetty-embedded-7 - ${version.arquillian_container_jetty} - test - - - org.jboss.arquillian.container - arquillian-resin-embedded-4 - ${version.arquillian_container_resin} - test - - - org.jboss.jsfunit - jsfunit-arquillian - ${version.jsfunit} - test - - - org.jboss.jbossas - jboss-as-depchain - ${version.jbossas_6} - pom - - - org.jboss.jbossas - jboss-as-profileservice-client - ${version.jbossas_6} - pom - test - - - org.jboss.jbossas - jboss-server-manager - ${version.jbossas_server_manager} - test - - - org.jboss.jbossas - jboss-as-distribution - ${version.jbossas_6} - zip - - - org.eclipse.jetty - jetty-webapp - ${version.jetty} - test - - - org.eclipse.jetty - jetty-plus - ${version.jetty} - test - - - com.caucho - resin - ${version.resin} - test - - - com.caucho - resin-javaee16 - ${version.resin} - provided - - - org.apache.tomcat - catalina - ${version.tomcat} - test - - - org.apache.tomcat - coyote - ${version.tomcat} - test - - - org.apache.tomcat - jasper - ${version.tomcat} - test - - - org.apache.openejb - openejb-core - ${version.openejb} - provided - - - org.glassfish.extras - glassfish-embedded-all - ${version.glassfish} - provided - - - com.sun.jersey - jersey-bundle - ${version.jersey} - test - - - com.sun.jersey.contribs - jersey-multipart - ${version.jersey} - test - - - org.jboss.resteasy - resteasy-jaxrs - ${version.resteasy} - test - - - org.slf4j - slf4j-simple - ${version.slf4j} - test - - - org.slf4j - slf4j-log4j12 - ${version.slf4j} - test - - - org.slf4j - slf4j-jdk14 - ${version.slf4j} - test - - - log4j - log4j - ${version.log4j} - test - - - org.hamcrest - hamcrest-core - 1.2 - test - - - junit - junit - ${version.junit} - test - - - org.testng - testng - ${version.testng} - test - - - org.jboss.weld - weld-api - ${version.weld_api} - test - - - org.jboss.weld - weld-core - ${version.weld_core} - test - - - + + + + ${project.groupId} + container-bom-weld-se-embedded-1.1 + ${project.version} + pom + + + ${project.groupId} + container-bom-weld-ee-embedded-1.1 + ${project.version} + pom + + + ${project.groupId} + container-bom-openwebbeans-embedded-1 + ${project.version} + pom + + + ${project.groupId} + container-bom-openejb-embedded-3.1 + ${project.version} + pom + + + ${project.groupId} + container-bom-openejb-embedded-4 + ${project.version} + pom + + + ${project.groupId} + container-bom-jbossas-remote-6 + ${project.version} + pom + + + ${project.groupId} + container-bom-jbossas-managed-6 + ${project.version} + pom + + + ${project.groupId} + container-bom-glassfish-embedded-3.1 + ${project.version} + pom + + + ${project.groupId} + container-bom-glassfish-remote-3.1 + ${project.version} + pom + + + ${project.groupId} + container-bom-tomcat-embedded-6 + ${project.version} + pom + + + ${project.groupId} + container-bom-jetty-embedded-7 + ${project.version} + pom + + + ${project.groupId} + container-bom-resin-embedded-4 + ${project.version} + pom + + + org.jboss.spec + jboss-javaee-6.0 + ${version.jboss_javaee6_spec} + pom + provided + + + org.apache.xalan + xalan + + + + + org.jboss.spec + jboss-javaee-web-6.0 + ${version.jboss_javaee6_spec} + pom + provided + + + org.apache.xalan + xalan + + + + + org.hibernate + hibernate-jpamodelgen + ${version.hibernate_jpamodelgen} + provided + + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + + + + + org.jboss.arquillian + arquillian-bom + ${version.arquillian_core} + pom + import + + + org.jboss.arquillian.extension + arquillian-drone-bom + ${version.arquillian_drone} + pom + import + + + org.jboss.arquillian.ajocado + arquillian-ajocado-junit + ${version.arquillian_ajocado} + pom + test + + + org.jboss.arquillian.container + arquillian-weld-se-embedded-1.1 + ${version.arquillian_container_weld} + test + + + org.jboss.arquillian.container + arquillian-weld-ee-embedded-1.1 + ${version.arquillian_container_weld} + test + + + org.jboss.arquillian.container + arquillian-openejb-embedded-3.1 + ${version.arquillian_container_openejb} + test + + + org.apache.openejb + arquillian-openejb-container + ${version.arquillian_container_openejb_tomee} + test + + + org.jboss.arquillian.container + arquillian-openwebbeans-embedded-1 + ${version.arquillian_container_openwebbeans} + test + + + org.jboss.arquillian.container + arquillian-osgi-embedded-4.2 + ${version.arquillian_container_osgi} + test + + + org.jboss.arquillian.container + arquillian-jbossas-remote-5.1 + ${version.arquillian_container_jbossas} + test + + + org.jboss.arquillian.container + arquillian-jbossas-remote-6 + ${version.arquillian_container_jbossas} + test + + + org.jboss.arquillian.container + arquillian-jbossas-embedded-6 + ${version.arquillian_container_jbossas} + test + + + org.jboss.arquillian.container + arquillian-jbossas-managed-6 + ${version.arquillian_container_jbossas} + test + + + org.jboss.as + jboss-as-arquillian-container-remote + ${version.jbossas_7} + test + + + org.jboss.as + jboss-as-arquillian-container-managed + ${version.jbossas_7} + test + + + org.jboss.arquillian.container + arquillian-glassfish-remote-3.1 + ${version.arquillian_container_glassfish} + test + + + org.jboss.arquillian.container + arquillian-glassfish-embedded-3.1 + ${version.arquillian_container_glassfish} + test + + + org.jboss.arquillian.container + arquillian-tomcat-embedded-6 + ${version.arquillian_container_tomcat} + test + + + org.jboss.arquillian.container + arquillian-jetty-embedded-7 + ${version.arquillian_container_jetty} + test + + + org.jboss.arquillian.container + arquillian-resin-embedded-4 + ${version.arquillian_container_resin} + test + + + org.jboss.jsfunit + jsfunit-arquillian + ${version.jsfunit} + test + + + org.jboss.jbossas + jboss-as-depchain + ${version.jbossas_6} + pom + + + org.jboss.jbossas + jboss-as-profileservice-client + ${version.jbossas_6} + pom + test + + + org.jboss.jbossas + jboss-server-manager + ${version.jbossas_server_manager} + test + + + org.jboss.jbossas + jboss-as-distribution + ${version.jbossas_6} + zip + + + org.eclipse.jetty + jetty-webapp + ${version.jetty} + test + + + org.eclipse.jetty + jetty-plus + ${version.jetty} + test + + + com.caucho + resin + ${version.resin} + test + + + com.caucho + resin-javaee16 + ${version.resin} + provided + + + org.apache.tomcat + catalina + ${version.tomcat} + test + + + org.apache.tomcat + coyote + ${version.tomcat} + test + + + org.apache.tomcat + jasper + ${version.tomcat} + test + + + org.apache.openejb + openejb-core + ${version.openejb} + provided + + + org.glassfish.extras + glassfish-embedded-all + ${version.glassfish} + provided + + + com.sun.jersey + jersey-bundle + ${version.jersey} + test + + + com.sun.jersey.contribs + jersey-multipart + ${version.jersey} + test + + + org.jboss.resteasy + resteasy-jaxrs + ${version.resteasy} + test + + + org.slf4j + slf4j-simple + ${version.slf4j} + test + + + org.slf4j + slf4j-log4j12 + ${version.slf4j} + test + + + org.slf4j + slf4j-jdk14 + ${version.slf4j} + test + + + log4j + log4j + ${version.log4j} + test + + + org.hamcrest + hamcrest-core + 1.2 + test + + + junit + junit + ${version.junit} + test + + + org.testng + testng + ${version.testng} + test + + + org.jboss.weld + weld-api + ${version.weld_api} + test + + + org.jboss.weld + weld-core + ${version.weld_core} + test + + + - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12 - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - false - - - - org.apache.maven.plugins - maven-resources-plugin - 2.5 - - - maven-compiler-plugin - 2.3.1 - true - - 1.6 - 1.6 - false - true - true - 1.6 - true - -Xmx512M - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.1 - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [2.1,) - - unpack - copy-dependencies - - - - - - - - - - - - - + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12 + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.8 + + false + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + + maven-compiler-plugin + 2.3.1 + true + + 1.6 + 1.6 + false + true + true + 1.6 + true + -Xmx512M + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.1 + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [2.1,) + + unpack + copy-dependencies + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index c2ed0fb..c9f6a04 100644 --- a/pom.xml +++ b/pom.xml @@ -29,15 +29,12 @@ --> servlet jaxrs - ui multinode - extensions diff --git a/servlet/src/test/resources/arquillian.xml b/servlet/src/test/resources/arquillian.xml index 1607dab..7192648 100644 --- a/servlet/src/test/resources/arquillian.xml +++ b/servlet/src/test/resources/arquillian.xml @@ -5,7 +5,7 @@ - target/jboss-as-${jboss.version:7.1.0.Final} + target/jboss-as-${jboss.version:7.1.1.Final} diff --git a/ui/src/test/java/com/acme/ui/Deployments.java b/ui/src/test/java/com/acme/ui/Deployments.java index 75e61e1..ef31bca 100644 --- a/ui/src/test/java/com/acme/ui/Deployments.java +++ b/ui/src/test/java/com/acme/ui/Deployments.java @@ -53,7 +53,7 @@ public static WebArchive createLoginScreenDeployment() { .addAsWebResource(new File(WEBAPP_SRC, "template.xhtml")) .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsWebInfResource(new File(WEBAPP_SRC, "WEB-INF/faces-config.xml")) - .addAsLibraries(resolver.artifact("org.jboss.seam.solder:seam-solder:3.0.0.Final").resolveAsFiles()) + .addAsLibraries(resolver.artifact("org.jboss.seam.solder:seam-solder").resolveAsFiles()) .setWebXML(new File(WEBAPP_SRC, "WEB-INF/web.xml")); } } diff --git a/ui/src/test/resources/arquillian.xml b/ui/src/test/resources/arquillian.xml index c41923a..34722ad 100644 --- a/ui/src/test/resources/arquillian.xml +++ b/ui/src/test/resources/arquillian.xml @@ -7,7 +7,7 @@ - target/jboss-as-${jboss.version:7.1.0.Final} + target/jboss-as-${jboss.version:7.1.1.Final}