Skip to content

Commit 15bf1b1

Browse files
Merge pull request #64 from testomatio/remove-distribution-module
Removed distribution module
2 parents 3103ee3 + e3fa465 commit 15bf1b1

File tree

9 files changed

+7
-839
lines changed

9 files changed

+7
-839
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
echo "This ensures all internal dependencies are available locally before testing"
3232
3333
# Module build order (based on dependencies)
34-
MODULES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber" "distribution")
34+
MODULES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber")
3535
3636
for module in "${MODULES[@]}"; do
3737
if [ -d "$module" ]; then
@@ -64,7 +64,7 @@ jobs:
6464
run: |
6565
echo "🧪 Running tests for all modules..."
6666
67-
MODULES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber" "distribution")
67+
MODULES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber")
6868
6969
for module in "${MODULES[@]}"; do
7070
if [ -d "$module" ]; then

.github/workflows/releases.yml

Lines changed: 5 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Validate project structure
2929
run: |
3030
set -e
31-
REQUIRED_DIRS=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber" "distribution")
31+
REQUIRED_DIRS=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber")
3232
for dir in "${REQUIRED_DIRS[@]}"; do
3333
if [[ ! -d "$dir" ]] || [[ ! -f "$dir/pom.xml" ]]; then
3434
echo "❌ Missing: $dir"
@@ -108,7 +108,7 @@ jobs:
108108
echo "🔄 Setting version $VERSION in all modules individually..."
109109
110110
# List of all modules (each has its own pom.xml)
111-
MODULES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber" "distribution")
111+
MODULES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber")
112112
113113
for module in "${MODULES[@]}"; do
114114
if [[ -d "$module" && -f "$module/pom.xml" ]]; then
@@ -137,7 +137,7 @@ jobs:
137137
echo "🔄 Updating internal dependencies to version $VERSION..."
138138
139139
# Only modules that have internal dependencies (excluding Core)
140-
MODULES_WITH_DEPS=("java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber" "distribution")
140+
MODULES_WITH_DEPS=("java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber")
141141
142142
for module in "${MODULES_WITH_DEPS[@]}"; do
143143
if [[ -d "$module" && -f "$module/pom.xml" ]]; then
@@ -157,23 +157,6 @@ jobs:
157157
echo " ⚠️ java-reporter-core dependency not found"
158158
fi
159159
160-
# For distribution module, update all other internal dependencies
161-
if [[ "$module" == "distribution" ]]; then
162-
OTHER_DEPS=("java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber")
163-
for dep in "${OTHER_DEPS[@]}"; do
164-
echo " Updating $dep dependency..."
165-
if mvn versions:use-dep-version \
166-
-Dincludes="${{ env.GROUP_ID }}:$dep" \
167-
-DdepVersion="$VERSION" \
168-
-DforceVersion=true \
169-
-DgenerateBackupPoms=false \
170-
-B 2>/dev/null; then
171-
echo " ✅ Updated $dep to $VERSION"
172-
else
173-
echo " ⚠️ $dep dependency not found"
174-
fi
175-
done
176-
fi
177160
178161
cd .. || exit 1
179162
fi
@@ -187,7 +170,7 @@ jobs:
187170
VERSION=${{ steps.version.outputs.version }}
188171
echo "🔍 Verifying all module versions are set to $VERSION..."
189172
190-
MODULES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber" "distribution")
173+
MODULES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber")
191174
FAILED_MODULES=()
192175
193176
for module in "${MODULES[@]}"; do
@@ -435,77 +418,12 @@ jobs:
435418
436419
echo "✅ All Framework modules available"
437420
438-
- name: Deploy Distribution module
439-
run: |
440-
set -e
441-
VERSION=${{ steps.version.outputs.version }}
442-
echo "🚀 Deploying Distribution..."
443-
444-
cd distribution || { echo "❌ Cannot enter distribution directory"; exit 1; }
445-
446-
# Verify version is set correctly
447-
CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
448-
if [[ "$CURRENT_VERSION" != "$VERSION" ]]; then
449-
echo "❌ Version mismatch in distribution: expected $VERSION, got $CURRENT_VERSION"
450-
exit 1
451-
fi
452-
453-
# Force update all internal dependencies to the release version
454-
DEPENDENCIES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber")
455-
for dep in "${DEPENDENCIES[@]}"; do
456-
echo "Force updating $dep dependency to v$VERSION..."
457-
if ! mvn versions:use-dep-version \
458-
-Dincludes="${{ env.GROUP_ID }}:$dep" \
459-
-DdepVersion="$VERSION" \
460-
-DforceVersion=true \
461-
-DgenerateBackupPoms=false \
462-
-B; then
463-
echo "❌ Failed to update $dep dependency"
464-
exit 1
465-
fi
466-
done
467-
468-
# Verify all dependencies exist in pom.xml (simpler check)
469-
echo "Verifying dependency declarations in distribution module..."
470-
for dep in "${DEPENDENCIES[@]}"; do
471-
echo "Checking $dep dependency declaration..."
472-
if grep -q "$dep" pom.xml; then
473-
echo "✅ $dep dependency found in pom.xml"
474-
else
475-
echo "❌ Dependency $dep not found in distribution module"
476-
exit 1
477-
fi
478-
done
479-
480-
echo "✅ All dependencies verified in distribution module"
481-
482-
# Deploy Distribution
483-
for i in $(seq 1 ${{ env.MAX_RETRY_ATTEMPTS }}); do
484-
echo "Distribution deployment attempt $i..."
485-
if timeout ${{ env.MAVEN_TIMEOUT }} mvn clean deploy -P release -DskipTests -B \
486-
-Dmaven-compiler-plugin.version=3.11.0; then
487-
echo "✅ Distribution deployed successfully"
488-
cd .. || exit 1
489-
break
490-
elif [[ $i -eq ${{ env.MAX_RETRY_ATTEMPTS }} ]]; then
491-
echo "❌ Distribution deployment failed after ${{ env.MAX_RETRY_ATTEMPTS }} attempts"
492-
cd .. || exit 1
493-
exit 1
494-
else
495-
echo "Retrying in ${{ env.RETRY_DELAY }}s..."
496-
sleep ${{ env.RETRY_DELAY }}
497-
fi
498-
done
499-
env:
500-
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
501-
CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
502-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
503421
504422
- name: Verify deployment
505423
run: |
506424
set -e
507425
VERSION=${{ steps.version.outputs.version }}
508-
modules=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber" "java-reporter-distribution")
426+
modules=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber")
509427
510428
echo "🔍 Verifying deployment..."
511429
echo "Waiting 5 minutes for Maven Central propagation..."
@@ -551,7 +469,6 @@ jobs:
551469
echo "Deployed modules with correct dependency chain:"
552470
echo "• Core v${{ steps.version.outputs.version }}"
553471
echo "• Framework modules v${{ steps.version.outputs.version }} (depend on Core v${{ steps.version.outputs.version }})"
554-
echo "• Distribution v${{ steps.version.outputs.version }} (depends on all 4 modules v${{ steps.version.outputs.version }})"
555472
else
556473
echo "❌ Release v${{ steps.version.outputs.version }} failed!"
557474
echo "Check the workflow logs for detailed error information."

distribution/.gitignore

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)