Skip to content

Commit

Permalink
Remove Ant scripts and move to Maven only
Browse files Browse the repository at this point in the history
* We create a dedicated profile to generate the manual. We still rely on
  AntRun plugin; We manipulate the versions here to use on JDK 18+.
* We use the surefire report plugin to replace the reports task;
* Update the CI script to generate the reports and upload;
* Update the scripts to use only the Maven build.
  • Loading branch information
jabolina committed Jan 14, 2024
1 parent 23db442 commit 19cccc7
Show file tree
Hide file tree
Showing 13 changed files with 146 additions and 542 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,15 @@ jobs:
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml -Dgroups=functional

- name: Generate and upload test reports
# Only generate and upload reports if tests failed.
if: failure()
run: mvn -B surefire-report:report-only
uses: actions/upload-artifact@v4
with:
name: Test reports
# Once SUREFIRE-2219 is finished we can upload only the html report.
path: |
tmp/html/
tmp/test-results/xml/
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ doc/manual/target
doc/manual/*.css
doc/manual/build/*
doc/manual/*.tmp
doc/manual/*-generated.adoc
doc/tutorial/target
conf/MANIFEST.MF
target/
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Builds an image containing jgroups-raft

## ***************************************************************
## Make sure you have jgroups-raft compiled (ant) before doing so!
## Make sure you have jgroups-raft compiled (mvn clean package) before doing so!
## ***************************************************************

## The first stage is used to prepare/update the OS.
Expand Down Expand Up @@ -29,8 +29,8 @@ WORKDIR /opt/jgroups
COPY --from=build-stage /bin/ping /bin/netstat /bin/nc /bin/
COPY --from=build-stage /sbin/ifconfig /sbin/
COPY README.md $JGROUPS_RAFT_HOME/
COPY ./classes $JGROUPS_RAFT_HOME/classes
COPY ./lib $JGROUPS_RAFT_HOME/lib
COPY ./target/classes $JGROUPS_RAFT_HOME/classes
COPY ./target/libs $JGROUPS_RAFT_HOME/lib
COPY ./bin $JGROUPS_RAFT_HOME/bin
COPY ./conf $JGROUPS_RAFT_HOME/conf

Expand Down
12 changes: 3 additions & 9 deletions bin/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,9 @@
MCAST_ADDR=232.5.5.5
BIN_DIR=`dirname $0`

# set MAVEN_BUILD=1 to use the classes generated by maven
if [ "${MAVEN_BUILD}" == "1" ]; then
LIB=${BIN_DIR}/../target/libs
CLASSES=${BIN_DIR}/../target/classes
else
# Ant build
LIB=${BIN_DIR}/../lib
CLASSES=${BIN_DIR}/../classes
fi
# Project built with Maven.
LIB=${BIN_DIR}/../target/libs
CLASSES=${BIN_DIR}/../target/classes
CONF=`dirname $0`/../conf

CP=$CLASSES:$CONF:$LIB/*
Expand Down
19 changes: 0 additions & 19 deletions build.properties.template

This file was deleted.

Loading

0 comments on commit 19cccc7

Please sign in to comment.