Merge remote-tracking branch 'upstream/master' into snyk-fix-402ba91d…

…fe0cf51fcc934f73a9a29545
windup · Oct 10, 2022 · d6b9704 · d6b9704
2 parents 7382168 + 6acffc6
commit d6b9704
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 6 deletions.
diff --git a/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/RunWindupCommand.java b/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/RunWindupCommand.java
@@ -166,12 +166,14 @@ private void runWindup(List<String> arguments) {
 
         // Target - interactive
         Collection<String> targets = (Collection<String>) optionValues.get(TargetOption.NAME);
-        if (targets != null && targets.contains("eap")) {
-            System.err.println("ERROR: " + "Version must be specified for target 'eap' (for example, 'eap7' or 'eap6')");
+        if (targets != null && targets.contains("eap"))
+        {
+            System.err.println("ERROR: " + "Version must be specified for target 'eap' (for example, 'eap7' or 'eap8')");
             return;
         }
 
-        if ((targets == null || targets.isEmpty()) && !batchMode.get()) {
+        if ((targets == null || targets.isEmpty()) && !batchMode.get())
+        {
             String target = Bootstrap.promptForListItem("Please select a target:", ruleProviderRegistryCache.getAvailableTargetTechnologies(), "eap7");
             targets = Collections.singleton(target);
             optionValues.put(TargetOption.NAME, targets);

diff --git a/bootstraps-themed/pom.xml b/bootstraps-themed/pom.xml
@@ -42,6 +42,10 @@
             <groupId>org.jboss.windup.config</groupId>
             <artifactId>windup-config-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.windup</groupId>
+            <artifactId>windup-tooling-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>

diff --git a/exec/api/pom.xml b/exec/api/pom.xml
@@ -54,6 +54,9 @@
             <classifier>forge-addon</classifier>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.maven.shared</groupId>
+            <artifactId>maven-shared-utils</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/exec/api/src/main/java/org/jboss/windup/exec/configuration/options/TargetOption.java b/exec/api/src/main/java/org/jboss/windup/exec/configuration/options/TargetOption.java
@@ -40,8 +40,9 @@ public String getLabel() {
     }
 
     @Override
-    public String getDescription() {
-        return "The target server/technology/framework to migrate to. This could include multiple items (eg, \"eap7\" and \"cloud-readiness\") separated by a space. Use --listTargetTechnologies to get known targets.";
+    public String getDescription()
+    {
+        return "The target server/technology/framework to migrate to. This could include multiple items (eg, \"eap8\" and \"cloud-readiness\") separated by a space. Use --listTargetTechnologies to get known targets.";
     }
 
     @Override

diff --git a/pom.xml b/pom.xml
@@ -211,6 +211,11 @@
                 <artifactId>commons-io</artifactId>
                 <version>2.11.0</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven.shared</groupId>
+                <artifactId>maven-shared-utils</artifactId>
+                <version>3.3.4</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/windup-test-harness/pom.xml b/windup-test-harness/pom.xml
@@ -24,5 +24,9 @@
             <groupId>org.jboss.forge.furnace.test</groupId>
             <artifactId>arquillian-furnace-classpath</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven.shared</groupId>
+            <artifactId>maven-shared-utils</artifactId>
+        </dependency>
     </dependencies>
 </project>