Skip to content
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.

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

chore: bump dependencies for gradle 8 as gradle 4 is deprecated #30

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 15 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ group 'foundation.privacybydesign.email'
version '1.1.0'

apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty'

sourceCompatibility = 1.7
apply plugin: 'org.gretty'

buildscript {
repositories {
Expand All @@ -13,7 +11,7 @@ buildscript {
}
}
dependencies {
classpath "gradle.plugin.org.akhikhl.gretty:gretty:1.4.2"
classpath "org.gretty:gretty:4.0.3"
}
}

Expand All @@ -26,15 +24,19 @@ repositories {
}

dependencies {
compile 'org.glassfish.jersey.core:jersey-server:2.25'
compile 'org.glassfish.jersey.containers:jersey-container-servlet:2.25'
compile 'ch.qos.logback:logback-classic:1.1.7'
compile 'com.sun.mail:javax.mail:1.5.6'

compile 'org.irmacard.api:irma_api_common:1.2.2'
compile 'foundation.privacybydesign.common:irma_server_common:0.3.2'

testCompile group: 'junit', name: 'junit', version: '4.12'
implementation 'ch.qos.logback:logback-classic:1.4.8'
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
implementation 'org.glassfish.jersey.core:jersey-server:3.1.2'
implementation 'org.glassfish.jersey.containers:jersey-container-servlet:3.1.2'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
implementation group: 'com.sun.mail', name: 'jakarta.mail', version: '2.0.1'
implementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '3.1.2'

implementation 'org.irmacard.api:irma_api_common:1.2.2'
implementation 'foundation.privacybydesign.common:irma_server_common:0.3.2'

testImplementation group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.10.0-M1'
}

gretty {
Expand Down
1 change: 0 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
rootProject.name = 'irma_email_issuer'

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import foundation.privacybydesign.common.email.EmailTokens;

import javax.mail.internet.AddressException;
import jakarta.mail.internet.AddressException;

/**
* Test console application. Quite useless now, but was useful while writing
Expand All @@ -23,4 +23,4 @@ public static void main(String[] args) throws AddressException {
EmailSender.send(conf.getMailFrom(), "mail verification", mailBody);
System.out.println("Done.");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.mail.internet.AddressException;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.mail.internet.AddressException;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import org.slf4j.LoggerFactory;

import java.util.Properties;
import javax.mail.*;
import javax.mail.internet.*;
import jakarta.mail.*;
import jakarta.mail.internet.*;


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import org.glassfish.jersey.server.ResourceConfig;

import javax.ws.rs.*;
import jakarta.ws.rs.*;

@ApplicationPath("/")
public class EmailService extends ResourceConfig {
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/jetty-env.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">

<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<!-- Disable scanning of jars, this can mess stuff up bigtime, but
it makes booting a whole lot faster, see:
Expand Down