Skip to content

Adjust dependencies and make Java 9+ friendly #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbottema merged 2 commits into from
Jan 31, 2022
Merged

Adjust dependencies and make Java 9+ friendly #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c636cc9
Make jakarta.annotation-api a test dependency since it is only requir…
norrisjeremy Jan 31, 2022
e9c60f8
Make jakarta.xml.bind-api a test dependency and switch to newer versi…
norrisjeremy Jan 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions modules/core-module/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,6 @@
<artifactId>jakarta.activation</artifactId>
<version>2.0.1</version>
</dependency>
<!-- java 9+ compatibility, these modules are not shipped anymore -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>1.3.5</version>
</dependency>

<dependency><!-- email validation framework -->
<groupId>com.sanctionco.jmail</groupId>
Expand Down
6 changes: 6 additions & 0 deletions modules/core-test-module/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,11 @@
<artifactId>assertj-core</artifactId>
<version>3.21.0</version>
</dependency>
<!-- java 9+ compatibility, these modules are not shipped anymore -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>3.0.1</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions modules/core-test-module/src/main/java/demo/DemoAppBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import testutil.ImplLoader;
import testutil.ModuleLoaderTestHelper;

import static javax.xml.bind.DatatypeConverter.parseBase64Binary;
import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;

public class DemoAppBase {

Expand Down Expand Up @@ -59,4 +59,4 @@ public static byte[] produceThumbsUpImage() {
"x1aytrc0DDB0foIG1oAYKqC0IZK8D4n1AfA6IzwPxXpCFoGoZVEUDaRGGUTAKRgEeAAA2eGJC+ETCiAAAAABJRU5ErkJggg==";
return parseBase64Binary(base64String);
}
}
}
8 changes: 8 additions & 0 deletions modules/simple-java-mail/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,14 @@
<version>6.0.1</version>
<scope>test</scope>
</dependency>
<!-- required for java 9+ compatibility with assertj-assertions-generator-maven-plugin, which uses javax.annotation.Generated -->
<!-- see https://github.com/assertj/assertj-assertions-generator-maven-plugin/issues/93 -->
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>1.3.5</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
4 changes: 2 additions & 2 deletions ...implejavamail/email/internal/EmailPopulatingBuilderUsingDefaultsFromPropertyFileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.util.Properties;

import static demo.ResourceFolderHelper.determineResourceFolder;
import static javax.xml.bind.DatatypeConverter.parseBase64Binary;
import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;
import static org.assertj.core.api.Assertions.assertThat;

public class EmailPopulatingBuilderUsingDefaultsFromPropertyFileTest {
Expand Down Expand Up @@ -85,4 +85,4 @@ public void testBuilderSimpleBuildWithStandardEmail_PlusOptionals()

assertThat(EmailHelper.createDummyEmailBuilder(true, false, true, false, false, false).buildEmail()).isEqualTo(email);
}
}
}
4 changes: 2 additions & 2 deletions modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import java.util.UUID;

import static demo.ResourceFolderHelper.determineResourceFolder;
import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;
import static java.util.Calendar.APRIL;
import static javax.xml.bind.DatatypeConverter.parseBase64Binary;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
Expand Down Expand Up @@ -444,4 +444,4 @@ private MailerRegularBuilderImpl createFullyConfiguredMailerBuilder(final boolea
.withProperty("extra1", prefix + "value1")
.withProperty("extra2", prefix + "value2");
}
}
}
2 changes: 1 addition & 1 deletion modules/simple-java-mail/src/test/java/testutil/EmailHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
import java.util.UUID;
import java.util.concurrent.ExecutorService;

import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;
import static java.util.Calendar.SEPTEMBER;
import static java.util.Optional.ofNullable;
import static java.util.UUID.randomUUID;
import static java.util.concurrent.Executors.newSingleThreadExecutor;
import static javax.xml.bind.DatatypeConverter.parseBase64Binary;
import static org.simplejavamail.api.mailer.config.LoadBalancingStrategy.ROUND_ROBIN;
import static org.simplejavamail.converter.EmailConverter.emlToEmailBuilder;
import static org.simplejavamail.converter.EmailConverter.outlookMsgToEmailBuilder;
Expand Down