GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit e4268386 authored by Daniel Gerhardt's avatar Daniel Gerhardt

Merge branch '2.x'

parents 6ad5b3de 1eaebde0
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<io.spring.platform-version>Brussels-SR2</io.spring.platform-version> <io.spring.platform-version>Brussels-SR4</io.spring.platform-version>
<org.aspectj-version>1.8.10</org.aspectj-version> <org.aspectj-version>1.8.10</org.aspectj-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<timestamp>${maven.build.timestamp}</timestamp> <timestamp>${maven.build.timestamp}</timestamp>
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
<dependency> <dependency>
<groupId>com.sun.mail</groupId> <groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId> <artifactId>javax.mail</artifactId>
<version>1.5.6</version> <version>1.6.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
...@@ -228,12 +228,12 @@ ...@@ -228,12 +228,12 @@
<dependency> <dependency>
<groupId>org.pac4j</groupId> <groupId>org.pac4j</groupId>
<artifactId>spring-security-pac4j</artifactId> <artifactId>spring-security-pac4j</artifactId>
<version>2.1.2</version> <version>3.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.pac4j</groupId> <groupId>org.pac4j</groupId>
<artifactId>pac4j-oauth</artifactId> <artifactId>pac4j-oauth</artifactId>
<version>1.9.7</version> <version>2.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.corundumstudio.socketio</groupId> <groupId>com.corundumstudio.socketio</groupId>
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>1.5.13</version> <version>1.5.16</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.codahale.metrics</groupId> <groupId>com.codahale.metrics</groupId>
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
<dependency> <dependency>
<groupId>org.checkerframework</groupId> <groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId> <artifactId>checker-qual</artifactId>
<version>2.1.11</version> <version>2.1.14</version>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version> <version>3.6.2</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>9.4.5.v20170502</version> <version>9.4.6.v20170531</version>
<configuration> <configuration>
<scanIntervalSeconds>1</scanIntervalSeconds> <scanIntervalSeconds>1</scanIntervalSeconds>
<webApp> <webApp>
...@@ -467,7 +467,7 @@ ...@@ -467,7 +467,7 @@
<plugin> <plugin>
<groupId>com.github.kongchen</groupId> <groupId>com.github.kongchen</groupId>
<artifactId>swagger-maven-plugin</artifactId> <artifactId>swagger-maven-plugin</artifactId>
<version>3.1.4</version> <version>3.1.5</version>
<configuration> <configuration>
<apiSources> <apiSources>
<apiSource> <apiSource>
......
...@@ -59,7 +59,7 @@ public class User implements Serializable { ...@@ -59,7 +59,7 @@ public class User implements Serializable {
} }
public User(FacebookProfile profile) { public User(FacebookProfile profile) {
setUsername(profile.getProfileUrl()); setUsername(profile.getProfileUrl().toString());
setType(User.FACEBOOK); setType(User.FACEBOOK);
} }
......
...@@ -26,9 +26,9 @@ import org.jasig.cas.client.authentication.AttributePrincipalImpl; ...@@ -26,9 +26,9 @@ import org.jasig.cas.client.authentication.AttributePrincipalImpl;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.pac4j.oauth.profile.JsonHelper; import org.pac4j.oauth.profile.JsonHelper;
import org.pac4j.oauth.profile.google2.Google2AttributesDefinition;
import org.pac4j.oauth.profile.google2.Google2Email; import org.pac4j.oauth.profile.google2.Google2Email;
import org.pac4j.oauth.profile.google2.Google2Profile; import org.pac4j.oauth.profile.google2.Google2Profile;
import org.pac4j.oauth.profile.google2.Google2ProfileDefinition;
import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
...@@ -70,8 +70,8 @@ public class UserServiceTest { ...@@ -70,8 +70,8 @@ public class UserServiceTest {
ArrayList<Google2Email> emails = new ArrayList<>(); ArrayList<Google2Email> emails = new ArrayList<>();
emails.add(email); emails.add(email);
Google2Profile profile = new Google2Profile(); Google2Profile profile = new Google2Profile();
profile.addAttribute(Google2AttributesDefinition.DISPLAY_NAME, "ptsr00"); profile.addAttribute(Google2ProfileDefinition.DISPLAY_NAME, "ptsr00");
profile.addAttribute(Google2AttributesDefinition.EMAILS, JsonHelper.toJSONString(emails)); profile.addAttribute(Google2ProfileDefinition.EMAILS, emails);
socketid2user.put(UUID.randomUUID(), new User(profile)); socketid2user.put(UUID.randomUUID(), new User(profile));
List<GrantedAuthority> authorities = new ArrayList<>(); List<GrantedAuthority> authorities = new ArrayList<>();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment