You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/07/04 00:10:08 UTC
svn commit: r1607754 - in /tomee/tomee/trunk/maven/tomee-maven-plugin/src:
main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
Author: rmannibucau
Date: Thu Jul 3 22:10:08 2014
New Revision: 1607754
URL: http://svn.apache.org/r1607754
Log:
ensuring tomee version guess algorithm is fine
Modified:
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1607754&r1=1607753&r2=1607754&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Thu Jul 3 22:10:08 2014
@@ -304,7 +304,7 @@ public abstract class AbstractTomEEMojo
if ("-1".equals(tomeeVersion)) {
final String version = OpenEjbVersion.get().getVersion();
- tomeeVersion = "1" + version.substring(1, version.length());
+ tomeeVersion = (Integer.parseInt(Character.toString(version.charAt(0))) - 3) + version.substring(1, version.length());
}
if (!tomeeAlreadyInstalled) {
@@ -361,7 +361,7 @@ public abstract class AbstractTomEEMojo
if (8005 == tomeeShutdownPort) { // default admin port
tomeeShutdownPort = 4200;
}
- if (tomeeVersion.startsWith("1.")) {
+ if (tomeeVersion.startsWith("2.")) {
tomeeVersion = OpenEjbVersion.get().getVersion();
}
Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java?rev=1607754&r1=1607753&r2=1607754&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java Thu Jul 3 22:10:08 2014
@@ -169,7 +169,7 @@ public class TomEEMavenPluginRule implem
// our well known web profile ;)
tomEEMojo.tomeeGroupId = "org.apache.openejb";
tomEEMojo.tomeeArtifactId = "apache-tomee";
- tomEEMojo.tomeeVersion = "1" + OpenEjbVersion.get().getVersion().substring(1);
+ tomEEMojo.tomeeVersion = "-1";
tomEEMojo.tomeeClassifier = "webprofile";
tomEEMojo.tomeeType = "zip";