Skip to content

Commit 394d7a2

Browse files
committed
[fix] Fix mail library (should be in the common lib/ directory)
1 parent 2e3423e commit 394d7a2

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

cesium-plus-pod-assembly/pom.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@
5252
<groupId>com.sun.mail</groupId>
5353
<artifactId>jakarta.mail</artifactId>
5454
</dependency>
55-
55+
<dependency>
56+
<groupId>com.sun.activation</groupId>
57+
<artifactId>jakarta.activation</artifactId>
58+
</dependency>
5659
</dependencies>
5760

5861
<build>
@@ -329,7 +332,12 @@
329332
<dependency>
330333
<groupId>com.sun.mail</groupId>
331334
<artifactId>jakarta.mail</artifactId>
332-
<version>${javaMail.version}</version>
335+
<version>${jakarta-mail.version}</version>
336+
</dependency>
337+
<dependency>
338+
<groupId>com.sun.activation</groupId>
339+
<artifactId>jakarta.activation</artifactId>
340+
<version>${jakarta-activation.version}</version>
333341
</dependency>
334342
</dependencies>
335343
<executions>

cesium-plus-pod-assembly/src/main/assembly/standalone.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,10 @@
8585
<include>javax.websocket:javax.websocket-api</include>
8686
<include>org.glassfish.tyrus:tyrus-client</include>
8787
<include>org.glassfish.tyrus:tyrus-container-grizzly-client</include>
88+
<include>com.sun.mail:jakarta.mail</include>
89+
<include>com.sun.activation:jakarta.activation</include>
8890
</includes>
89-
<fileMode>0555</fileMode>
91+
<fileMode>0664</fileMode>
9092
</dependencySet>
9193
</dependencySets>
9294
</assembly>

pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
<geojson-jackson.version>1.14</geojson-jackson.version>
4545
<stringtemplate.version>4.1</stringtemplate.version>
4646
<jTextUtilsVersion>0.3.3</jTextUtilsVersion>
47-
<javaMail.version>1.6.7</javaMail.version>
47+
<jakarta-mail.version>1.6.7</jakarta-mail.version>
48+
<jakarta-activation.version>1.2.1</jakarta-activation.version>
4849
<lombok.version>1.18.20</lombok.version>
4950

5051
<nuitonConfigVersion>3.0</nuitonConfigVersion>
@@ -246,7 +247,12 @@
246247
<dependency>
247248
<groupId>com.sun.mail</groupId>
248249
<artifactId>jakarta.mail</artifactId>
249-
<version>${javaMail.version}</version>
250+
<version>${jakarta-mail.version}</version>
251+
</dependency>
252+
<dependency>
253+
<groupId>com.sun.activation</groupId>
254+
<artifactId>jakarta.activation</artifactId>
255+
<version>${jakarta-activation.version}</version>
250256
</dependency>
251257
<dependency>
252258
<groupId>org.apache.commons</groupId>

release.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ if [[ -f "pom.xml.releaseBackup" ]]; then
1919
echo "Rollback previous release [OK]"
2020
fi
2121

22+
mvn clean -pl cesium-plus-assembly --quietcd ..
23+
2224
echo "**********************************"
2325
echo "* Preparing release..."
2426
echo "**********************************"

0 commit comments

Comments
 (0)