This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 6d5e521ff9aa4a19ecb7bb9039d683dfa7a4f0db Author: Doychin Bondzhev <doyc...@dsoft-bg.com> AuthorDate: Thu Jan 3 12:12:34 2019 +0200 version now depends on the value of tomee.version property from maven. --- .../java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java | 5 ++++- .../moviefun-functional-tests/src/test/resources/version.properties | 1 + examples/simple-ear/pom.xml | 6 ++++++ 3 files changed, 11 insertions(+), 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 3afed2b..a3a40da 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.Test; 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 0000000..dc6127e --- /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 b0228ae..1a56085 100644 --- a/examples/simple-ear/pom.xml +++ b/examples/simple-ear/pom.xml @@ -48,6 +48,12 @@ </repositories> <build> <defaultGoal>install</defaultGoal> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> <pluginManagement> <plugins> <plugin>