Skip to content

Commit

Permalink
[CLEANUP] updated versions via release version merger
Browse files Browse the repository at this point in the history
  • Loading branch information
buildguy committed Jul 8, 2024
1 parent eb5d432 commit cd074c7
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 35 deletions.
8 changes: 4 additions & 4 deletions assemblies/cda-foundry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<parent>
<groupId>pentaho</groupId>
<artifactId>cda-plugin-assemblies</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>

<artifactId>cda-foundry</artifactId>
<packaging>pom</packaging>

<properties>
<pdi-pur-plugin.version>10.2.0.0-SNAPSHOT</pdi-pur-plugin.version>
<pentaho-osgi-bundles.version>10.2.0.0-SNAPSHOT</pentaho-osgi-bundles.version>
<pdi-plugins-ee.version>10.2.0.0-SNAPSHOT</pdi-plugins-ee.version>
<pdi-pur-plugin.version>10.3.0.0-SNAPSHOT</pdi-pur-plugin.version>
<pentaho-osgi-bundles.version>10.3.0.0-SNAPSHOT</pentaho-osgi-bundles.version>
<pdi-plugins-ee.version>10.3.0.0-SNAPSHOT</pdi-plugins-ee.version>
<camel.karaf.version>2.17.7</camel.karaf.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion assemblies/cda-proxy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>cda-plugin-assemblies</artifactId>
<groupId>pentaho</groupId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>

<artifactId>cda-proxy</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions assemblies/feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
<parent>
<artifactId>cda-plugin-assemblies</artifactId>
<groupId>pentaho</groupId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>

<artifactId>pentaho-cda</artifactId>
<packaging>kar</packaging>

<properties>
<pdi-dataservice-client-plugin.version>10.2.0.0-SNAPSHOT</pdi-dataservice-client-plugin.version>
<pdi-dataservice-plugin.version>10.2.0.0-SNAPSHOT</pdi-dataservice-plugin.version>
<pentaho-osgi-bundles.version>10.2.0.0-SNAPSHOT</pentaho-osgi-bundles.version>
<pdi-dataservice-client-plugin.version>10.3.0.0-SNAPSHOT</pdi-dataservice-client-plugin.version>
<pdi-dataservice-plugin.version>10.3.0.0-SNAPSHOT</pdi-dataservice-plugin.version>
<pentaho-osgi-bundles.version>10.3.0.0-SNAPSHOT</pentaho-osgi-bundles.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/platform/cda-disabled/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>pentaho</groupId>
<artifactId>cda-plugin-assemblies-platform</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>

<artifactId>cda-disabled</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/platform/cda-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>pentaho</groupId>
<artifactId>cda-plugin-assemblies-platform</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>

<artifactId>cda-samples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/platform/cda/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>pentaho</groupId>
<artifactId>cda-plugin-assemblies-platform</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>

<artifactId>cda</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions assemblies/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>pentaho</groupId>
<artifactId>cda-plugin-assemblies</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>

<artifactId>cda-plugin-assemblies-platform</artifactId>
Expand All @@ -17,7 +17,7 @@
<module>cda-samples</module>
</modules>
<properties>
<pentaho-json.version>10.2.0.0-SNAPSHOT</pentaho-json.version>
<pentaho-json.version>10.3.0.0-SNAPSHOT</pentaho-json.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion assemblies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>pentaho</groupId>
<artifactId>cda-plugin</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>

<artifactId>cda-plugin-assemblies</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>pentaho</groupId>
<artifactId>cda-plugin</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>

<artifactId>cda-core</artifactId>
Expand All @@ -29,7 +29,7 @@
<dependency.jxl.revision>2.6.12</dependency.jxl.revision>
<dependency.jsr311-api.revision>1.1-ea</dependency.jsr311-api.revision>
<owasp.encoder.version>1.2</owasp.encoder.version>
<encryption-support.version>10.2.0.0-SNAPSHOT</encryption-support.version>
<encryption-support.version>10.3.0.0-SNAPSHOT</encryption-support.version>

</properties>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>cda-plugin</artifactId>
<groupId>pentaho</groupId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>

<groupId>org.pentaho.ctools</groupId>
Expand Down
8 changes: 4 additions & 4 deletions pentaho/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<parent>
<groupId>pentaho</groupId>
<artifactId>cda-plugin</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>
<groupId>pentaho</groupId>
<artifactId>cda-pentaho</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
<licenses>
<license>
<name>Mozilla Public License, Version 2.0</name>
<url>http://www.mozilla.org/MPL/2.0/index.txt</url>
</license>
</licenses>
<properties>
<platform.version>10.2.0.0-SNAPSHOT</platform.version>
<pentaho-report-wizard-core.version>10.2.0.0-SNAPSHOT</pentaho-report-wizard-core.version>
<platform.version>10.3.0.0-SNAPSHOT</platform.version>
<pentaho-report-wizard-core.version>10.3.0.0-SNAPSHOT</pentaho-report-wizard-core.version>
<webjars.target.directory>${build.dependenciesDirectory}/META-INF/resources/webjars</webjars.target.directory>
<js.project.list>jquery,jquery-ui</js.project.list>
</properties>
Expand Down
22 changes: 11 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.pentaho</groupId>
<artifactId>pentaho-ce-bundle-parent-pom</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>

<groupId>pentaho</groupId>
Expand Down Expand Up @@ -40,21 +40,21 @@
<properties>
<marketplace.metadata.sequential.build.id>${sequential.build.id}</marketplace.metadata.sequential.build.id>
<sequential.build.id>manual-${maven.build.timestamp}</sequential.build.id>
<pentaho-metadata.version>10.2.0.0-SNAPSHOT</pentaho-metadata.version>
<pentaho-metadata.version>10.3.0.0-SNAPSHOT</pentaho-metadata.version>
<marketplace.metadata.package_url></marketplace.metadata.package_url>
<marketplace.metadata.description></marketplace.metadata.description>
<project.stage>master</project.stage>
<dependency.mockito-core.revision>5.10.0</dependency.mockito-core.revision>
<marketplace.metadata.min_parent_version>1.0</marketplace.metadata.min_parent_version>
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
<pentaho-reporting.version>10.2.0.0-SNAPSHOT</pentaho-reporting.version>
<pdi-dataservice-client-plugin.version>10.2.0.0-SNAPSHOT</pdi-dataservice-client-plugin.version>
<pdi-dataservice-plugin.version>10.2.0.0-SNAPSHOT</pdi-dataservice-plugin.version>
<pdi.version>10.2.0.0-SNAPSHOT</pdi.version>
<pentaho-cpf-plugin.version>10.2.0.0-SNAPSHOT</pentaho-cpf-plugin.version>
<pentaho-json.version>10.2.0.0-SNAPSHOT</pentaho-json.version>
<pentaho-karaf.version>10.2.0.0-SNAPSHOT</pentaho-karaf.version>
<mondrian.version>10.2.0.0-SNAPSHOT</mondrian.version>
<pentaho-reporting.version>10.3.0.0-SNAPSHOT</pentaho-reporting.version>
<pdi-dataservice-client-plugin.version>10.3.0.0-SNAPSHOT</pdi-dataservice-client-plugin.version>
<pdi-dataservice-plugin.version>10.3.0.0-SNAPSHOT</pdi-dataservice-plugin.version>
<pdi.version>10.3.0.0-SNAPSHOT</pdi.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>
<pentaho-karaf.version>10.3.0.0-SNAPSHOT</pentaho-karaf.version>
<mondrian.version>10.3.0.0-SNAPSHOT</mondrian.version>
<marketplace.metadata.development_stage.phase>2</marketplace.metadata.development_stage.phase>
<marketplace.metadata.samples_url>http://nexus.pentaho.org/content/groups/omni/pentaho/cda-samples/6.0.0.0-353/cda-samples-6.0.0.0-353.zip</marketplace.metadata.samples_url>
<dependency.jericho-html.revision>3.1</dependency.jericho-html.revision>
Expand All @@ -65,7 +65,7 @@
<reactivestreams.version>1.0.2</reactivestreams.version>
<javax.servlet-api>3.0.1</javax.servlet-api>
<commons-collections.version>3.2.2</commons-collections.version>
<metastore.version>10.2.0.0-SNAPSHOT</metastore.version>
<metastore.version>10.3.0.0-SNAPSHOT</metastore.version>
<javax.ws.rs-api.version>2.0</javax.ws.rs-api.version>
<websocket-api.version>1.0</websocket-api.version>
<eigenbase-properties.version>1.1.2</eigenbase-properties.version>
Expand Down
4 changes: 2 additions & 2 deletions proxy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<artifactId>cda-plugin</artifactId>
<groupId>pentaho</groupId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cda-proxy-impl</artifactId>
<version>10.2.0.0-SNAPSHOT</version>
<version>10.3.0.0-SNAPSHOT</version>
<licenses>
<license>
<name>Mozilla Public License, Version 2.0</name>
Expand Down

0 comments on commit cd074c7

Please sign in to comment.