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 versions #22

Open
wants to merge 1 commit 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
18 changes: 10 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version '1.1.0'
apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty'

sourceCompatibility = 1.7
sourceCompatibility = 1.8

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

Expand All @@ -26,15 +26,17 @@ 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.glassfish.jersey.core:jersey-server:2.36'
compile 'org.glassfish.jersey.containers:jersey-container-servlet:2.36'
compile 'org.glassfish.jersey.inject:jersey-hk2:2.36'
compile 'ch.qos.logback:logback-classic:1.2.11'
compile 'com.sun.mail:javax.mail:1.6.2'
compile 'javax.ws.rs:javax.ws.rs-api:2.1.1'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For what are all those extra dependencies needed. For example, I see that when doing this we fetch the log4j dependency, while we didn't do that earlier. And we all now the history of log4j of course.

Furthermore, I still get some exceptions while building. An earlier exception disappeared, but it introduces a new one.

Exception in thread "main" java.lang.NullPointerException: Cannot invoke method getText() on null object

They are not blocking, but it's still a bit weird.


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

testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'junit', name: 'junit', version: '4.13.2'
}

gretty {
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/jetty-env.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-" "http://www.eclipse.org/jetty/configure.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