resolve conflicts

Author: Mariya Pershina

README.md

@@ -1,34 +1,31 @@
 
-# Windup Documentation
+# MTA documentation
 
-This repository contains the files for Windup documentation.
+Migration Toolkit for Applications (MTA) is a set of tools that can be used to accelerate large-scale application modernization efforts across hybrid cloud environments on Red Hat OpenShift.
 
-[Windup](https://github.com/windup/windup) is an automated application migration and assessment tool.
+This repository contains the files for MTA documentation.
 
-For developer-focused documentation, see the [Windup wiki](https://github.com/windup/windup/wiki).
+## Contributing to MTA documentation
 
-## Contributing to Windup documentation
-
-This project is [Apache 2.0 licensed](LICENSE) and accepts contributions via
-GitHub pull requests.
+This project is [Apache 2.0 licensed](LICENSE) and accepts contributions via GitHub pull requests.
 
 See the [Contributors Guide](CONTRIBUTING.adoc) for details.
 
 ## Reporting a documentation bug
 
 To report a Windup documentation issue, submit a Jira issue on the [Windup project page]]{JiraWindupURL} with the *Component* field set to *Documentation*.
 
-## Repository Structure
+## Repository structure
 
-This repository uses the following directory structure:
+This repository has the following directory structure:
 
 ```
 .
-├── CONTRIBUTING.adoc (Guide for how to contribute to this repository)
+├── CONTRIBUTING.adoc (Instructions on how to contribute to this repository)
 ├── README.md (This file)
 ├── topics (Symbolic link to docs/topics/)
 └── docs/ (Contains all the asciidoc topics and top level content spec)
-    ├── GUIDE_NAME/
+    ├── guide_name/
     │   ├── master.adoc (Base AsciiDoc file for this guide)
     │   ├── master-docinfo.xml (Metadata about this guide)
     │   └── topics (Symbolic link to docs/topics/)
@@ -39,7 +36,7 @@ This repository uses the following directory structure:
             │   ├── document-attributes.adoc (Stores attributes used across guides)
             │   ├── revision-info.adoc (Revision timestamp to be added to all guides)
             └── *.adoc (AsciiDoc files used across guides)
-```
+``` 
 
 ## Code of conduct
 

docs/cli-guide/master-docinfo.xml

@@ -1,9 +1,9 @@
 <title>CLI Guide</title>
 <productname>{DocInfoProductName}</productname>
 <productnumber>{DocInfoProductNumber}</productnumber>
-<subtitle>Using the {ProductName} command-line interface to migrate applications.</subtitle>
+<subtitle>Using the {ProductName} command-line interface to migrate your applications</subtitle>
 <abstract>
-    <para>By using the {ProductName} command-line interface (CLI), you can assess and prioritize migration and modernization efforts for Java applications.</para>
+    <para>By using the {ProductFullName} command-line interface (CLI), you can assess and prioritize migration and modernization efforts for applications written in different languages. You can use the CLI to customize {ProductShortName} analysis options or integrate with external automation tools.</para>
 </abstract>
 <authorgroup>
     <orgname>Red Hat Customer Content Services</orgname>

docs/cli-guide/master.adoc

@@ -42,6 +42,18 @@ include::topics/mta-review-reports.adoc[leveloffset=+1]
 // Mavenize Your Application
 // include::topics/mavenize.adoc[leveloffset=+1]
 
+//Generating platform Assets for application deployment
+include::topics/mta-cli-generate-assets.adoc[leveloffset=+1]
+
+//Generating the discovery manifest
+include::topics/mta-cli-generate-discovery-manifest.adoc[leveloffset=+2]
+
+//Generating the deployment manifest
+include::topics/mta-cli-generate-deployment-manifest.adoc[leveloffset=+2]
+
+//Generate asset for a Java application
+include::topics/mta-cli-generate-deployment-asset-example.adoc[leveloffset=+2]
+
 // Optimize {ProductShortName} Performance
 include::topics/mta-optimize-performance.adoc[leveloffset=+1]
 

docs/release-notes/master.adoc

@@ -18,6 +18,23 @@ include::topics/making-open-source-more-inclusive.adoc[]
 
 {ProductFullName} {DocInfoProductNumber} accelerates large-scale application modernization efforts across hybrid cloud environments on {ocp-first}. This solution provides insight throughout the adoption process, at both the portfolio and application levels: inventory, assess, analyze, and manage applications for faster migration to {ocp-short} through the user interface (UI) and command-line interface (CLI).
 
+[id="mta-7-3-0"]
+== {ProductShortName} 7.3.0
+
+include::topics/ref_new-features-7-3-0.adoc[leveloffset=+2]
+
+include::topics/ref_fixed-issues-7-3-0.adoc[leveloffset=+2]
+
+include::topics/ref_known-issues-7-3-0.adoc[leveloffset=+2]
+
+
+[id="mta-7-2-2"]
+== {ProductShortName} 7.2.2
+
+include::topics/ref_resolved-issues-7-2-2.adoc[leveloffset=+2]
+
+include::topics/ref_known-issues-7-2-2.adoc[leveloffset=+2]
+
 [id="mta-7-2-1"]
 == {ProductShortName} 7.2.1
 

docs/rules-development-guide/master.adoc

@@ -31,17 +31,68 @@ include::topics/about-rules.adoc[leveloffset=+2]
 
 Each analyzer rule is a set of instructions that are used to analyze source code and detect issues that are problematic for migration.
 
-The analyzer parses user-provided rules, applies them to applications' source code, and generates issues for matched rules. A collection of one or more rules forms a ruleset. Creating rulesets provides a way of organizing multiple rules that achieve a common goal. The analyzer CLI takes rulesets as input arguments.
+The analyzer parses user-provided rules, applies them to applications' source code, and generates issues for matched rules.
+
+A collection of one or more rules forms a ruleset. Creating rulesets provides a way of organizing multiple rules that achieve a common goal.
+
+The analyzer CLI takes rulesets as input arguments.
+
 
 include::topics/yaml-rule-structure-syntax.adoc[leveloffset=+2]
 
+include::topics/yaml-rule-labels.adoc[leveloffset=+2]
+
 [id="creating-basic-yaml-rules_{context}"]
 === Creating a basic YAML rule
 
 This section describes how to create a basic {ProductShortName} YAML rule. This assumes that you already have {ProductShortName} installed. See the {ProductShortName} {ProductDocUserGuideURL}[_{UserCLIBookName}_] for installation instructions.
 
 include::topics/create-basic-yaml-rule-template.adoc[leveloffset=+3]
 
+include::topics/yaml-rule-categories.adoc[leveloffset=+3]
+
+include::topics/yaml-rule-actions.adoc[leveloffset=+3]
+
+include::topics/yaml-rule-conditions.adoc[leveloffset=+3]
+
+include::topics/yaml-tag-actions.adoc[leveloffset=+3]
+
+include::topics/yaml-message-actions.adoc[leveloffset=+3]
+
+include::topics/yaml-rule-hyperlinks.adoc[leveloffset=+3]
+
+include::topics/yaml-provider-conditions.adoc[leveloffset=+3]
+
+include::topics/yaml-builin-provider.adoc[leveloffset=+4]
+
+include::topics/yaml-java-provider.adoc[leveloffset=+4]
+
+include::topics/yaml-java-locations.adoc[leveloffset=+4]
+
+include::topics/yaml-annotation-inspection.adoc[leveloffset=+4]
+
+include::topics/yaml-go-provider.adoc[leveloffset=+4]
+
+include::topics/yaml-dotnet-provider.adoc[leveloffset=+4]
+
+include::topics/yaml-condition-patterns.adoc[leveloffset=+3]
+
+include::topics/yaml-custom-variables.adoc[leveloffset=+3]
+
+include::topics/yaml-logical-conditions.adoc[leveloffset=+3]
+
+include::topics/yaml-and-condition.adoc[leveloffset=+4]
+
+include::topics/yaml-or-condition.adoc[leveloffset=+4]
+
+include::topics/yaml-chaining-condition-variables.adoc[leveloffset=+4]
+
+include::topics/yaml-chaining-java-provider.adoc[leveloffset=+5]
+
+include::topics/yaml-rulesets.adoc[leveloffset=+3]
+
+
+
 include::topics/create-basic-yaml-ruleset-template.adoc[leveloffset=+3]
 
 include::topics/create-yaml-rule.adoc[leveloffset=+3]

docs/topics/create-yaml-rule.adoc

@@ -173,7 +173,7 @@ _Example_
 when:
   java.referenced:
     location: PACKAGE
-    pattern: org.jboss.*
+    pattern: org.jboss*
 ----
 
 . Create an `AND` or `OR` condition

docs/topics/installing-cli-tool.adoc

@@ -11,27 +11,59 @@ You can install the {CLINameTitle} on Linux, Windows, or macOS operating systems
 
 [IMPORTANT]
 ====
-Starting from {ProductShortName} 7.2.0, you can run the application analysis for Java applications  in the containerless mode.
+
+Starting from {ProductShortName} 7.2.0, you can run the application analysis for Java applications in the containerless mode.
 
 The containerless mode is set by default and is used automatically if all requirements are met. For more information, see xref:running-the-containerless-mta-cli_cli-guide[Running the containerless CLI].
 
 However, if you want to analyze applications in languages other than Java or, for example, use xref:mta-cli-transform_cli-guide[transformation commands], you still need to use containers.
 ====
 
-.Prerequisites
+.Prerequisites for containerized CLI
+
+The following are the prerequisites for the {ProductFullName} CLI installation (container):
 
 * Red Hat Container Registry Authentication for `registry.redhat.io`. Red Hat distributes container images from `registry.redhat.io`, which requires authentication. For more details, see link:https://access.redhat.com/RegistryAuthentication[Red Hat Container Registry Authentication].
 
+* link:https://podman.io/[Podman] must be installed.
+
+* 8 GB of RAM is required for the {ProductShortName} {CLIName}.
+
+.Prerequisites for containerless CLI
+
+The following are the prerequisites if you want to to run {ProductShortName} {CLIName} as in xref:running-the-containerless-mta-cli_cli-guide[containerless CLI] mode:
+
+* Java Development Kit (JDK) is installed.
++
+{ProductShortName} supports the following JDKs:
+
+** Oracle JDK 17 or later
+** Eclipse Temurin™ JDK 17 or later
+** OpenJDK 17 or later
++
+If you install OpenJDK on {op-system-base-full} or Fedora, the JDK requires a compiler provided by the `devel` package to also be installed, as having only the Java Runtime (JRE) installed causes issues during analysis. For more information about installing Red Hat build of OpenJDK 17 on {op-system-base-full}, see link:https://docs.redhat.com/en/documentation/red_hat_build_of_openjdk/17/html-single/installing_and_using_red_hat_build_of_openjdk_17_on_rhel/index#installing-jre-on-rhel-using-archive_openjdk[Installing Red Hat build of OpenJDK on RHEL by using yum].
+
+* You must set the `JAVA_HOME` and the `PATH` environment variables.
+
+* Maven 3.9.9 installed, and the bin directory is added to the `PATH` environment variable. Setting the path and environment variables depends on the operating system you are using. For more information about installing Maven, see link:https://maven.apache.org/install.html[Apache Maven installation].
+
+* macOS installation requires:
+
+** The value of `maxproc` must be `2048` or greater.
+
 [id="installing-downloadable-cli-zip_{context}"]
 == Installing the {CLINameTitle} `.zip` file
 
 .Procedure
 
 . Navigate to the link:{DevDownloadPageURL}[{ProductShortName} Download page] and download the OS-specific CLI file or the `src` file:
 +
-* {ProductShortNameLower}-{ProductVersion}-cli-linux.zip
-* {ProductShortNameLower}-{ProductVersion}-cli-macos.zip
-* {ProductShortNameLower}-{ProductVersion}-cli-windows.zip
+* {ProductShortNameLower}-{ProductVersion}-cli-linux-amd64.zip
+* {ProductShortNameLower}-{ProductVersion}-cli-linux-arm64.zip
+* {ProductShortNameLower}-{ProductVersion}-cli-darwin-amd64.zip
+* {ProductShortNameLower}-{ProductVersion}-cli-darwin-arm64.zip
+* {ProductShortNameLower}-{ProductVersion}-cli-windows-amd64.zip
+* {ProductShortNameLower}-{ProductVersion}-cli-windows-arm64.zip
 * {ProductShortNameLower}-{ProductVersion}-cli-src.zip
 
 . Extract the `.zip` file to the `.kantra` directory inside your `$HOME` directory. The `.zip` file extracts the *mta-cli* binary, along with other required directories and files.
@@ -42,7 +74,12 @@ When you encounter `<{ProductShortName}_HOME>` in this guide, replace it with th
 [id="installing-using-podman_{context}"]
 == Installing the {CLINameTitle} by using Podman
 
-You can install the {CLINameTitle} using `podman pull`.
+You can install the containerized {CLINameTitle} using `podman pull`.
+
+[NOTE]
+====
+You cannot install the containerless {CLINameTitle} using Podman as this procedure does not include pulling and unpacking the dependencies that are included in the `.zip` file.
+====
 
 .Prerequisites
 
@@ -195,17 +232,16 @@ Server: Docker Desktop 4.32.0 (157355)
 ----
 PS C:\Users\<your_user_name>> $env:PODMAN_BIN="C:\Windows\system32\docker.exe"
 ----
-
 . Set the `DOTNET_PROVIDER_IMG` environment variable to use the upstream `dotnet-external-provider`:
 +
 [source,powershell]
 ----
-PS C:\Users\<your_user_name>> $env:DOTNET_PROVIDER_IMG="quay.io/konveyor/dotnet-external-provider:v0.5.0"
+PS C:\Users\<your_user_name>> $env:DOTNET_PROVIDER_IMG="registry.redhat.io/mta/mta-dotnet-external-provider-rhel9:7.1.0"
 ----
-
 . Set the `RUNNER_IMG` environment variable to use the upstream image:
 +
 [source,powershell]
 ----
-PS C:\Users\<your_user_name>> $env:RUNNER_IMG="quay.io/konveyor/kantra:v0.5.0"
+# double-check reference
+PS C:\Users\<your_user_name>> $env:RUNNER_IMG="registry.redhat.io/mta/mta-cli-rhel9:7.1.0"
 ----

docs/topics/mavenize.adoc

@@ -79,7 +79,7 @@ The root POM is also configured to use the link:https://maven.repository.redhat.
 [discrete]
 === BOM file
 
-The Bill of Materials (BOM) file is generated in the directory ending in `-bom`. For the example `jee-example-app-1.0.0.ear` application, the BOM file can be found at `/path/to/output/mavenized/jee-example-app/jee-example-app-bom/pom.xml`. The purpose of this BOM is to have the versions of third-party dependencies used by the project defined in one place. For more information on using a BOM, see the link:https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html[Introduction to the dependency mechanism] section of the Apache Maven documentation.
+The Bill of Materials (BOM) file is generated in the directory ending in `-bom`. For the example `jee-example-app-1.0.0.ear` application, the BOM file can be found at `/path/to/output/mavenized/jee-example-app/jee-example-app-bom/pom.xml`. The purpose of this BOM is to have the versions of third-party dependencies used by the project defined in one place. For more information on using a BOM, see the link:https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Bill_of_Materials_.28BOM.29_POMs[Introduction to the dependency mechanism] section of the Apache Maven documentation.
 
 The following dependencies are listed in the BOM for the example `jee-example-app-1.0.0.ear` application