Skip to content

Commit 27f90f7

Browse files
authored
Merge pull request #6136 from dizzzz/ci/6xx_make_appdir_stable
[ci] 6XX Make sure that upon version bump no paths need to be changed
2 parents 7975cdc + fee6f9a commit 27f90f7

9 files changed

Lines changed: 11 additions & 11 deletions

File tree

.idea/runConfigurations/Java_Admin_Client.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Jetty_Server.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Local_Jetty_Server.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exist-core-jcstress/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>org.exist-db</groupId>
3030
<artifactId>exist-parent</artifactId>
31-
<version>6.4.1-SNAPSHOT</version>
31+
<version>6.4.2-SNAPSHOT</version>
3232
<relativePath>../exist-parent</relativePath>
3333
</parent>
3434

exist-core-jmh/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>org.exist-db</groupId>
3030
<artifactId>exist-parent</artifactId>
31-
<version>6.4.1-SNAPSHOT</version>
31+
<version>6.4.2-SNAPSHOT</version>
3232
<relativePath>../exist-parent</relativePath>
3333
</parent>
3434

exist-distribution/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</scm>
4747

4848
<properties>
49-
<assemble.dir>${project.build.directory}/${project.artifactId}-${project.version}-dir</assemble.dir>
49+
<assemble.dir>${project.build.directory}/${project.artifactId}-dir</assemble.dir>
5050
<public.xar.repo.uri>http://exist-db.org/exist/apps/public-repo</public.xar.repo.uri>
5151
<expath.pkg.dir>${project.build.directory}/expath-pkgs</expath.pkg.dir>
5252
<mac.bundle.dir>${project.build.directory}/${project.artifactId}-${project.version}.app</mac.bundle.dir>

exist-docker/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
</goals>
129129
<configuration>
130130
<archiveBaseDirectory>
131-
${project.basedir}/../exist-distribution/target/exist-distribution-${project.version}-dir</archiveBaseDirectory>
131+
${project.basedir}/../exist-distribution/target/exist-distribution-dir</archiveBaseDirectory>
132132
<attach>false</attach>
133133
<descriptors>
134134
<descriptor>src/assembly/dist-assembly-docker.xml</descriptor>

exist-installer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<extensions>true</extensions>
117117
<configuration>
118118
<installFile>${izpack.resources.target}/install.xml</installFile>
119-
<baseDir>${basedir}/../exist-distribution/target/exist-distribution-${project.version}-dir</baseDir>
119+
<baseDir>${basedir}/../exist-distribution/target/exist-distribution-dir</baseDir>
120120
<includeProperties>apache.httpcomponents.core.version,apache.httpcomponents.version,apache.xmlrpc.version,appassembler.version,aspectj.version,build-commit-abbrev,build-commit,build-tag-delta,build-tag,build-tstamp,build-version,contact.email,exquery.distribution.version,icu.version,jetty.version,izpack.installation.info.appversion,izpack.installation.info.author.email,izpack.installation.info.author.name,izpack.installation.info.url,izpack.resources.src,izpack.resources.target,izpack.version,jansi.version,jaxb.api.version,jaxb.impl.version,jdom1.version,log4j.version,lucene.version,milton.version,project.build.source,project.build.sourceEncoding,project.build.target,project.copyright.name,saxon.version,xmlresolver.version</includeProperties>
121121
<autoIncludeUrl>true</autoIncludeUrl>
122122
<autoIncludeDevelopers>true</autoIncludeDevelopers>

exist-xqts/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</scm>
4747

4848
<properties>
49-
<assemble.dir>${project.build.directory}/${project.artifactId}-${project.version}-dir</assemble.dir>
49+
<assemble.dir>${project.build.directory}/${project.artifactId}-dir</assemble.dir>
5050
</properties>
5151

5252
<dependencies>

0 commit comments

Comments
 (0)