Skip to content

Commit c00f8af

Browse files
tdcmeehanrschlussel
authored andcommitted
Use Provisio plugin for packaging
1 parent 46eacc3 commit c00f8af

File tree

6 files changed

+336
-656
lines changed

6 files changed

+336
-656
lines changed

pom.xml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2368,7 +2368,8 @@
23682368
<groupId>org.sonatype.plugins</groupId>
23692369
<artifactId>nexus-staging-maven-plugin</artifactId>
23702370
<version>${dep.nexus-staging-plugin.version}</version>
2371-
<extensions>true</extensions>
2371+
<!-- This plugin is not registered as an extension because it will fail to activate
2372+
concurrently with the Maven Provisio plugin, as that has its own deployment lifecycle -->
23722373
<configuration>
23732374
<serverId>ossrh</serverId>
23742375
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
@@ -2397,6 +2398,13 @@
23972398
<artifactId>presto-maven-plugin</artifactId>
23982399
</plugin>
23992400

2401+
<plugin>
2402+
<groupId>ca.vanzyl.provisio.maven.plugins</groupId>
2403+
<artifactId>provisio-maven-plugin</artifactId>
2404+
<version>1.0.18</version>
2405+
<extensions>true</extensions>
2406+
</plugin>
2407+
24002408
<plugin>
24012409
<groupId>org.apache.maven.plugins</groupId>
24022410
<artifactId>maven-compiler-plugin</artifactId>
@@ -2576,9 +2584,31 @@
25762584
<id>deploy-to-ossrh</id>
25772585
<build>
25782586
<plugins>
2587+
<plugin>
2588+
<groupId>org.apache.maven.plugins</groupId>
2589+
<artifactId>maven-deploy-plugin</artifactId>
2590+
<configuration>
2591+
<skip>true</skip>
2592+
</configuration>
2593+
</plugin>
25792594
<plugin>
25802595
<groupId>org.sonatype.plugins</groupId>
25812596
<artifactId>nexus-staging-maven-plugin</artifactId>
2597+
<!-- This plugin must be configured manually ("Maven 2" style in the docs) due to the usage of the
2598+
Maven Provisio plugin, which includes its own deployment lifecycle -->
2599+
<executions>
2600+
<execution>
2601+
<id>default-deploy</id>
2602+
<phase>deploy</phase>
2603+
<goals>
2604+
<goal>deploy</goal>
2605+
</goals>
2606+
</execution>
2607+
</executions>
2608+
<configuration>
2609+
<serverId>ossrh</serverId>
2610+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
2611+
</configuration>
25822612
</plugin>
25832613
<plugin>
25842614
<groupId>org.apache.maven.plugins</groupId>

presto-product-tests/conf/docker/common/compose-commons.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export HADOOP_BASE_IMAGE=${HADOOP_BASE_IMAGE:-"prestodb/hdp2.6-hive"}
3333

3434
if [[ -z "${PRESTO_SERVER_DIR:-}" ]]; then
3535
source "${PRODUCT_TESTS_ROOT}/target/classes/presto.env"
36-
PRESTO_SERVER_DIR="${PROJECT_ROOT}/presto-server/target/presto-server-${PRESTO_VERSION}/presto-server-${PRESTO_VERSION}/"
36+
PRESTO_SERVER_DIR="${PROJECT_ROOT}/presto-server/target/presto-server-${PRESTO_VERSION}/"
3737
fi
3838
export_canonical_path PRESTO_SERVER_DIR
3939

0 commit comments

Comments
 (0)