You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by yo...@apache.org on 2022/08/03 02:46:46 UTC
[bookkeeper] branch branch-4.15 updated: Remove gradle from workflow (#3314)
This is an automated email from the ASF dual-hosted git repository.
yong pushed a commit to branch branch-4.15
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/branch-4.15 by this push:
new 107ded7dc4 Remove gradle from workflow (#3314)
107ded7dc4 is described below
commit 107ded7dc46d74976c0f0de37271371f51b5687d
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Thu Jun 16 16:11:58 2022 +0800
Remove gradle from workflow (#3314)
* Remove gradle from workflow
* add dep
(cherry picked from commit 9de724203cf09a8e160d82781eb27b39cc8ccd22)
---
.github/workflows/backward-compat-tests.yml | 13 +++++-----
.github/workflows/pr-validation.yml | 1 -
pom.xml | 6 +++++
tests/integration-tests-base-groovy/pom.xml | 34 ++++++++++++++------------
tools/all/pom.xml | 37 ++++++++++++-----------------
5 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/.github/workflows/backward-compat-tests.yml b/.github/workflows/backward-compat-tests.yml
index fbed344ebe..65c2812de3 100644
--- a/.github/workflows/backward-compat-tests.yml
+++ b/.github/workflows/backward-compat-tests.yml
@@ -31,7 +31,7 @@ on:
workflow_dispatch:
env:
- GRADLE_ARGS: -Dtestlogger.theme=plain -DtestHideStandardOut=true
+ MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
jobs:
test:
@@ -49,11 +49,12 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.8
- - name: Build
- run: ./gradlew stream:server:build -x test ${GRADLE_ARGS}
+ - name: Install Module
+ run: mvn -B -nsu clean install -DskipTests
- name: Test current server with old clients
- run: ./gradlew :tests:backward-compat:current-server-old-clients:test ${GRADLE_ARGS} || (tail -n +1 tests/backward-compat/current-server-old-clients/build/reports/tests/test/classes/* && tail -n +1 tests/backward-compat/current-server-old-clients/build/container-logs/**/* && exit 1)
+ run: mvn -B -nsu -DintegrationTests -pl :backward-compat-current-server-old-clients test
- name: Test progressive upgrade
- run: ./gradlew :tests:backward-compat:upgrade:test ${GRADLE_ARGS} || (tail -n +1 tests/backward-compat/upgrade/build/reports/tests/test/classes/* && tail -n +1 tests/backward-compat/upgrade/build/container-logs/**/* && exit 1)
+ run: mvn -B -nsu -DintegrationTests -pl :upgrade test
- name: Other tests
- run: ./gradlew :tests:backward-compat:test -x tests:backward-compat:upgrade:test -x :tests:backward-compat:current-server-old-clients:test ${GRADLE_ARGS}
+ run: |
+ mvn -B -nsu -DintegrationTests -pl :bc-non-fips,:hierarchical-ledger-manager,:hostname-bookieid,:old-cookie-new-cluster,:recovery-no-password,:upgrade-direct,:yahoo-custom-version test
diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
index 632dc5c31b..56c9a8e92f 100644
--- a/.github/workflows/pr-validation.yml
+++ b/.github/workflows/pr-validation.yml
@@ -32,7 +32,6 @@ on:
env:
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
- GRADLE_ARGS: -Dtestlogger.theme=plain -DtestHideStandardOut=true
jobs:
check:
diff --git a/pom.xml b/pom.xml
index 01ccf1604b..6ea2302eec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,7 @@
<dockerfile-maven-plugin.version>1.4.13</dockerfile-maven-plugin.version>
<download-maven-plugin.version>1.6.8</download-maven-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+ <gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
<license-maven-plugin.version>1.6</license-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.0</jacoco-maven-plugin.version>
<lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>
@@ -726,6 +727,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>${arquillian-junit.version}</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml
index 5b403d92ff..12b385a7f4 100644
--- a/tests/integration-tests-base-groovy/pom.xml
+++ b/tests/integration-tests-base-groovy/pom.xml
@@ -65,25 +65,20 @@
<extensions>true</extensions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- <version>2.0</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${groovy.version}</version>
- <type>pom</type>
- </dependency>
- </dependencies>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>${gmavenplus-plugin.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compileTests</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <!-- DO NOT CHANGE VERSION
- Versions newer than 2.8.1 do not respect useSystemClassLoader=false
- https://issues.apache.org/jira/browse/SUREFIRE-1476 //-->
- <version>2.8.1</version>
<configuration>
<argLine>-Xmx4G -Djava.net.preferIPv4Stack=true ${test.additional.args}</argLine>
<forkCount>1</forkCount>
@@ -104,6 +99,15 @@
<artifactId>groovy-all</artifactId>
<type>pom</type>
</dependency>
+ <dependency>
+ <groupId>org.arquillian.cube</groupId>
+ <artifactId>arquillian-cube-docker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<pluginRepositories>
<pluginRepository>
diff --git a/tools/all/pom.xml b/tools/all/pom.xml
index ac15e6bb12..759348fee8 100644
--- a/tools/all/pom.xml
+++ b/tools/all/pom.xml
@@ -60,30 +60,23 @@
</target>
</configuration>
</execution>
+ <execution>
+ <id>append-stream-commands</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <concat destfile="${project.basedir}/src/main/resources/META-INF/services/org.apache.bookkeeper.tools.framework.CommandGroup" append="true">
+ <filelist dir="${project.basedir}/../stream/src/main/resources" files="commands">
+ </filelist>
+ </concat>
+ </target>
+ </configuration>
+ </execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${maven-antrun-plugin.version}</version>
- <executions>
- <execution>
- <id>append-stream-commands</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <concat destfile="${project.basedir}/src/main/resources/META-INF/services/org.apache.bookkeeper.tools.framework.CommandGroup" append="true">
- <filelist dir="${project.basedir}/../stream/src/main/resources" files="commands">
- </filelist>
- </concat>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>