tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlmonte...@apache.org
Subject tomee git commit: Revert "prepare for 7.1.0 release - theses are not handled by maven release plugin"
Date Fri, 03 Aug 2018 20:03:32 GMT
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 <jeanouii@gmail.com>
Authored: Fri Aug 3 22:02:13 2018 +0200
Committer: Jean-Louis Monteiro <jeanouii@gmail.com>
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 @@
                <property name="httpPort">9080</property>
                <property name="stopPort">9005</property>
                <property name="tomcatVersion"></property>
-               <property name="openejbVersion">7.1.0</property>
+               <property name="openejbVersion">${tomee.version}</property>
                <property name="dir">target/apache-tomee-remote</property>
                <property name="appWorkingDir">target/arquillian-test-working-dir</property>
            </configuration>

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 @@
     </target>
 
     <target name="openejb.start">
-        <echo message="Starting OpenEJB 7.1.0..."/>
+        <echo message="Starting OpenEJB ${tomee.version}..."/>
         <exec executable="${openejb.home}/bin/openejb.bat" spawn="true" osfamily="windows">
             <env key="OPENEJB_HOME" value="${openejb.home}"/>
             <arg value="start"/>
@@ -141,7 +141,7 @@
     </target>
 
     <target name="openejb.stop">
-        <echo message="Stopping OpenEJB 7.1.0..."/>
+        <echo message="Stopping OpenEJB ${tomee.version}..."/>
         <exec executable="${openejb.home}/bin/openejb.bat" osfamily="windows">
             <env key="OPENEJB_HOME" value="${openejb.home}"/>
             <arg value="stop"/>
@@ -283,16 +283,16 @@
     </target>
 
     <target name="openejb.test.setup">
-        <property name="openejb.app.url" value="${maven.repo}/org/apache/openejb/openejb-standalone/7.1.0/openejb-standalone-7.1.0.zip"/>
-        <property name="openejb.app.file" value="${repo}/openejb/distributions/7.1.0/openejb.zip"/>
+        <property name="openejb.app.url" value="${maven.repo}/org/apache/openejb/openejb-standalone/${tomee.version}/openejb-standalone-${tomee.version}.zip"/>
+        <property name="openejb.app.file" value="${repo}/openejb/distributions/${tomee.version}/openejb.zip"/>
 
-        <property name="itests.app.url" value="${maven.repo}/org/apache/openejb/openejb-itests-app/7.1.0/openejb-itests-app-7.1.0.jar"/>
-        <property name="itests.app.file" value="${repo}/openejb/distributions/7.1.0/openejb-itests-app.jar"/>
+        <property name="itests.app.url" value="${maven.repo}/org/apache/openejb/openejb-itests-app/${tomee.version}/openejb-itests-app-${tomee.version}.jar"/>
+        <property name="itests.app.file" value="${repo}/openejb/distributions/${tomee.version}/openejb-itests-app.jar"/>
 
-        <property name="itests.client.url" value="${maven.repo}/org/apache/openejb/openejb-itests-standalone-client/7.1.0/openejb-itests-standalone-client-7.1.0.jar"/>
-        <property name="itests.client.file" value="${repo}/openejb/distributions/7.1.0/openejb-itests-standalone-client.jar"/>
+        <property name="itests.client.url" value="${maven.repo}/org/apache/openejb/openejb-itests-standalone-client/${tomee.version}/openejb-itests-standalone-client-${tomee.version}.jar"/>
+        <property name="itests.client.file" value="${repo}/openejb/distributions/${tomee.version}/openejb-itests-standalone-client.jar"/>
 
-        <property name="openejb.home" value="${target.dir}/openejb-7.1.0"/>
+        <property name="openejb.home" value="${target.dir}/openejb-${tomee.version}"/>
 
         <antcall target="download.file">
             <param name="download.url" value="${openejb.app.url}"/>
@@ -309,14 +309,14 @@
     </target>
 
     <target name="tomcat.test.setup">
-        <property name="openejb.war.url" value="${maven.repo}/org/apache/openejb/openejb-tomcat-webapp/7.1.0/openejb-tomcat-webapp-7.1.0.war"/>
-        <property name="openejb.war.file" value="${repo}/openejb/distributions/7.1.0/openejb.war"/>
+        <property name="openejb.war.url" value="${maven.repo}/org/apache/openejb/openejb-tomcat-webapp/${tomee.version}/openejb-tomcat-webapp-${tomee.version}.war"/>
+        <property name="openejb.war.file" value="${repo}/openejb/distributions/${tomee.version}/openejb.war"/>
 
-        <property name="itests.war.url" value="${maven.repo}/org/apache/openejb/openejb-itests-web/7.1.0/openejb-itests-web-7.1.0.war"/>
-        <property name="itests.war.file" value="${repo}/openejb/distributions/7.1.0/itests.war"/>
+        <property name="itests.war.url" value="${maven.repo}/org/apache/openejb/openejb-itests-web/${tomee.version}/openejb-itests-web-${tomee.version}.war"/>
+        <property name="itests.war.file" value="${repo}/openejb/distributions/${tomee.version}/itests.war"/>
 
-        <property name="itests.client.url" value="${maven.repo}/org/apache/openejb/openejb-itests-standalone-client/7.1.0/openejb-itests-standalone-client-7.1.0.jar"/>
-        <property name="itests.client.file" value="${repo}/openejb/distributions/7.1.0/openejb-itests-standalone-client.jar"/>
+        <property name="itests.client.url" value="${maven.repo}/org/apache/openejb/openejb-itests-standalone-client/${tomee.version}/openejb-itests-standalone-client-${tomee.version}.jar"/>
+        <property name="itests.client.file" value="${repo}/openejb/distributions/${tomee.version}/openejb-itests-standalone-client.jar"/>
 
         <condition property="tomcat.url" value="http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip">
             <matches pattern="^7\." string="${tomcat.version}"/>

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 @@
     <configuration>
       <property name="httpPort">-1</property>
       <property name="stopPort">-1</property>
-      <property name="version">7.1.0</property>
+      <property name="version">${tomee.version}</property>
       <property name="classifier">plus</property>
-      <property name="openejbVersion">7.1.0</property>
+      <property name="openejbVersion">${tomee.version}</property>
       <property name="dir">target/apache-tomee-remote</property>
       <property name="appWorkingDir">target/arquillian-test-working-dir</property>
     </configuration>

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 @@
     <configuration>
       <property name="httpPort">-1</property>
       <property name="stopPort">-1</property>
-      <property name="version">7.1.0</property>
+      <property name="version">${tomee.version}</property>
       <property name="classifier">plus</property>
-      <property name="openejbVersion">7.1.0</property>
+      <property name="openejbVersion">${tomee.version}</property>
       <property name="dir">target/apache-tomee-remote</property>
       <property name="appWorkingDir">target/arquillian-test-working-dir</property>
     </configuration>

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 @@
       <property name="httpPort">-1</property>
       <property name="stopPort">-1</property>
       <property name="tomcatVersion"></property>
-      <property name="openejbVersion">7.1.0</property>
+      <property name="openejbVersion">${tomee.version}</property>
       <property name="dir">target/apache-tomee-remote</property>
       <property name="appWorkingDir">target/arquillian-test-working-dir</property>
     </configuration>

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 @@
       <property name="httpPort">-1</property>
       <property name="stopPort">-1</property>
       <property name="tomcatVersion"></property>
-      <property name="openejbVersion">7.1.0</property>
+      <property name="openejbVersion">${tomee.version}</property>
       <property name="dir">target/apache-tomee-remote</property>
       <property name="appWorkingDir">target/arquillian-test-working-dir</property>
     </configuration>

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 @@
         <property name="httpPort">-1</property>
         <property name="stopPort">-1</property>
         <property name="ajpPort">-1</property>
-        <property name="version">7.1.0</property>
+        <property name="version">${tomee.version}</property>
         <property name="dir">target/apache-tomee-remote-1</property>
         <property name="appWorkingDir">target/arquillian-test-working-dir-1</property>
       </configuration>
@@ -33,7 +33,7 @@
         <property name="httpPort">-1</property>
         <property name="stopPort">-1</property>
         <property name="ajpPort">-1</property>
-        <property name="version">7.1.0</property>
+        <property name="version">${tomee.version}</property>
         <property name="dir">target/apache-tomee-remote-2</property>
         <property name="appWorkingDir">target/arquillian-test-working-dir-2</property>
       </configuration>

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 @@
       <property name="httpPort">-1</property>
       <property name="stopPort">-1</property>
       <property name="ajpPort">-1</property>
-      <property name="version">7.1.0</property>
+      <property name="version">${tomee.version}</property>
       <property name="dir">target/apache-tomee-remote</property>
       <property name="appWorkingDir">target/arquillian-test-working-dir</property>
       <property name="properties" />

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 @@
 
   <properties>
 
-    <tomee.version>7.1.0</tomee.version>
+    <tomee.version>${project.version}</tomee.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
 


Mime
View raw message