Skip to content

Commit

Permalink
chore(deps): bump artifacts model version from 1.0.0 to 1.1.0-SNAPSHO…
Browse files Browse the repository at this point in the history
…T (#2998)

* Related to bonitasoft/bonita-artifacts-model#105
* Update bonita-artifacts-model version from `1.0.0` to `1.1.0-SNAPSHOT`
  * ⚠️ Temporary using SNAPSHOT version while we validate those changes
* Update application xml namespace version from `1.0` to `1.1`

Related to [BPM-90](https://bonitasoft.atlassian.net/browse/BPM-90)
  • Loading branch information
akantcheff authored May 15, 2024
1 parent dc4fa78 commit eb0aae0
Show file tree
Hide file tree
Showing 18 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<applications xmlns="http://documentation.bonitasoft.com/application-xml-schema/1.0">
<applications xmlns="http://documentation.bonitasoft.com/application-xml-schema/1.1">
<application profile="UnknownProfile" state="ACTIVATED" token="LoanApp" version="2.0" homePage="loan-index"
layout="custompage_layoutBonita" theme="custompage_themeBonita">
<displayName>Loan request</displayName>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
~ or BonitaSoft US, 51 Federal Street, Suite 305, San Francisco, CA 94107
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->

<applications xmlns="http://documentation.bonitasoft.com/application-xml-schema/1.0">
<applications xmlns="http://documentation.bonitasoft.com/application-xml-schema/1.1">
<application profile="ThisProfileDoesNotExist" state="ACTIVATED" token="HR-dashboard" version="2.0" layout="custompage_layoutBonita" theme="custompage_themeBonita">
<displayName>My HR dashboard</displayName>
<description>This is the HR dashboard.</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
~ Floor, Boston, MA 02110-1301, USA.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->

<applications xmlns="http://documentation.bonitasoft.com/application-xml-schema/1.0">
<applications xmlns="http://documentation.bonitasoft.com/application-xml-schema/1.1">
<application profile="User" state="ACTIVATED" token="HR-dashboard" version="2.0" homePage="my-new-custom-page" layout="custompage_layoutBonita" theme="custompage_themeBonita">
<displayName>My HR dashboard</displayName>
<description>This is the HR dashboard.</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public void importApplications_should_create_applications_contained_by_xml_file_
assertThat(menuSearchResult.getResult().get(1).getDisplayName()).isEqualTo("Daily HR follow-up");
assertThat(menuSearchResult.getResult().get(1).getIndex()).isEqualTo(1);
assertThat(menuSearchResult.getResult().get(2).getDisplayName()).isEqualTo("Empty menu");
assertThat(menuSearchResult.getResult().get(1).getIndex()).isEqualTo(1);
assertThat(menuSearchResult.getResult().get(2).getIndex()).isEqualTo(3);

getLivingApplicationAPI().deleteApplication(app1.getId());
getPageAPI().deletePage(myPage.getId());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<applications xmlns="http://documentation.bonitasoft.com/application-xml-schema/1.0">
<applications xmlns="http://documentation.bonitasoft.com/application-xml-schema/1.1">
<application token="superAdminAppBonita" version="1.0" profile="_BONITA_INTERNAL_PROFILE_SUPER_ADMIN" state="ACTIVATED">
<displayName>Bonita Super Administrator Application</displayName>
<iconPath>bonita-super-admin-application.png</iconPath>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<applications xmlns="http://documentation.bonitasoft.com/application-xml-schema/1.0">
<applications xmlns="http://documentation.bonitasoft.com/application-xml-schema/1.1">
<application token="testAppBonita" version="1.0" profile="User" state="ACTIVATED"
layout="custompage_layoutBonita">
<displayName>Test App</displayName>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@Component
public class LivingApplicationDetector extends XmlDetector implements ArtifactDetector {

private static final String APPLICATION_NAMESPACE = "http://documentation.bonitasoft.com/application-xml-schema/1.0";
private static final String APPLICATION_NAMESPACE = "http://documentation.bonitasoft.com/application-xml-schema/1.1";

public LivingApplicationDetector() {
super(APPLICATION_NAMESPACE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ public class ApplicationArchiveReaderTest {
public void should_read_application_archive_with_a_live_application() throws Exception {
byte[] zip = zip(
file("apps/MyApp.xml",
"<applications xmlns=\"http://documentation.bonitasoft.com/application-xml-schema/1.0\"></applications>"));
"<applications xmlns=\"http://documentation.bonitasoft.com/application-xml-schema/1.1\"></applications>"));

ApplicationArchive applicationArchive = applicationArchiveReader.read(asInputStream(zip));

assertThat(applicationArchive.getApplications().size()).isEqualTo(1);
assertThat(applicationArchive.getApplications().get(0).getName()).isEqualTo("MyApp.xml");
assertThat(new String(Files.readAllBytes(applicationArchive.getApplications().get(0).toPath()))).contains(
"<applications xmlns=\"http://documentation.bonitasoft.com/application-xml-schema/1.0\"></applications>");
"<applications xmlns=\"http://documentation.bonitasoft.com/application-xml-schema/1.1\"></applications>");

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ public void exportApplications_should_call_marshall() throws Exception {

//then
assertThat(new String(bytes)).isEqualTo("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
"<applications xmlns=\"http://documentation.bonitasoft.com/application-xml-schema/1.0\"/>\n");
"<applications xmlns=\"http://documentation.bonitasoft.com/application-xml-schema/1.1\"/>\n");
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ springSessionVersion = "2.7.4"
springBootVersion = "2.7.18"
commonsLangVersion = "3.11"
junit5Version = "5.10.2"
bonitaArtifactsModelVersion = "1.0.0"
bonitaArtifactsModelVersion = "1.1.0-SNAPSHOT"
commonsIOVersion = "2.8.0"
commonsFileUploadVersion = "1.5"
commonsBeanutilsVersion = "1.9.4"
Expand Down

0 comments on commit eb0aae0

Please sign in to comment.