Merge remote-tracking branch 'upstream/master' into WINDUP-3322

windup · Nov 24, 2022 · 4e5b97d · 4e5b97d
2 parents 2154f6a + 0bb95f0
commit 4e5b97d
Show file tree

Hide file tree

Showing 39 changed files with 132 additions and 82 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,18 @@
+version: 2
+updates:
+  # Maintain dependencies for pom.xml
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "Maven pom.xml"
+      include: "scope"
+  # Maintain dependencies from package.json
+  - package-ecosystem: "npm"
+    directory: "/ui-pf4/src/main/webapp"
+    schedule:
+      interval: "weekly"
+    allow:
+      - dependency-name: "@patternfly/*"
+        dependency-type: "direct"
diff --git a/addons/messaging-executor/addon/pom.xml b/addons/messaging-executor/addon/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web.addons</groupId>
         <artifactId>windup-web-messaging-executor-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-web-messaging-executor</artifactId>

diff --git a/addons/messaging-executor/api/pom.xml b/addons/messaging-executor/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web.addons</groupId>
         <artifactId>windup-web-messaging-executor-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-web-messaging-executor-api</artifactId>

diff --git a/addons/messaging-executor/impl/pom.xml b/addons/messaging-executor/impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web.addons</groupId>
         <artifactId>windup-web-messaging-executor-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-web-messaging-executor-impl</artifactId>

diff --git a/addons/messaging-executor/pom.xml b/addons/messaging-executor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web.addons</groupId>
         <artifactId>windup-web-addons</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-web-messaging-executor-parent</artifactId>

diff --git a/addons/messaging-executor/tests/pom.xml b/addons/messaging-executor/tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web.addons</groupId>
         <artifactId>windup-web-messaging-executor-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-web-messaging-executor-tests</artifactId>

diff --git a/addons/pom.xml b/addons/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web</groupId>
         <artifactId>windup-web-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jboss.windup.web.addons</groupId>

diff --git a/addons/web-support/addon/pom.xml b/addons/web-support/addon/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web.addons</groupId>
         <artifactId>windup-web-support-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-web-support</artifactId>

diff --git a/addons/web-support/api/pom.xml b/addons/web-support/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web.addons</groupId>
         <artifactId>windup-web-support-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-web-support-api</artifactId>

diff --git a/addons/web-support/impl/pom.xml b/addons/web-support/impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web.addons</groupId>
         <artifactId>windup-web-support-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-web-support-impl</artifactId>

diff --git a/addons/web-support/pom.xml b/addons/web-support/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web.addons</groupId>
         <artifactId>windup-web-addons</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-web-support-parent</artifactId>

diff --git a/addons/web-support/tests/pom.xml b/addons/web-support/tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web.addons</groupId>
         <artifactId>windup-web-support-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-web-support-tests</artifactId>

diff --git a/ear/pom.xml b/ear/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web</groupId>
         <artifactId>windup-web-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-ear</artifactId>

diff --git a/executor/pom.xml b/executor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web</groupId>
         <artifactId>windup-web-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-web-executor</artifactId>

diff --git a/furnace-service-provider/pom.xml b/furnace-service-provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web</groupId>
         <artifactId>windup-web-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>furnace-service-provider</artifactId>

diff --git a/model/pom.xml b/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.windup.web</groupId>
         <artifactId>windup-web-parent</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>windup-web-jpa-model</artifactId>

diff --git a/model/src/main/java/org/jboss/windup/web/services/model/AdvancedOption.java b/model/src/main/java/org/jboss/windup/web/services/model/AdvancedOption.java
@@ -33,7 +33,8 @@ public class AdvancedOption implements Serializable
     @NotNull
     private String name;
 
-    @Column(length = 8192)
+    // "value" is a reserved word, hence need to be escaped
+    @Column(name = "\"value\"", length = 8192)
     private String value;
 
     public AdvancedOption() {}

diff --git a/model/src/main/java/org/jboss/windup/web/services/model/AnalysisContext.java b/model/src/main/java/org/jboss/windup/web/services/model/AnalysisContext.java
@@ -29,6 +29,7 @@
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
+import org.hibernate.annotations.Type;
 
 /**
  * Contains information about how Windup analysis should be configured.
@@ -65,18 +66,22 @@ public class AnalysisContext implements Serializable
 
     @Column(nullable = false)
     @ColumnDefault("true")
+    @Type(type= "yes_no")
     private boolean generateStaticReports = true;
 
     /*
      * @TODO temporary added for obey single target selection in migration path
      */
     @Column(name = "cloudtargets")
+    @Type(type= "yes_no")
     private boolean cloudTargetsIncluded;
 
     @Column(name = "linuxtargets")
+    @Type(type= "yes_no")
     private boolean linuxTargetsIncluded;
 
     @Column(name = "openjdktargets")
+    @Type(type= "yes_no")
     private boolean openJdkTargetsIncluded;
 
     @JsonIgnore

diff --git a/model/src/main/java/org/jboss/windup/web/services/model/Configuration.java b/model/src/main/java/org/jboss/windup/web/services/model/Configuration.java
@@ -1,6 +1,7 @@
 package org.jboss.windup.web.services.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.hibernate.annotations.Type;
 
 import java.io.Serializable;
 import java.util.Set;
@@ -48,6 +49,7 @@ public class Configuration implements Serializable
     private Long id;
 
     @Column
+    @Type(type= "yes_no")
     private boolean global;
 
     @Version

diff --git a/model/src/main/java/org/jboss/windup/web/services/model/LabelsPath.java b/model/src/main/java/org/jboss/windup/web/services/model/LabelsPath.java
@@ -1,6 +1,7 @@
 package org.jboss.windup.web.services.model;
 
 import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
@@ -36,6 +37,7 @@ public class LabelsPath implements Serializable
     @Column
     @NotNull
     @ColumnDefault("true")
+    @Type(type= "yes_no")
     private boolean scanRecursively = true;
 
     @Column(length = 2048)

diff --git a/model/src/main/java/org/jboss/windup/web/services/model/MigrationProject.java b/model/src/main/java/org/jboss/windup/web/services/model/MigrationProject.java
@@ -8,6 +8,7 @@
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
+import org.hibernate.annotations.Type;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -62,6 +63,7 @@ public class MigrationProject implements Serializable
      */
     @Column(nullable = true)
     @ColumnDefault("FALSE")
+    @Type(type= "yes_no")
     private boolean provisional = true;
 
     @Column(length = 120, unique = false, nullable = false)

diff --git a/model/src/main/java/org/jboss/windup/web/services/model/Package.java b/model/src/main/java/org/jboss/windup/web/services/model/Package.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.hibernate.annotations.Type;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -45,6 +46,7 @@ public class Package implements Serializable
     @Column()
     private int countClasses;
 
+    @Type(type= "yes_no")
     private boolean isKnown;
 
     @ManyToOne()

diff --git a/model/src/main/java/org/jboss/windup/web/services/model/RegisteredApplication.java b/model/src/main/java/org/jboss/windup/web/services/model/RegisteredApplication.java
@@ -23,6 +23,7 @@
 import javax.validation.constraints.Size;
 
 import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.Type;
 import org.jboss.windup.web.services.validators.FileExistsConstraint;
 
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
@@ -71,6 +72,7 @@ public class RegisteredApplication implements Serializable
      */
     @Column(nullable = false)
     @ColumnDefault("FALSE")
+    @Type(type= "yes_no")
     private boolean exploded;
 
     @Column(length = 2048)
@@ -91,6 +93,7 @@ public class RegisteredApplication implements Serializable
     private Calendar lastModified;
 
     @Column
+    @Type(type= "yes_no")
     private boolean isDeleted = false;
 
     public RegisteredApplication()

diff --git a/model/src/main/java/org/jboss/windup/web/services/model/ReportFilter.java b/model/src/main/java/org/jboss/windup/web/services/model/ReportFilter.java
@@ -18,6 +18,7 @@
 import org.hibernate.annotations.FetchMode;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.hibernate.annotations.Type;
 
 /**
  * @author <a href="mailto:dklingenberg@gmail.com">David Klingenberg</a>
@@ -61,6 +62,7 @@ public class ReportFilter implements Serializable
     private WindupExecution windupExecution;
 
     @Column(nullable = false)
+    @Type(type= "yes_no")
     private boolean isEnabled = false;
 
     public ReportFilter()

diff --git a/model/src/main/java/org/jboss/windup/web/services/model/RulesPath.java b/model/src/main/java/org/jboss/windup/web/services/model/RulesPath.java
@@ -15,6 +15,7 @@
 import javax.validation.constraints.Size;
 
 import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.Type;
 
 /**
  * Contains the path to a Rules directory.
@@ -45,6 +46,7 @@ public class RulesPath implements Serializable
     @Column
     @NotNull
     @ColumnDefault("true")
+    @Type(type= "yes_no")
     private boolean scanRecursively = true;
 
     @Column(length = 2048)

diff --git a/model/src/main/java/org/jboss/windup/web/services/model/Tag.java b/model/src/main/java/org/jboss/windup/web/services/model/Tag.java
@@ -18,6 +18,7 @@
 import org.hibernate.annotations.FetchMode;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.hibernate.annotations.Type;
 
 /**
  * @author <a href="mailto:dklingenberg@gmail.com">David Klingenberg</a>
@@ -39,9 +40,11 @@ public class Tag
     private String name;
 
     @Column
+    @Type(type= "yes_no")
     private boolean isRoot;
 
     @Column
+    @Type(type= "yes_no")
     private boolean isPseudo;
 
     @Column

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.jboss.windup.web</groupId>
     <artifactId>windup-web-parent</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Windup Web - Parent</name>
@@ -24,8 +24,8 @@
         <version.findbugs.plugin>3.0.5</version.findbugs.plugin>
         <version.forge>3.10.0.Final</version.forge>
         <version.furnace>2.29.1.Final</version.furnace>
-        <version.windup>6.0.1-SNAPSHOT</version.windup>
-        <version.windup.cli>6.0.1-SNAPSHOT</version.windup.cli>
+        <version.windup>6.2.0-SNAPSHOT</version.windup>
+        <version.windup.cli>6.2.0-SNAPSHOT</version.windup.cli>
         <version.keycloak>18.0.2</version.keycloak>
         <version.wildfly>23.0.2.Final</version.wildfly>
         <version.resteasy>3.15.1.Final</version.resteasy>
@@ -208,7 +208,7 @@
             <dependency>
                 <groupId>org.jboss.arquillian.graphene</groupId>
                 <artifactId>graphene-webdriver</artifactId>
-                <version>2.0.3.Final</version>
+                <version>2.5.4</version>
                 <type>pom</type>
             </dependency>
             <dependency>