Skip to content

Commit

Permalink
Merge pull request #11 from Bonitasoft-Community/feat/2021.2-migration
Browse files Browse the repository at this point in the history
feat(migration): migrate project to 2021.2
  • Loading branch information
dcoille authored Sep 23, 2021
2 parents 8e285a6 + a337b60 commit dc93ca9
Show file tree
Hide file tree
Showing 27 changed files with 344 additions and 127 deletions.
13 changes: 12 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# Output of source code compilation.
# For example Bonita includes helper Groovy classes such as BonitaUsers (with for example getProcessInstanceInitiator method).
# Sources (e.g. BonitaUsers.groovy) are located in src-providedGroovy folder and build result (e.g. BonitaUsers.class) is located in bin folder.
Expand Down Expand Up @@ -73,4 +74,14 @@
target/

# Macos
.DS_Store
.DS_Store


bin
/template
/process_configurations
node/
node_modules/
/web_fragments/.metadata
/web_fragments/*/*.js
!/web_widgets/*/*.ctrl.js
26 changes: 5 additions & 21 deletions .project
Original file line number Diff line number Diff line change
@@ -1,41 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>MyProject</name>
<comment>7.10.0</comment>
<name>getting-started-tutorial</name>
<comment>7.13.0</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.bonitasoft.studio.common.repository.bonitaNature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
34 changes: 17 additions & 17 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ Bonita is a powerful BPM-based application platform for building highly engaging

## Pull requests

Each minor version of Bonita has its own Git branch to manage its related documentation. (Minor version means X.Y, for example 7.4 or 7.5).
For instance, the **7.4** branch is where you have to open pull requests when your contribution applies to all 7.4 versions of Bonita.
Each minor version of Bonita has its own Git branch to manage its related documentation. (Minor version means X.Y, for example 7.11 or 2021.2).
For instance, the **2021.2** branch is where you have to open pull requests when your contribution applies to all 2021.2 versions of Bonita.

A branch should be name in kebab case prefixed by the type of the feature the branch has been created for (feat, fix, style, tr, chore, howto,...).
For instance, for a branch fixing a typo in the User REST API, its name should be `fix/user-delete-rest-api-typo`.

If your contribution applies to multiple minor versions of Bonita, then open a pull request on the lowest applicable version branch. Then add all applicable minor versions in your pull request comment and we will do the rest :-)

<u>Example</u>: Your contribution applies to versions 7.4 and 7.5. Therefore submit your pull request on branch 7.4 with a comment like:
<u>Example</u>: Your contribution applies to versions 7.11 and 2021.1. Therefore submit your pull request on branch 7.11 with a comment like:
```
My awesome contribution to Bonita documentation.
Versions: 7.4, 7.5
Versions: 7.11, 2021.1
```

Ideally, a pull request, at first, should contain a single commit containing the changes you want to suggest. Other commits may be added after reviews.
Expand Down Expand Up @@ -93,18 +93,18 @@ Please provide links to any relevant tickets, articles or other resources if ava

## How to update an existing page?

In this case, edit the appropriate _.md_ file and the build process will do the rest.
In this case, edit the appropriate _.adoc_ file and the build process will do the rest.

<u>Example</u>: To edit the **?page=actors** page in version 7.4, edit the `md/actors.md` file and submit a pull request on **7.4** branch.
<u>Example</u>: To edit the **?page=actors** page in version 2021.2, edit the `pages/actors.adoc` file and submit a pull request on **2021.2** branch.


## How to add a new page?

### Create a new page

Checkout a branch from the version you want this page to be available in and create the _.md_ file in the **md** folder.
Checkout a branch from the version you want this page to be available in and create the _.adoc_ file in the **pages** folder.

<u>Example</u>: To add a new _Manage form control/validation_ tutorial in 7.4, checkout a new branch from the **7.4** branch and create a new _manage-control-in-forms.md_ file in the **md** folder.
<u>Example</u>: To add a new _Manage form control/validation_ tutorial in 2021.2, checkout a new branch from the **2021.2** branch and create a new _manage-control-in-forms.adoc_ file in the **pages** folder.

You can check its content once committed on the GitHub site ([Simple view](README.md#simple-view)) or using the web server ([Advanced view](README.md#advanced-view)).

Expand All @@ -113,24 +113,24 @@ You can check its content once committed on the GitHub site ([Simple view](READM
Your new page is not yet referenced in documentation site's taxonomy. So you will not be able to find your new page in the navigation tree unless you know the URL.
Therefore you need to add your new page to the taxonomy to be able to find it the navigation tree.

The taxonomy is created from the `taxonomy.md` file.
In our case, we also want to add a _Howto_ section in the taxonomy tree. So we first create a new item inside the `taxonomy.md`. Then we create a entry point for our new tutorial inside the _Howto_ section:
The taxonomy is created from the `taxonomy.adoc` file.
In our case, we also want to add a _Howto_ section in the taxonomy tree. So we first create a new item inside the `taxonomy.adoc`. Then we create a entry point for our new tutorial inside the _Howto_ section:

* [Howtos](_howtos.md)
* [Manage form control/validation](manage-control-in-forms.md)
* [Howtos](_how-tos-index.adoc)
* [Manage form control/validation](manage-control-in-forms.adoc)

<u>Note</u>: We need to reference a *_howtos.md* page with the list of items of this section. However **you don't need to create the *_howtos.md* file** as it is automatically generated at build time.
<u>Note</u>: We need to reference a *_how-tosindex.adoc* page with the list of items of this section. However **you don't need to create the *_how-tos-index.adoc* file** as it is automatically generated at build time.

Now starting from the visualization of the _taxonomy.md_ page, we can browse to the _manage-control-in-forms.md_ page.
Now starting from the visualization of the _taxonomy.adoc_ page, we can browse to the _manage-control-in-forms.adoc_ page.

### Variables

During markdown to HTML conversion, some predefined variables located in the [variables.json file](scripts/variables.json) are replaced.
During Asciidoc to HTML conversion, some predefined variables located in the [variables.json file](scripts/variables.json) are replaced.

For instance, the `varVersion` variable matches the current documentation version.
To reference this variable, use the `${varVersion}` notation in _.md_ files.

#### Markdown titles
#### AsciiDoc titles

In markdown, lines starting with `#` are converted to `<hx>` tags where _x_ is the number of `#` :
* use `#` for `h1` tag
Expand Down Expand Up @@ -160,7 +160,7 @@ Current conversion to html is done with `markdown-it` with the [Github-flavored

## How to add images?

All images must be added to the **md/images** folder.
All images must be added to the **ROOT/images** folder.


### Images
Expand Down
22 changes: 22 additions & 0 deletions MIGRATION_NOTES.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
== Migration notes (September 1, 2021 at 10:41:46 AM CEST)

=== Updates

* `bonita.runtime.version` has been updated from `7.13.0-SNAPSHOT` to `7.13.0.beta-02`.

== Migration notes (September 1, 2021 at 10:09:11 AM CEST)

=== Additions

* Bonita projects are now Maven projects and rely on the https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html[Maven dependency mechanism] to manage their dependencies. Check the documentation for more information about https://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=727&bos_redirect_major_version=7.13&bos_redirect_minor_version=0&bos_redirect_product=bos[Project composition].

=== Updates

* Groovy version has been updated from `2.4.x` to `3.0.x`
* Only Java `11` version is now supported. This might impact your existing projet if you were still using Java 8. Some dependencies in your project might be incompatible with the _Java Platform Module System_ introduced in Java 9.

=== Removals

* Existing `pom.xml` has been backed up as `pom.xml.old`. Bonita projects are now Maven project and the `pom.xml` file is *reserved for internal use*.
* `lib` folder and its content has been removed.

14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Getting started: workspace and .bos file

## Overview
This repository provides the solution for [Bonita getting started](https://documentation.bonitasoft.com/bonita//_getting-started-tutorial).
This repository provides the solution for [Bonita getting started](https://documentation.bonitasoft.com/bonita/latest/getting-started-index).

## Compatibility
This example has been built with Bonita 7.10.0 Community Edition.
This example has been built with Bonita 2021.2 Community Edition.

It is compatible with all Bonita editions (Community and Enterprise).
It should remain compatible with any future releases.
Expand All @@ -22,16 +22,18 @@ To import the solution in Bonita Studio:
* Click on **Browse...** button and select _claims-management.bos_ file
* Click on **Import** button

WARNING: When you import _claims-management.bos_ in your Studio, if some artifacts (BDM, diagrams...) with identical names already exsit, Studio will ask you if you want to override them. On Community Edition you might want to do that in a separated installation of Bonita Studio. With Enterprise Edition you probably want to import the bos file content to a new project.
WARNING: When you import _claims-management.bos_ in your Studio, if some artifacts (BDM, diagrams...) with identical names already exsit, Studio will ask you if you want to override them. To avoid that, you probably want to import the bos file content to a new project.
{: .note}

Note: alternatively you can clone this repository in Enterprise Edition using Git integration.
**NOTE**: alternatively you can clone this repository using Git integration.
{: .note}

## Deployment
Click on **File > Deploy** Bonita Studio menu to deploy all artifacts and open the application or the Portal homepage. For more details refer to [Bonita getting started](https://documentation.bonitasoft.com/bonita//_getting-started-tutorial).
Click on **File > Deploy** Bonita Studio menu to deploy all artifacts and open the Claims management application or the Bonita user home page. For more details refer to [Bonita getting started](https://documentation.bonitasoft.com/bonita/latest/getting-started-index).

## Issues tracker
Use [GitHub issue tracker](https://github.com/Bonitasoft-Community/getting-started-turorial/issues) to report issues.

## Content of the Git repository
If you follow the [Bonita getting started](https://documentation.bonitasoft.com/bonita//_getting-started-tutorial) you should end up with a workspace just like the content of this Git repository.
If you follow the [Bonita getting started](https://documentation.bonitasoft.com/bonita/latest/getting-started-index) you should end up with a workspace just like the content of this Git repository.

2 changes: 1 addition & 1 deletion bdm/bom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<businessObjectModel modelVersion="1.0" productVersion="7.10.0">
<businessObjectModel xmlns="http://documentation.bonitasoft.com/bdm-xml-schema/1.0" modelVersion="1.0" productVersion="7.10.0">
<businessObjects>
<businessObject qualifiedName="com.company.model.Claim">
<fields>
Expand Down
Loading

0 comments on commit dc93ca9

Please sign in to comment.