diff --git a/PlayWallServer.iml b/PlayWallServer.iml index ac905d4c5b593f52db42f17c0aca5b493bdc3671..573336cbcf608944ec92d87cacb33e03f98be606 100644 --- a/PlayWallServer.iml +++ b/PlayWallServer.iml @@ -12,28 +12,29 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.2" level="project" /> - <orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.5.4" level="project" /> + <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.13.0-M2" level="project" /> + <orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.6.0" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.3.6.v20151106" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.4.v20170414" level="project" /> <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.3.6.v20151106" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.3.6.v20151106" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.3.6.v20151106" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.3.6.v20151106" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.3.6.v20151106" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.3.6.v20151106" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.3.6.v20151106" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.3.6.v20151106" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.3.6.v20151106" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.3.6.v20151106" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.3.6.v20151106" level="project" /> - <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.3.6.v20151106" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.4.v20170414" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.0.13" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.0.13" level="project" /> <orderEntry type="library" name="Maven: com.j256.ormlite:ormlite-core:5.0" level="project" /> <orderEntry type="library" name="Maven: com.j256.ormlite:ormlite-jdbc:5.0" level="project" /> <orderEntry type="library" name="Maven: mysql:mysql-connector-java:6.0.5" level="project" /> - <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" /> + <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.1" level="project" /> </component> </module> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 04c3f259de76837dd4582183a6f9a817ee3cf308..4835d864e8d4a0c8ef8d5f85d83d44e678b4bba1 100644 --- a/pom.xml +++ b/pom.xml @@ -87,12 +87,12 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>2.12.2</version> + <version>LATEST</version> </dependency> <dependency> <groupId>com.sparkjava</groupId> <artifactId>spark-core</artifactId> - <version>2.5.4</version> + <version>2.6.0</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> @@ -117,7 +117,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.0</version> + <version>LATEST</version> </dependency> </dependencies> </project> \ No newline at end of file