Merge pull request #37 from xenit-eu/DEVEM-437

DEVEM-437 depend on initializr version 0.10.2
xenit-eu · Jul 15, 2021 · c0991b0 · c0991b0
2 parents 42eb624 + aae16fc
commit c0991b0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,5 +8,5 @@ allprojects {
 }
 
 ext {
-    springInitializrVersion = '0.8.0.RELEASE'
+    springInitializrVersion = '0.10.2'
 }
diff --git a/....xenit.eu/src/main/java/eu/xenit/alfred/initializr/start/build/SimpleBuildCustomizer.java b/....xenit.eu/src/main/java/eu/xenit/alfred/initializr/start/build/SimpleBuildCustomizer.java
@@ -18,9 +18,6 @@
 
 import eu.xenit.alfred.initializr.generator.buildsystem.Build;
 import io.spring.initializr.generator.project.ProjectDescription;
-import io.spring.initializr.web.support.DefaultInitializrMetadataUpdateStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.core.Ordered;
 
 /**

diff --git a/...xenit/alfred/initializr/start/project/alfresco/artifacts/InLogicArtifactSelectorImpl.java b/...xenit/alfred/initializr/start/project/alfresco/artifacts/InLogicArtifactSelectorImpl.java
@@ -18,9 +18,9 @@ public String getAlfrescoVersion() {
             return version.toString();
         }
         if (version.getPatch() == 0) {
-            return version.getMajor() + "." + version.getMinor() + "." + version.getQualifier().getQualifier();
+            return version.getMajor() + "." + version.getMinor() + "." + version.getQualifier().getId();
         }
-        return version.getMajor() + "." + version.getMinor() + "." + version.getPatch() + "-" + version.getQualifier().getQualifier();
+        return version.getMajor() + "." + version.getMinor() + "." + version.getPatch() + "-" + version.getQualifier().getId();
     }
 
     @Override
@@ -54,7 +54,7 @@ public String getAlfrescoDockerImage() {
     }
 
     private boolean isCommunity() {
-        return projectDescription.getPlatformVersion().getQualifier().getQualifier().matches("[a-g]*");
+        return projectDescription.getPlatformVersion().getQualifier().getId().matches("[a-g]*");
     }
 
     private boolean isSixOrAbove() {