From commits-return-42741-archive-asf-public=cust-asf.ponee.io@tomee.apache.org Fri Aug 3 22:03:33 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 2C330180674 for ; Fri, 3 Aug 2018 22:03:33 +0200 (CEST) Received: (qmail 43652 invoked by uid 500); 3 Aug 2018 20:03:32 -0000 Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tomee.apache.org Delivered-To: mailing list commits@tomee.apache.org Received: (qmail 43643 invoked by uid 99); 3 Aug 2018 20:03:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Aug 2018 20:03:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 190C4DFB34; Fri, 3 Aug 2018 20:03:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jlmonteiro@apache.org To: commits@tomee.apache.org Message-Id: <3d5bf55fff53404880f40011ccd7b6e6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tomee git commit: Revert "prepare for 7.1.0 release - theses are not handled by maven release plugin" Date: Fri, 3 Aug 2018 20:03:32 +0000 (UTC) Repository: tomee Updated Branches: refs/heads/tomee-7.1.x e3e3d58b4 -> 9e2dcf9ae Revert "prepare for 7.1.0 release - theses are not handled by maven release plugin" This reverts commit e3e3d58b4a891cf66f96b5ab9ea30cfe85b67d96. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9e2dcf9a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9e2dcf9a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9e2dcf9a Branch: refs/heads/tomee-7.1.x Commit: 9e2dcf9ae0497e2af2cd035b4f7808bce10d9271 Parents: e3e3d58 Author: Jean-Louis Monteiro Authored: Fri Aug 3 22:02:13 2018 +0200 Committer: Jean-Louis Monteiro Committed: Fri Aug 3 22:02:13 2018 +0200 ---------------------------------------------------------------------- .../src/test/resources/arquillian.xml | 2 +- assembly/test/build.xml | 30 ++++++++++---------- .../src/test/resources/arquillian.xml | 4 +-- .../src/test/resources/arquillian.xml | 4 +-- .../src/test/resources/arquillian.xml | 2 +- .../moviefun/src/test/resources/arquillian.xml | 2 +- .../src/test/resources/arquillian.xml | 4 +-- examples/resources-jmx-example/README.md | 2 +- .../src/test/resources/arquillian.xml | 2 +- pom.xml | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/9e2dcf9a/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml index 247989b..31635f4 100644 --- a/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml +++ b/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml @@ -25,7 +25,7 @@ 9080 9005 - 7.1.0 + ${tomee.version} target/apache-tomee-remote target/arquillian-test-working-dir http://git-wip-us.apache.org/repos/asf/tomee/blob/9e2dcf9a/assembly/test/build.xml ---------------------------------------------------------------------- diff --git a/assembly/test/build.xml b/assembly/test/build.xml index 8b2377a..1fe97b2 100644 --- a/assembly/test/build.xml +++ b/assembly/test/build.xml @@ -120,7 +120,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -283,16 +283,16 @@ - - + + - - + + - - + + - + @@ -309,14 +309,14 @@ - - + + - - + + - - + + http://git-wip-us.apache.org/repos/asf/tomee/blob/9e2dcf9a/examples/connector-ear/connector-sample-functional-tests/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/examples/connector-ear/connector-sample-functional-tests/src/test/resources/arquillian.xml b/examples/connector-ear/connector-sample-functional-tests/src/test/resources/arquillian.xml index 0ae799a..fbad7fb 100644 --- a/examples/connector-ear/connector-sample-functional-tests/src/test/resources/arquillian.xml +++ b/examples/connector-ear/connector-sample-functional-tests/src/test/resources/arquillian.xml @@ -24,9 +24,9 @@ -1 -1 - 7.1.0 + ${tomee.version} plus - 7.1.0 + ${tomee.version} target/apache-tomee-remote target/arquillian-test-working-dir http://git-wip-us.apache.org/repos/asf/tomee/blob/9e2dcf9a/examples/connector-war/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/examples/connector-war/src/test/resources/arquillian.xml b/examples/connector-war/src/test/resources/arquillian.xml index 99826c8..4ec117e 100644 --- a/examples/connector-war/src/test/resources/arquillian.xml +++ b/examples/connector-war/src/test/resources/arquillian.xml @@ -24,9 +24,9 @@ -1 -1 - 7.1.0 + ${tomee.version} plus - 7.1.0 + ${tomee.version} target/apache-tomee-remote target/arquillian-test-working-dir http://git-wip-us.apache.org/repos/asf/tomee/blob/9e2dcf9a/examples/moviefun-rest/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/examples/moviefun-rest/src/test/resources/arquillian.xml b/examples/moviefun-rest/src/test/resources/arquillian.xml index 53cd2fa..4a2f32f 100644 --- a/examples/moviefun-rest/src/test/resources/arquillian.xml +++ b/examples/moviefun-rest/src/test/resources/arquillian.xml @@ -25,7 +25,7 @@ -1 -1 - 7.1.0 + ${tomee.version} target/apache-tomee-remote target/arquillian-test-working-dir http://git-wip-us.apache.org/repos/asf/tomee/blob/9e2dcf9a/examples/moviefun/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/examples/moviefun/src/test/resources/arquillian.xml b/examples/moviefun/src/test/resources/arquillian.xml index 53cd2fa..4a2f32f 100644 --- a/examples/moviefun/src/test/resources/arquillian.xml +++ b/examples/moviefun/src/test/resources/arquillian.xml @@ -25,7 +25,7 @@ -1 -1 - 7.1.0 + ${tomee.version} target/apache-tomee-remote target/arquillian-test-working-dir http://git-wip-us.apache.org/repos/asf/tomee/blob/9e2dcf9a/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml b/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml index 2216c45..c6e0273 100644 --- a/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml +++ b/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml @@ -23,7 +23,7 @@ -1 -1 -1 - 7.1.0 + ${tomee.version} target/apache-tomee-remote-1 target/arquillian-test-working-dir-1 @@ -33,7 +33,7 @@ -1 -1 -1 - 7.1.0 + ${tomee.version} target/apache-tomee-remote-2 target/arquillian-test-working-dir-2 http://git-wip-us.apache.org/repos/asf/tomee/blob/9e2dcf9a/examples/resources-jmx-example/README.md ---------------------------------------------------------------------- diff --git a/examples/resources-jmx-example/README.md b/examples/resources-jmx-example/README.md index 01fc1a2..05a38ca 100644 --- a/examples/resources-jmx-example/README.md +++ b/examples/resources-jmx-example/README.md @@ -368,7 +368,7 @@ When run you should see output similar to the following. Running org.superbiz.resource.jmx.JMXTest Apr 15, 2015 12:40:09 PM org.jboss.arquillian.container.impl.MapObject populate WARNING: Configuration contain properties not supported by the backing object org.apache.tomee.arquillian.remote.RemoteTomEEConfiguration - Unused property entries: {openejbVersion=7.1.0, tomcatVersion=} + Unused property entries: {openejbVersion=${tomee.version}, tomcatVersion=} Supported property names: [additionalLibs, httpPort, httpsPort, stopCommand, portRange, conf, debug, exportConfAsSystemProperty, type, unpackWars, version, serverXml, preloadClasses, dir, deployerProperties, stopPort, singleDumpByArchiveName, appWorkingDir, host, cleanOnStartUp, quickSession, ajpPort, artifactId, properties, singleDeploymentByArchiveName, groupId, stopHost, lib, catalina_opts, debugPort, webContextToUseWithEars, simpleLog, removeUnusedWebapps, keepServerXmlAsThis, classifier, bin] Apr 15, 2015 12:40:09 PM org.apache.openejb.arquillian.common.Setup findHome INFO: Unable to find home in: /Users/jgallimore/tmp/tomee-1.7.x/examples/resources-jmx-example/resources-jmx-ejb/target/apache-tomee-remote http://git-wip-us.apache.org/repos/asf/tomee/blob/9e2dcf9a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/src/test/resources/arquillian.xml b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/src/test/resources/arquillian.xml index 318199f..3795244 100644 --- a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/src/test/resources/arquillian.xml +++ b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/src/test/resources/arquillian.xml @@ -37,7 +37,7 @@ -1 -1 -1 - 7.1.0 + ${tomee.version} target/apache-tomee-remote target/arquillian-test-working-dir http://git-wip-us.apache.org/repos/asf/tomee/blob/9e2dcf9a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6292b5b..88395c3 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ - 7.1.0 + ${project.version} 1.8 1.8