Skip to content

Commit

Permalink
parent.version is overriden by parent version, duh
Browse files Browse the repository at this point in the history
  • Loading branch information
@matusfaro
matusfaro committed Nov 5, 2024
1 parent 9291af9 commit d6df479
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 42 deletions.
4 changes: 2 additions & 2 deletions dataspray-api-parent/dataspray-client-java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-api</artifactId>
<classifier>schema-control</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/openapi/</outputDirectory>
Expand All @@ -127,7 +127,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-api</artifactId>
<classifier>schema-ingest</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/openapi/</outputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion dataspray-api-parent/dataspray-client-typescript/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-api</artifactId>
<classifier>schema-control</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/openapi/</outputDirectory>
Expand Down
8 changes: 4 additions & 4 deletions dataspray-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,12 @@
<!-- <artifacts>-->
<!-- <artifact>-->
<!-- <path>-->
<!-- ${app.distribution.directory}/${project.artifactId}-${parent.version}.zip-->
<!-- ${app.distribution.directory}/${project.artifactId}-${parent-version}.zip-->
<!-- </path>-->
<!-- </artifact>-->
<!-- <artifact>-->
<!-- <path>-->
<!-- ${app.distribution.directory}/${project.artifactId}-${parent.version}.tar.gz-->
<!-- ${app.distribution.directory}/${project.artifactId}-${parent-version}.tar.gz-->
<!-- </path>-->
<!-- </artifact>-->
<!-- </artifacts>-->
Expand All @@ -204,7 +204,7 @@
<!-- <configuration>-->
<!-- <attach>false</attach>-->
<!-- <appendAssemblyId>false</appendAssemblyId>-->
<!-- <finalName>${project.artifactId}-${parent.version}-${os.detected.classifier}</finalName>-->
<!-- <finalName>${project.artifactId}-${parent-version}-${os.detected.classifier}</finalName>-->
<!-- <outputDirectory>${distribution.directory}</outputDirectory>-->
<!-- <workDirectory>${project.build.directory}/assembly/work</workDirectory>-->
<!-- <descriptors>-->
Expand Down Expand Up @@ -237,7 +237,7 @@
<!-- <generateInstaller>true</generateInstaller>-->
<!-- <administratorRequired>false</administratorRequired>-->
<!-- <platform>auto</platform>-->
<!-- <runnableJar>${project.build.directory}/${project.artifactId}-${parent.version}.jar-->
<!-- <runnableJar>${project.build.directory}/${project.artifactId}-${parent-version}.jar-->
<!-- </runnableJar>-->
<!-- <modules>-->
<!-- <module>java.base</module>-->
Expand Down
14 changes: 7 additions & 7 deletions dataspray-package/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-authorizer</artifactId>
<classifier>lambda</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/code-authorizer/</outputDirectory>
Expand All @@ -134,7 +134,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-stream-control</artifactId>
<classifier>lambda</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/code-control/</outputDirectory>
Expand All @@ -144,7 +144,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-stream-ingest</artifactId>
<classifier>lambda</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/code-ingest/</outputDirectory>
Expand All @@ -166,7 +166,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-site-landing</artifactId>
<classifier>static-site</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/site-landing-static/</outputDirectory>
Expand All @@ -176,7 +176,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-site-docs</artifactId>
<classifier>static-site</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/site-docs-static/</outputDirectory>
Expand All @@ -186,7 +186,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-site-dashboard</artifactId>
<classifier>static-site</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/site-dashboard-static/</outputDirectory>
Expand All @@ -196,7 +196,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-api</artifactId>
<classifier>schema-control</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/openapi/</outputDirectory>
Expand Down
4 changes: 2 additions & 2 deletions dataspray-remote-workspace/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
</goals>
<configuration>
<name>project.version-pep440</name>
<value>${parent.version}</value>
<value>${parent-version}</value>
<regex>-</regex>
<replacement>+</replacement>
<failIfNoMatch>false</failIfNoMatch>
Expand Down Expand Up @@ -368,7 +368,7 @@
<filter>@</filter>
<tags>
<tag>latest</tag>
<tag>${parent.version}</tag>
<tag>${parent-version}</tag>
</tags>
<args>
<PROJECT_VERSION>${project.version-pep440}</PROJECT_VERSION>
Expand Down
4 changes: 2 additions & 2 deletions dataspray-site-parent/dataspray-site-dashboard/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-resources</artifactId>
<classifier>logo</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.basedir}/public/</outputDirectory>
Expand All @@ -156,7 +156,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-resources</artifactId>
<classifier>logo</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.basedir}/public/logo/</outputDirectory>
Expand Down
6 changes: 3 additions & 3 deletions dataspray-site-parent/dataspray-site-docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-resources</artifactId>
<classifier>logo</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.basedir}/public/</outputDirectory>
Expand All @@ -161,7 +161,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-resources</artifactId>
<classifier>logo</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.basedir}/public/logo/</outputDirectory>
Expand All @@ -171,7 +171,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-api</artifactId>
<classifier>schema-control</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/openapi/</outputDirectory>
Expand Down
4 changes: 2 additions & 2 deletions dataspray-site-parent/dataspray-site-landing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-resources</artifactId>
<classifier>logo</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.basedir}/public/</outputDirectory>
Expand All @@ -149,7 +149,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-resources</artifactId>
<classifier>logo</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.basedir}/public/logo/</outputDirectory>
Expand Down
4 changes: 2 additions & 2 deletions dataspray-stream-control/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-common</artifactId>
<classifier>template-jaxrs-cxf</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/openapi/template/jaxrs-cxf
Expand All @@ -143,7 +143,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-api</artifactId>
<classifier>schema-control</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/openapi/</outputDirectory>
Expand Down
4 changes: 2 additions & 2 deletions dataspray-stream-ingest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-common</artifactId>
<classifier>template-jaxrs-cxf</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/openapi/template/jaxrs-cxf
Expand All @@ -143,7 +143,7 @@
<groupId>io.dataspray</groupId>
<artifactId>dataspray-api</artifactId>
<classifier>schema-ingest</classifier>
<version>${parent.version}</version>
<version>${parent-version}</version>
<type>tar.gz</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/openapi/</outputDirectory>
Expand Down
Loading

0 comments on commit d6df479

Please sign in to comment.