Skip to content

Commit b181a0a

Browse files
committed
switch build to pure maven (from ant)
1 parent b221b0d commit b181a0a

File tree

11 files changed

+1288
-645
lines changed

11 files changed

+1288
-645
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ jobs:
3232
uses: actions/cache@v4
3333
with:
3434
path: ~/.m2
35-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
36-
restore-keys: |
37-
${{ runner.os }}-maven-
35+
key: maven
3836

3937
- name: Extract version number
4038
id: extract-version
@@ -43,7 +41,7 @@ jobs:
4341
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
4442
4543
- name: Build extension
46-
run: mvn -B -e -f pom.xml clean install -Dgoal=install
44+
run: mvn -B -e clean verify
4745

4846
- name: Upload Artifact
4947
uses: actions/upload-artifact@v4
@@ -71,9 +69,7 @@ jobs:
7169
uses: actions/cache@v4
7270
with:
7371
path: ~/.m2
74-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
75-
restore-keys: |
76-
${{ runner.os }}-maven-
72+
key: maven
7773

7874
- name: Cache Lucee files
7975
uses: actions/cache@v4
@@ -122,9 +118,7 @@ jobs:
122118
uses: actions/cache@v4
123119
with:
124120
path: ~/.m2
125-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
126-
restore-keys: |
127-
${{ runner.os }}-maven-
121+
key: maven
128122

129123
- name: Import GPG key
130124
run: |
@@ -140,11 +134,11 @@ jobs:
140134
run: |
141135
if [[ "${{ needs.build.outputs.version }}" == *-SNAPSHOT ]]; then
142136
echo "------- Maven Deploy snapshot -------";
143-
mvn -B -e -f pom.xml clean deploy -Dgoal=deploy --settings maven-settings.xml
137+
mvn -B -e clean deploy --settings maven-settings.xml
144138
elif [[ "${{ needs.build.outputs.version }}" == *-ALPHA ]]; then
145139
echo "------- Maven Install alpha -------";
146-
mvn -B -e -f pom.xml clean install -Dgoal=install --settings maven-settings.xml
140+
mvn -B -e clean install --settings maven-settings.xml
147141
else
148142
echo "------- Maven Deploy release -------";
149-
mvn -B -e -f pom.xml clean deploy -Dgoal=deploy -DperformRelease=true --settings maven-settings.xml
143+
mvn -B -e clean deploy -DperformRelease=true --settings maven-settings.xml
150144
fi

build.properties

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
bundlename: crypto.extension
2-
filename: crypto-extension
3-
bundleversion: 1.0.0.0
1+
# Extension metadata (used by Maven build for MANIFEST.MF)
42
extensionId: 17AB52DE-B300-A94B-E058FC978BE4542D
53
luceeCoreVersion: 6.0.0.585
64
releaseType: server
7-
appendix: -SNAPSHOT
85
label: Crypto Extension
96
description: BouncyCastle-based cryptographic functions
10-
mvnGroupId: org.lucee
11-
mvnGroupPath: org/lucee
12-
mvnArtifactId: extension-crypto

build.xml

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

0 commit comments

Comments
 (0)