Skip to content

Rebase to Master #1057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
krishnaalluhitachi merged 3 commits into from
Jul 3, 2025
Merged

Rebase to Master #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cd9029
fix: add proper initialization to XML parser [PPP-5719] (#1055)
joana-fb Jun 17, 2025
181626d
Revert "fix: add proper initialization to XML parser [PPP-5719] (#105…
smmribeiro Jun 20, 2025
307bad5
[CLEANUP] updated versions via release version merger
Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assemblies/cde-renderer/docker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-renderer-assembly</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>cde-renderer-docker</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/cde-renderer/feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-renderer-assembly</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>pentaho-cde-renderer</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/cde-renderer/karaf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-renderer-assembly</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>cde-renderer-karaf-assembly</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions assemblies/cde-renderer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin-assemblies</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>cde-renderer-assembly</artifactId>
Expand All @@ -25,8 +25,8 @@
<properties>
<assembly.tarLongFileMode>posix</assembly.tarLongFileMode>

<pentaho-osgi-bundles.version>10.3.0.0-SNAPSHOT</pentaho-osgi-bundles.version>
<common-ui.version>10.3.0.0-SNAPSHOT</common-ui.version>
<pentaho-osgi-bundles.version>11.0.0.0-SNAPSHOT</pentaho-osgi-bundles.version>
<common-ui.version>11.0.0.0-SNAPSHOT</common-ui.version>
</properties>

</project>
2 changes: 1 addition & 1 deletion assemblies/cde-renderer/solr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-renderer-assembly</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion assemblies/pdi/cde-plugin-pdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin-assemblies-pdi</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/pdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin-assemblies</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-plugin-assemblies-pdi</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/platform/pentaho-cdf-dd-disabled/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin-assemblies-platform</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>pentaho-cdf-dd-disabled</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/platform/pentaho-cdf-dd-rca/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin-assemblies-platform</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>pentaho-cdf-dd-rca</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/platform/pentaho-cdf-dd-samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin-assemblies-platform</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>pentaho-cdf-dd-samples</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/platform/pentaho-cdf-dd/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin-assemblies-platform</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>pentaho-cdf-dd</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin-assemblies</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-plugin-assemblies-platform</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>cde-plugin-assemblies</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/assemblies/cde-components-pdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-components-assemblies</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>cde-components-pdi</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/assemblies/cde-components-platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-components-assemblies</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>cde-components-platform</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/assemblies/cde-components-webpackage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-components-assemblies</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>cde-components-webpackage</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/assemblies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-components</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-components-assemblies</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion components/impls/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-components-impls</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-components-impls-core</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion components/impls/osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-components-impls</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-components-impls-osgi</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion components/impls/pentaho/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-components-impls</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-components-impls-pentaho</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion components/impls/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-components</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-components-impls</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion components/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-components</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-core</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>cde-core-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-core</artifactId>
<packaging>pom</packaging>
Expand Down
4 changes: 2 additions & 2 deletions foundry-extensions/impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<artifactId>cde-foundry-extensions</artifactId>
<groupId>org.pentaho.ctools</groupId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cde-foundry-extensions-impl</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>Pentaho Community Dashboard Editor Foundry Extensions Implementation</description>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions foundry-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<artifactId>cde-plugin</artifactId>
<groupId>org.pentaho.ctools</groupId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cde-foundry-extensions</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Pentaho Community Dashboard Editor specifics intended to be available on a Foundry environment</description>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion osgi/impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-osgi</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>cde-osgi-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-osgi</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion pentaho/impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-pentaho</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>cde-pentaho-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pentaho/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-pentaho</artifactId>
<packaging>pom</packaging>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho</groupId>
<artifactId>pentaho-ce-bundle-parent-pom</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<groupId>org.pentaho.ctools</groupId>
Expand Down Expand Up @@ -45,11 +45,11 @@
<global.require.file>cde-require-js-cfg.js</global.require.file>
<requirejs.config.files.pattern>**/*-require-js-cfg.js</requirejs.config.files.pattern>

<pentaho-cdf-plugin.version>10.3.0.0-SNAPSHOT</pentaho-cdf-plugin.version>
<pentaho-cpf-plugin.version>10.3.0.0-SNAPSHOT</pentaho-cpf-plugin.version>
<pentaho-json.version>10.3.0.0-SNAPSHOT</pentaho-json.version>
<mondrian.version>10.3.0.0-SNAPSHOT</mondrian.version>
<platform.version>10.3.0.0-SNAPSHOT</platform.version>
<pentaho-cdf-plugin.version>11.0.0.0-SNAPSHOT</pentaho-cdf-plugin.version>
<pentaho-cpf-plugin.version>11.0.0.0-SNAPSHOT</pentaho-cpf-plugin.version>
<pentaho-json.version>11.0.0.0-SNAPSHOT</pentaho-json.version>
<mondrian.version>11.0.0.0-SNAPSHOT</mondrian.version>
<platform.version>11.0.0.0-SNAPSHOT</platform.version>

<commons-io.version>1.4</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
Expand Down
2 changes: 1 addition & 1 deletion samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>

<artifactId>cde-samples-webpackage</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion webclient/impls/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-webclient-impls</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-webclient-impls-core</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion webclient/impls/pentaho/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-webclient-impls</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-webclient-impls-pentaho</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion webclient/impls/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-webclient</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-webclient-impls</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion webclient/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho.ctools</groupId>
<artifactId>cde-plugin</artifactId>
<version>10.3.0.0-SNAPSHOT</version>
<version>11.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>cde-webclient</artifactId>
<packaging>pom</packaging>
Expand Down
Loading