Commit f3355841 authored by wannes's avatar wannes
Browse files

Bump dem versions

parent 3f6462a7
......@@ -15,17 +15,17 @@
<dependency>
<groupId>com.j256.ormlite</groupId>
<artifactId>ormlite-jdbc</artifactId>
<version>4.48</version>
<version>5.0</version>
</dependency>
<dependency>
<groupId>org.restlet.jse</groupId>
<artifactId>org.restlet</artifactId>
<version>2.3.3</version>
<version>2.3.4</version>
</dependency>
<dependency>
<groupId>org.restlet.jse</groupId>
<artifactId>org.restlet.ext.jackson</artifactId>
<version>2.3.3</version>
<version>2.3.4</version>
<exclusions>
<exclusion>
<artifactId>jackson-module-jaxb-annotations</artifactId>
......@@ -36,27 +36,27 @@
<dependency>
<groupId>org.restlet.jee</groupId>
<artifactId>org.restlet.ext.servlet</artifactId>
<version>2.3.3</version>
<version>2.3.4</version>
</dependency>
<dependency>
<groupId>org.restlet.jse</groupId>
<artifactId>org.restlet.ext.slf4j</artifactId>
<version>2.3.3</version>
<version>2.3.4</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk15on</artifactId>
<version>1.54</version>
<version>1.55</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.54</version>
<version>1.55</version>
</dependency>
<dependency>
<groupId>be.fedict.eid-applet</groupId>
<artifactId>eid-applet-service</artifactId>
<version>1.2.6</version>
<version>1.2.7</version>
<exclusions>
<exclusion>
<artifactId>servlet-api</artifactId>
......@@ -76,46 +76,46 @@
<artifactId>jetty-http</artifactId>
<groupId>org.eclipse.jetty</groupId>
<type>jar</type>
<version>9.3.9.v20160517</version>
<version>9.3.14.v20161028</version>
</dependency>
<dependency>
<artifactId>jetty-io</artifactId>
<groupId>org.eclipse.jetty</groupId>
<type>jar</type>
<version>9.3.9.v20160517</version>
<version>9.3.14.v20161028</version>
</dependency>
<dependency>
<artifactId>jetty-server</artifactId>
<groupId>org.eclipse.jetty</groupId>
<type>jar</type>
<version>9.3.9.v20160517</version>
<version>9.3.14.v20161028</version>
</dependency>
<dependency>
<artifactId>jetty-util</artifactId>
<groupId>org.eclipse.jetty</groupId>
<type>jar</type>
<version>9.3.9.v20160517</version>
<version>9.3.14.v20161028</version>
</dependency>
<dependency>
<artifactId>jetty-servlet</artifactId>
<groupId>org.eclipse.jetty</groupId>
<type>jar</type>
<version>9.3.9.v20160517</version>
<version>9.3.14.v20161028</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<version>9.3.9.v20160517</version>
<version>9.3.14.v20161028</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.alpn</groupId>
<artifactId>alpn-api</artifactId>
<version>1.1.2.v20150522</version>
<version>1.1.3.v20160715</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
<version>9.3.9.v20160517</version>
<version>9.3.14.v20161028</version>
</dependency>
<dependency>
<groupId>com.googlecode.java-ipv6</groupId>
......@@ -140,7 +140,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
......@@ -207,7 +207,7 @@
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
</dependency>
<dependency>
<groupId>org.mindrot</groupId>
......
......@@ -28,10 +28,10 @@ public class Client implements OwnedEntity, Serializable {
public String commonName;
@DatabaseField(canBeNull = false)
public UUID userId;
@ForeignCollectionField(foreignColumnName = "client")
@ForeignCollectionField(foreignFieldName = "client")
@JsonManagedReference
public ForeignCollection<IPAddress> leases;
@ForeignCollectionField(foreignColumnName = "client")
@ForeignCollectionField(foreignFieldName = "client")
@JsonManagedReference
public ForeignCollection<SubnetLease> subnetLeases;
@DatabaseField(defaultValue = "true")
......
Supports Markdown
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