importing changes from 1.2.0.Final to master

forge · Jan 22, 2013 · c860725 · c860725
1 parent 7e99cf2
commit c860725
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/org/jboss/forge/tomee/TomEEFacet.java b/src/main/java/org/jboss/forge/tomee/TomEEFacet.java
@@ -51,7 +51,7 @@ public boolean install() {
             httpPortConfig.setText(httpPort);
             config.addConfigurationElement(httpPortConfig);
         }
-        if (isMoreThan(dependency, 1, 5, 2)) {
+        if (isMoreThan(dependency.getVersion(), 1, 5, 1)) {
             final ConfigurationElementImpl simpleLog = new ConfigurationElementImpl();
             simpleLog.setName("simpleLog");
             simpleLog.setText("true");
@@ -78,9 +78,9 @@ private static DependencyBuilder dependency() {
         return DependencyBuilder.create().setGroupId(GID).setArtifactId(AID);
     }
 
-    private static boolean isMoreThan(final Dependency version, final int major, final int minor, final int patch) {
+    private static boolean isMoreThan(final String version, final int major, final int minor, final int patch) {
         final Pattern pat = Pattern.compile("([0-9]*).([0-9]*).([0-9]*)(\\-SNAPSHOT)*");
-        final Matcher matcher = pat.matcher(version.getVersion());
+        final Matcher matcher = pat.matcher(version);
         return matcher.matches()
                 && (Integer.parseInt(matcher.group(1)) > major
                 || (Integer.parseInt(matcher.group(1)) == major && Integer.parseInt(matcher.group(2)) > minor)