From f3588cb7dd23f02a0283a2575a58b6ef22e67d61 Mon Sep 17 00:00:00 2001 From: Doychin Bondzhev Date: Wed, 2 Jan 2019 14:32:32 +0200 Subject: [PATCH 1/2] Incorrect artifact version in the test --- .../org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java index 346f889d6a2..3afed2b7b37 100644 --- a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java +++ b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java @@ -37,7 +37,7 @@ public class MoviesArquillianHtmlUnitTest { @Deployment public static EnterpriseArchive createDeployment() { - final EnterpriseArchive enterpriseArchive = Maven.resolver().resolve("org.superbiz:moviefun-ear:ear:7.0.6-SNAPSHOT") + final EnterpriseArchive enterpriseArchive = Maven.resolver().resolve("org.superbiz:moviefun-ear:ear:8.0.0-SNAPSHOT") .withoutTransitivity().asSingle(EnterpriseArchive.class); System.out.println(enterpriseArchive.toString(true)); From 9073514b1cf848ccbc0a26c4d11a3e32972ada84 Mon Sep 17 00:00:00 2001 From: Doychin Bondzhev Date: Thu, 3 Jan 2019 12:12:34 +0200 Subject: [PATCH 2/2] version now depends on the value of tomee.version property from maven. --- .../org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java | 5 ++++- .../src/test/resources/version.properties | 1 + examples/simple-ear/pom.xml | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 examples/simple-ear/moviefun-functional-tests/src/test/resources/version.properties diff --git a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java index 3afed2b7b37..a3a40da9ad9 100644 --- a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java +++ b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java @@ -28,6 +28,7 @@ import org.junit.runner.RunWith; import java.net.URL; +import java.util.ResourceBundle; import static org.junit.Assert.assertTrue; @@ -37,7 +38,9 @@ public class MoviesArquillianHtmlUnitTest { @Deployment public static EnterpriseArchive createDeployment() { - final EnterpriseArchive enterpriseArchive = Maven.resolver().resolve("org.superbiz:moviefun-ear:ear:8.0.0-SNAPSHOT") + ResourceBundle mavenVersion = ResourceBundle.getBundle("version"); + + final EnterpriseArchive enterpriseArchive = Maven.resolver().resolve("org.superbiz:moviefun-ear:ear:" + mavenVersion.getString("version")) .withoutTransitivity().asSingle(EnterpriseArchive.class); System.out.println(enterpriseArchive.toString(true)); diff --git a/examples/simple-ear/moviefun-functional-tests/src/test/resources/version.properties b/examples/simple-ear/moviefun-functional-tests/src/test/resources/version.properties new file mode 100644 index 00000000000..dc6127ee887 --- /dev/null +++ b/examples/simple-ear/moviefun-functional-tests/src/test/resources/version.properties @@ -0,0 +1 @@ +version=${tomee.version} \ No newline at end of file diff --git a/examples/simple-ear/pom.xml b/examples/simple-ear/pom.xml index b0228ae17f7..1a56085f071 100644 --- a/examples/simple-ear/pom.xml +++ b/examples/simple-ear/pom.xml @@ -48,6 +48,12 @@ install + + + src/test/resources + true + +