Skip to content

Commit bfe1bb4

Browse files
author
rmpestano
committed
Fixes #210
1 parent 283536c commit bfe1bb4

4 files changed

Lines changed: 52 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,12 @@ jobs:
5353
restore-keys: |
5454
${{ runner.os }}-maven-
5555
- name: Deploy snapshots
56-
run: mvn deploy --settings settings.xml
5756
if: "contains(github.ref, 'master') && !contains(github.event.head_commit.message, 'prepare release')"
57+
run: |
58+
chmod +x "${GITHUB_WORKSPACE}/release-snapshots.sh"
59+
"${GITHUB_WORKSPACE}/release-snapshots.sh"
5860
- name: Release
59-
run: mvn deploy -Prelease
60-
if: "contains(github.ref, 'master') && contains(github.event.head_commit.message, 'prepare release')"
61+
if: "contains(github.ref, 'master') && contains(github.event.head_commit.message, 'prepare release')"
62+
run: |
63+
chmod +x "${GITHUB_WORKSPACE}/release.sh"
64+
"${GITHUB_WORKSPACE}/release.sh"

pom.xml

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>com.github.adminfaces</groupId>
6767
<artifactId>admin-theme</artifactId>
68-
<version>1.4.1</version>
68+
<version>1.5.0</version>
6969
</dependency>
7070
</dependencies>
7171

@@ -163,7 +163,43 @@
163163
</plugin>
164164
</plugins>
165165
</build>
166-
</profile>
166+
</profile>
167+
<profile>
168+
<id>javax</id>
169+
<build>
170+
<plugins>
171+
<plugin>
172+
<groupId>org.apache.maven.plugins</groupId>
173+
<artifactId>maven-jar-plugin</artifactId>
174+
<version>3.0.2</version>
175+
<configuration>
176+
<classifier>javax</classifier>
177+
</configuration>
178+
</plugin>
179+
<plugin>
180+
<groupId>io.github.floverfelt</groupId>
181+
<artifactId>find-and-replace-maven-plugin</artifactId>
182+
<version>1.1.0</version>
183+
<executions>
184+
<execution>
185+
<id>exec</id>
186+
<phase>package</phase>
187+
<goals>
188+
<goal>find-and-replace</goal>
189+
</goals>
190+
<configuration>
191+
<replacementType>file-contents</replacementType>
192+
<baseDir>target/classes/</baseDir>
193+
<findRegex>jakarta</findRegex>
194+
<replaceValue>javax</replaceValue>
195+
<recursive>true</recursive>
196+
</configuration>
197+
</execution>
198+
</executions>
199+
</plugin>
200+
</plugins>
201+
</build>
202+
</profile>
167203
<profile>
168204
<id>release</id>
169205
<build>

release-snapshots.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
3+
mvn clean deploy --settings settings.xml
4+
mvn clean deploy -Pjavax --settings settings.xml

release.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
3+
mvn clean install -Prelease && mvn install -Pjavax -Prelease && mvn deploy -Prelease

0 commit comments

Comments
 (0)