Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 ci/release/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pipeline {
)
string(
name: 'DEVELOPMENT_VERSION',
defaultValue: '7.1.1-SNAPSHOT',
defaultValue: '7.1.2-SNAPSHOT',
description: 'The next version to be used after the release, e.g. 7.1.2-SNAPSHOT.',
trim: true
)
Expand Down
26 changes: 18 additions & 8 deletions gradle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@
<gradle.executable>./gradlew</gradle.executable>
</properties>

<dependencies>
<dependency>
<groupId>org.hibernate.tool</groupId>
<artifactId>hibernate-tools-orm</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<!-- Maven deploy is skipped on purpose as Gradle build will stage the artifact itself. -->
Expand All @@ -67,7 +60,7 @@
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>gradle</id>
<id>gradle-package</id>
<phase>prepare-package</phase>
<configuration>
<executable>${gradle.executable}</executable>
Expand All @@ -76,6 +69,22 @@
<argument>build</argument>
<argument>-PprojectVersion=${project.version}</argument>
<argument>-Ph2Version=${h2.version}</argument>
<argument>-Dmaven.repo.local=${settings.localRepository}</argument>
</arguments>
</configuration>
<goals>
<goal>exec</goal>
</goals>
</execution>
<execution>
<id>gradle-clean</id>
<phase>clean</phase>
<configuration>
<executable>${gradle.executable}</executable>
<arguments>
<argument>clean</argument>
<argument>-PprojectVersion=${project.version}</argument>
<argument>-Ph2Version=${h2.version}</argument>
</arguments>
</configuration>
<goals>
Expand Down Expand Up @@ -112,6 +121,7 @@
<argument>publishPluginMavenPublicationToStagingRepository</argument>
<argument>-PprojectVersion=${project.version}</argument>
<argument>-Ph2Version=${h2.version}</argument>
<argument>-Dmaven.repo.local=${settings.localRepository}</argument>
<argument>-PmavenStagingDirectory=${local.staging.releases.repo.url}</argument>
</arguments>
</configuration>
Expand Down