fix: change glob pattern to match ant directory in 1808

SAP · Sep 24, 2018 · cf73d0c · cf73d0c
1 parent 9f18942
commit cf73d0c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'java-gradle-plugin'
 
 
 group = 'mpern.sap.commerce'
-version = '1.1.0'
+version = '1.1.1'
 
 repositories {
     jcenter()

diff --git a/src/main/java/mpern/sap/commerce/build/tasks/HybrisAntTask.java b/src/main/java/mpern/sap/commerce/build/tasks/HybrisAntTask.java
@@ -48,7 +48,7 @@ public void beforeExecute(Task task) {
 
         private ConfigurableFileTree buildPlatformAntClasspath(HybrisAntTask t) {
             ConfigurableFileTree files = t.getProject().fileTree("hybris/bin/platform");
-            files.include("apache-ant-*/lib/ant-launcher.jar");
+            files.include("apache-ant*/lib/ant-launcher.jar");
             return files;
         }
 

diff --git a/src/main/java/mpern/sap/commerce/build/util/HybrisPlatform.java b/src/main/java/mpern/sap/commerce/build/util/HybrisPlatform.java
@@ -79,7 +79,7 @@ private String getRelativeAntHomepath() {
             Files.walkFileTree(platformPath, visitor);
             Path antHome = visitor
                     .getAntHome()
-                    .orElseThrow(() -> new IllegalStateException("could not find hybris platform ant in hybris/bin/platform/apache-ant-*"));
+                    .orElseThrow(() -> new IllegalStateException("could not find hybris platform ant in hybris/bin/platform/apache-ant*"));
             return antHome.toString();
         } catch (IOException e) {
             throw new IllegalStateException("could not find hybris platform ant", e);
@@ -92,7 +92,7 @@ private static class AntPathVisitor extends SimpleFileVisitor<Path> {
 
         public AntPathVisitor() {
             this.foundPath = null;
-            antPathMatcher = FileSystems.getDefault().getPathMatcher("glob:**/apache-ant-*");
+            antPathMatcher = FileSystems.getDefault().getPathMatcher("glob:**/apache-ant*");
         }
 
         @Override