Skip to content

Commit 6031bff

Browse files
committed
bbottema#245: Switched to new parent POM which defines all versions in dependenyManagement, updated Jakarta dependencies for JDK9+. Disabled notnull Maven plugin, which doesn't work with JDK11+
1 parent 2ec2162 commit 6031bff

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

modules/core-module/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,24 @@
3030
<artifactId>jakarta.activation</artifactId>
3131
<version>1.2.1</version>
3232
</dependency>
33+
<!-- java 9+ compatibility, these modules are not shipped anymore -->
34+
<dependency>
35+
<groupId>jakarta.xml.bind</groupId>
36+
<artifactId>jakarta.xml.bind-api</artifactId>
37+
<version>2.3.2</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>jakarta.annotation</groupId>
41+
<artifactId>jakarta.annotation-api</artifactId>
42+
<version>1.3.5</version>
43+
</dependency>
44+
3345
<dependency>
3446
<groupId>com.github.bbottema</groupId>
3547
<artifactId>emailaddress-rfc2822</artifactId>
3648
<version>2.1.3</version>
3749
</dependency>
50+
3851
<dependency><!-- Annotation processor -->
3952
<groupId>com.github.therapi</groupId>
4053
<artifactId>therapi-runtime-javadoc-scribe</artifactId>

modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/internal/ServerConfigTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.simplejavamail.mailer.internal;
22

33
import org.junit.Before;
4+
import org.junit.Ignore;
45
import org.junit.Test;
56
import org.simplejavamail.api.mailer.config.ServerConfig;
67
import org.simplejavamail.config.ConfigLoader;
@@ -24,6 +25,7 @@ public void restoreOriginalStaticProperties() {
2425
}
2526

2627
@Test
28+
@Ignore("Enable once the notnull plugin is enabled again or substituted")
2729
public void NoArgconstructor_WithoutConfigFile_WithoutHost() {
2830
ConfigLoaderTestHelper.clearConfigProperties();
2931

@@ -36,6 +38,7 @@ public void NoArgconstructor_WithoutConfigFile_WithoutHost() {
3638
}
3739

3840
@Test
41+
@Ignore("Enable once the notnull plugin is enabled again or substituted")
3942
public void NoArgconstructor_WithoutConfigFile_WithoutPort() {
4043
ConfigLoaderTestHelper.clearConfigProperties();
4144
try {

pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.bbottema</groupId>
88
<artifactId>modular-project-parent</artifactId>
9-
<version>1.0.11</version>
9+
<version>1.0.13</version>
1010
</parent>
1111

1212
<groupId>org.simplejavamail</groupId>
@@ -19,6 +19,10 @@
1919
<description>Simple Java Mail - Maven master project</description>
2020
<url>http://www.simplejavamail.org/</url>
2121

22+
<properties>
23+
<se.eris.notnull.instrument>false</se.eris.notnull.instrument>
24+
</properties>
25+
2226
<!-- to skip some steps: -DskipTests -Dspotbugs.skip=true -Dmaven.javadoc.skip=true -Denforcer.skip=true -Djacoco.skip=true -Dlicense.skip=true -->
2327

2428
<issueManagement>
@@ -233,4 +237,4 @@
233237
</build>
234238
</profile>
235239
</profiles>
236-
</project>
240+
</project>

0 commit comments

Comments
 (0)