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 Dec 14, 2021
1 parent ac75a8a commit 03cecb7
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 62 deletions.
9 changes: 4 additions & 5 deletions assemblies/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>pentaho</groupId>
<artifactId>pentaho-mondrian-parent-pom</artifactId>
<version>9.3.0.0-SNAPSHOT</version>
<version>9.3.0.0-14</version>
</parent>
<groupId>pentaho</groupId>
<artifactId>pentaho-mondrian-assemblies</artifactId>
<version>9.3.0.0-SNAPSHOT</version>
<version>9.3.0.0-14</version>
<packaging>pom</packaging>
<name>Pentaho Mondrian Assemblies</name>
<description>Packages Mondrian artifacts</description>
Expand Down
21 changes: 10 additions & 11 deletions assemblies/psw-ce/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>pentaho</groupId>
<artifactId>pentaho-mondrian-assemblies</artifactId>
<version>9.3.0.0-SNAPSHOT</version>
<version>9.3.0.0-14</version>
</parent>
<artifactId>psw-ce</artifactId>
<version>9.3.0.0-SNAPSHOT</version>
<version>9.3.0.0-14</version>
<packaging>pom</packaging>
<name>Pentaho Schema Workbench - CE</name>
<description>Mondrian Schema Workbench</description>
<url>http://mondrian.pentaho.com</url>
<properties>
<jlfgr.version>1.0</jlfgr.version>
<pentaho-launcher.version>9.3.0.0-SNAPSHOT</pentaho-launcher.version>
<pentaho-launcher.version>9.3.0.0-14</pentaho-launcher.version>
<guava.version>17.0</guava.version>
<dependency.groovy-all.revision>2.4.8</dependency.groovy-all.revision>
<pdi-dataservice-client-plugin.version>9.3.0.0-SNAPSHOT</pdi-dataservice-client-plugin.version>
<oss-licenses.version>9.3.0.0-SNAPSHOT</oss-licenses.version>
<pdi-dataservice-client-plugin.version>9.3.0.0-14</pdi-dataservice-client-plugin.version>
<oss-licenses.version>9.3.0.0-14</oss-licenses.version>
<dependency.jersey.revision>1.19.1</dependency.jersey.revision>
<pdi.version>9.3.0.0-SNAPSHOT</pdi.version>
<commons-xul.version>9.3.0.0-SNAPSHOT</commons-xul.version>
<mondrian-schemaworkbench-plugins.version>9.3.0.0-SNAPSHOT</mondrian-schemaworkbench-plugins.version>
<pdi.version>9.3.0.0-14</pdi.version>
<commons-xul.version>9.3.0.0-14</commons-xul.version>
<mondrian-schemaworkbench-plugins.version>9.3.0.0-14</mondrian-schemaworkbench-plugins.version>
</properties>
<dependencies>
<dependency>
Expand Down
47 changes: 23 additions & 24 deletions mondrian/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>pentaho</groupId>
<artifactId>pentaho-mondrian-parent-pom</artifactId>
<version>9.3.0.0-SNAPSHOT</version>
<version>9.3.0.0-14</version>
</parent>
<artifactId>mondrian</artifactId>
<version>9.3.0.0-SNAPSHOT</version>
<version>9.3.0.0-14</version>
<name>Pentaho Community Edition Project: ${project.artifactId}</name>
<description>Mondrian OLAP Engine</description>
<url>http://mondrian.pentaho.com</url>
Expand Down Expand Up @@ -188,25 +187,25 @@
</goals>
<configuration>
<target>
<property name="classpath" refid="maven.compile.classpath" />
<property name="java.dir" value="${project.build.sourceDirectory}" />
<property name="relative.java.dir" value="src/main/java" />
<property name="relative.resources.dir" value="src/main/resources" />
<property name="generated.java.dir" value="${project.basedir}/src/generated/java" />
<property name="generated.resources.dir" value="${project.basedir}/src/generated/resources" />
<property name="relative.generated.java.dir" value="src/generated/java" />
<property name="classes.dir" value="${project.build.outputDirectory}" />
<property name="classpath" refid="maven.compile.classpath"/>
<property name="java.dir" value="${project.build.sourceDirectory}"/>
<property name="relative.java.dir" value="src/main/java"/>
<property name="relative.resources.dir" value="src/main/resources"/>
<property name="generated.java.dir" value="${project.basedir}/src/generated/java"/>
<property name="generated.resources.dir" value="${project.basedir}/src/generated/resources"/>
<property name="relative.generated.java.dir" value="src/generated/java"/>
<property name="classes.dir" value="${project.build.outputDirectory}"/>
<property name="build.compiler" value="extJavac"/>
<mkdir dir="${project.build.outputDirectory}" />
<mkdir dir="${generated.java.dir}/mondrian/olap" />
<mkdir dir="${generated.java.dir}/mondrian/rolap/aggmatcher" />
<mkdir dir="${generated.java.dir}/mondrian/xmla" />
<mkdir dir="${generated.java.dir}/mondrian/parser" />
<ant target="def" />
<ant target="generate.properties" />
<ant target="generate.resources" />
<ant target="parser" />
<ant target="version" />
<mkdir dir="${project.build.outputDirectory}"/>
<mkdir dir="${generated.java.dir}/mondrian/olap"/>
<mkdir dir="${generated.java.dir}/mondrian/rolap/aggmatcher"/>
<mkdir dir="${generated.java.dir}/mondrian/xmla"/>
<mkdir dir="${generated.java.dir}/mondrian/parser"/>
<ant target="def"/>
<ant target="generate.properties"/>
<ant target="generate.resources"/>
<ant target="parser"/>
<ant target="version"/>
</target>
</configuration>
</execution>
Expand Down Expand Up @@ -405,7 +404,7 @@
</goals>
<configuration>
<tasks>
<copy file="${project.build.directory}/mysql-dist/my-default.ini" tofile="${project.build.directory}/mysql-dist/support-files/my-default.cnf" failonerror="false" />
<copy failonerror="false" file="${project.build.directory}/mysql-dist/my-default.ini" tofile="${project.build.directory}/mysql-dist/support-files/my-default.cnf"/>
</tasks>
</configuration>
</execution>
Expand Down
9 changes: 4 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.pentaho</groupId>
<artifactId>pentaho-ce-jar-parent-pom</artifactId>
<version>9.3.0.0-SNAPSHOT</version>
<version>9.3.0.0-14</version>
</parent>
<groupId>pentaho</groupId>
<artifactId>pentaho-mondrian-parent-pom</artifactId>
<version>9.3.0.0-SNAPSHOT</version>
<version>9.3.0.0-14</version>
<packaging>pom</packaging>
<name>Pentaho Mondrian Parent POM</name>
<description>Container pom for mondrian and mondrian workbench</description>
Expand Down
33 changes: 16 additions & 17 deletions workbench/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>pentaho</groupId>
<artifactId>pentaho-mondrian-parent-pom</artifactId>
<version>9.3.0.0-SNAPSHOT</version>
<version>9.3.0.0-14</version>
</parent>
<artifactId>workbench</artifactId>
<version>9.3.0.0-SNAPSHOT</version>
<version>9.3.0.0-14</version>
<name>Pentaho Community Edition Project: ${project.artifactId}</name>
<description>Mondrian Schema Workbench</description>
<url>http://mondrian.pentaho.com</url>
<properties>
<jlfgr.version>1.0</jlfgr.version>
<pentaho-launcher.version>9.3.0.0-SNAPSHOT</pentaho-launcher.version>
<pentaho-launcher.version>9.3.0.0-14</pentaho-launcher.version>
<dependency.groovy-all.revision>2.4.8</dependency.groovy-all.revision>
<pdi-dataservice-client-plugin.version>9.3.0.0-SNAPSHOT</pdi-dataservice-client-plugin.version>
<oss-licenses.version>9.3.0.0-SNAPSHOT</oss-licenses.version>
<pdi-dataservice-client-plugin.version>9.3.0.0-14</pdi-dataservice-client-plugin.version>
<oss-licenses.version>9.3.0.0-14</oss-licenses.version>
<dependency.jersey.revision>1.19.1</dependency.jersey.revision>
<pdi.version>9.3.0.0-SNAPSHOT</pdi.version>
<commons-xul.version>9.3.0.0-SNAPSHOT</commons-xul.version>
<pdi.version>9.3.0.0-14</pdi.version>
<commons-xul.version>9.3.0.0-14</commons-xul.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -155,13 +154,13 @@
<configuration>
<target>
<property name="build.compiler" value="extJavac"/>
<property name="classpath" refid="maven.compile.classpath" />
<property name="relative.java.dir" value="src/main/java" />
<property name="relative.generated.java.dir" value="src/generated/java" />
<property name="generated.java.dir" value="${project.basedir}/src/generated/java" />
<mkdir dir="${project.build.outputDirectory}" />
<mkdir dir="${generated.java.dir}/mondrian/olap" />
<ant target="def" />
<property name="classpath" refid="maven.compile.classpath"/>
<property name="relative.java.dir" value="src/main/java"/>
<property name="relative.generated.java.dir" value="src/generated/java"/>
<property name="generated.java.dir" value="${project.basedir}/src/generated/java"/>
<mkdir dir="${project.build.outputDirectory}"/>
<mkdir dir="${generated.java.dir}/mondrian/olap"/>
<ant target="def"/>
</target>
</configuration>
</execution>
Expand Down

0 comments on commit 03cecb7

Please sign in to comment.