Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into WINDUP-3513
Browse files Browse the repository at this point in the history
  • Loading branch information
@carlosthe19916
carlosthe19916 committed Nov 24, 2022
2 parents 6e379aa + 0bb95f0 commit 7e9a152
Show file tree
Hide file tree
Showing 26 changed files with 49 additions and 31 deletions.
2 changes: 1 addition & 1 deletion addons/messaging-executor/addon/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web.addons</groupId>
<artifactId>windup-web-messaging-executor-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-messaging-executor</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion addons/messaging-executor/api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web.addons</groupId>
<artifactId>windup-web-messaging-executor-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-messaging-executor-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion addons/messaging-executor/impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web.addons</groupId>
<artifactId>windup-web-messaging-executor-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-messaging-executor-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion addons/messaging-executor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web.addons</groupId>
<artifactId>windup-web-addons</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-messaging-executor-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion addons/messaging-executor/tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web.addons</groupId>
<artifactId>windup-web-messaging-executor-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-messaging-executor-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion addons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<groupId>org.jboss.windup.web.addons</groupId>
Expand Down
2 changes: 1 addition & 1 deletion addons/web-support/addon/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web.addons</groupId>
<artifactId>windup-web-support-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-support</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion addons/web-support/api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web.addons</groupId>
<artifactId>windup-web-support-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-support-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion addons/web-support/impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web.addons</groupId>
<artifactId>windup-web-support-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-support-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion addons/web-support/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web.addons</groupId>
<artifactId>windup-web-addons</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-support-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion addons/web-support/tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web.addons</groupId>
<artifactId>windup-web-support-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-support-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ear/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-ear</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion executor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-executor</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion furnace-service-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>furnace-service-provider</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-jpa-model</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Windup Web - Parent</name>
Expand All @@ -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.1.0-SNAPSHOT</version.windup>
<version.windup.cli>6.1.0-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>
Expand Down
2 changes: 1 addition & 1 deletion services/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-tests-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tests/test-authentication-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-tests-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>test-authentication-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tests/wildfly-dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-tests-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-tests-wildfly-dist</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tools/graph-tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions tsmodelsgen-invocation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>org.jboss.windup.web.ui</groupId>
<artifactId>windup-web-ui-tsmodels</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>

<name>Windup Web - Generate TS Models</name>

Expand All @@ -34,8 +34,8 @@
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>

<version.windup.core>6.1.0-SNAPSHOT</version.windup.core>
<version.windup.ruleset>6.1.0-SNAPSHOT</version.windup.ruleset>
<version.windup.core>6.2.0-SNAPSHOT</version.windup.core>
<version.windup.ruleset>6.2.0-SNAPSHOT</version.windup.ruleset>
<!-- For now, we need to pass this to the Mojo explicitly (through META-INF/versions.properties),
but it should be possible to figure that out from the Windup POM. -->
<version.forge>3.10.0.Final</version.forge>
Expand Down
6 changes: 3 additions & 3 deletions tsmodelsgen-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>org.jboss.windup.web.plugin</groupId>
<artifactId>windup-tsmodelsgen-maven-plugin</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>Windup Web - TS Model Generator Maven Plugin</name>
Expand All @@ -29,8 +29,8 @@
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>

<version.windup.core>6.1.0-SNAPSHOT</version.windup.core>
<version.windup.ruleset>6.1.0-SNAPSHOT</version.windup.ruleset>
<version.windup.core>6.2.0-SNAPSHOT</version.windup.core>
<version.windup.ruleset>6.2.0-SNAPSHOT</version.windup.ruleset>
<!-- this property is used in the code too, DO NOT REMOVE IT! -->
<version.windup.web>${project.version}</version.windup.web>
<!-- For now, we need to pass this to the Mojo explicitly (through META-INF/versions.properties),
Expand Down
2 changes: 1 addition & 1 deletion ui-pf4/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.windup.web</groupId>
<artifactId>windup-web-parent</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<artifactId>windup-web-ui-pf4</artifactId>
Expand Down
1 change: 1 addition & 0 deletions ui-pf4/src/main/webapp/src/images/UI_Icon-Red_Hat-Search-A-Red-RGB.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 18 additions & 1 deletion ui-pf4/src/main/webapp/src/layout/TransformationPaths.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import mug from "images/Icon-Red_Hat-Mug-A-Red-RGB.svg";
import multiply from "images/Icon-Red_Hat-Multiply-A-Red-RGB.svg";
import server from "images/Icon-Red_Hat-Server-A-Red-RGB.svg";
import virtualServer from "images/Icon-Red_Hat-Virtual_server_stack-A-Red-RGB.png";
import search from "images/UI_Icon-Red_Hat-Search-A-Red-RGB.svg";

export interface MultipleOptions {
label: string;
Expand All @@ -22,7 +23,7 @@ export interface TransformationPathOption {
}

export const EAP7: TransformationPathOption = {
label: "Application server migration to EAP 7",
label: "Application server migration to EAP",
description:
"Upgrade to the latest Release of JBoss EAP or migrate your applications to JBoss EAP from competitors' Enterprise Application server (e.g.Oracle Weblogic Server).",
options: [
Expand Down Expand Up @@ -129,6 +130,11 @@ export const AZURE: TransformationPathOption = {
value: "azure-aks",
default: false,
},
{
label: "azure-container-apps",
value: "azure-container-apps",
default: false,
},
],
iconSrc: virtualServer,
isNew: true,
Expand All @@ -141,6 +147,15 @@ export const CAMEL: TransformationPathOption = {
iconSrc: multiply,
};

export const DISCOVERY: TransformationPathOption = {
label: "Discovery",
description:
"It runs an analysis to just discover the technologies and frameworks used within the application(s).",
options: "discovery",
iconSrc: search,
isNew: true,
};

export const DEFAULT_TRANSFORMATION_PATHS = [
EAP7,
CONTAINERIZATION,
Expand All @@ -153,6 +168,7 @@ export const DEFAULT_TRANSFORMATION_PATHS = [
OPEN_LIBERTY,
AZURE,
CAMEL,
DISCOVERY,
];

export const MTA_MTR_TRANSFORMATION_PATHS = [
Expand All @@ -172,4 +188,5 @@ export const MTA_MTR_TRANSFORMATION_PATHS = [
options: "azure-appservice",
},
CAMEL,
DISCOVERY,
];

0 comments on commit 7e9a152

Please sign in to comment.