diff options
-rw-r--r-- | juick-api/build.gradle | 1 | ||||
-rw-r--r-- | juick-rss/build.gradle | 4 | ||||
-rw-r--r-- | juick-server-jdbc/build.gradle | 6 | ||||
-rw-r--r-- | juick-server-web/build.gradle | 2 | ||||
-rw-r--r-- | juick-server-web/src/main/java/com/juick/tests/util/MockUtils.java (renamed from juick-server-jdbc/src/test/java/com/juick/tests/util/MockUtils.java) | 0 | ||||
-rw-r--r-- | juick-www/build.gradle | 3 | ||||
-rw-r--r-- | juick-www/package-lock.json | 12 | ||||
-rw-r--r-- | juick-www/package.json | 2 |
8 files changed, 19 insertions, 11 deletions
diff --git a/juick-api/build.gradle b/juick-api/build.gradle index 3ac9236b..1deff970 100644 --- a/juick-api/build.gradle +++ b/juick-api/build.gradle @@ -18,6 +18,7 @@ dependencies { compile 'org.apache.commons:commons-email:1.4' compile 'org.imgscalr:imgscalr-lib:4.2' + testCompile project(path: ':juick-server-web', configuration: 'testArtifacts') testCompile project(path: ':juick-server-jdbc', configuration: 'testArtifacts') testRuntime 'org.apache.tomcat:tomcat-websocket:8.5.16' diff --git a/juick-rss/build.gradle b/juick-rss/build.gradle index 5da16641..45b3216b 100644 --- a/juick-rss/build.gradle +++ b/juick-rss/build.gradle @@ -5,8 +5,8 @@ apply plugin: 'org.akhikhl.gretty' dependencies { compile project(':juick-server-jdbc') compile project(':juick-server-web') - compile 'com.rometools:rome:1.7.3' - compile 'com.rometools:rome-modules:1.7.3' + compile 'com.rometools:rome:1.7.4' + compile 'com.rometools:rome-modules:1.7.4' providedRuntime 'mysql:mysql-connector-java:5.1.40' testCompile "junit:junit:${rootProject.junitVersion}" diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle index 96919cd2..17ca88a9 100644 --- a/juick-server-jdbc/build.gradle +++ b/juick-server-jdbc/build.gradle @@ -27,14 +27,9 @@ dependencies { providedCompile "commons-io:commons-io:2.5" providedCompile "commons-codec:commons-codec:1.10" - compile 'com.github.ben-manes.caffeine:caffeine:2.5.2' - compile "org.springframework:spring-context:${rootProject.springFrameworkVersion}" compile "org.springframework:spring-jdbc:${rootProject.springFrameworkVersion}" - compile "org.springframework.security:spring-security-web:${rootProject.springSecurityVersion}" - compile "org.springframework.security:spring-security-config:${rootProject.springSecurityVersion}" - providedCompile "org.apache.commons:commons-dbcp2:2.1.1" compile "com.googlecode.log4jdbc:log4jdbc:1.2" compile "javax.inject:javax.inject:1" @@ -51,7 +46,6 @@ dependencies { testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}" testCompile "org.mockito:mockito-core:${rootProject.mockitoVersion}" testCompile "org.springframework:spring-test:${rootProject.springFrameworkVersion}" - testCompile "org.springframework.security:spring-security-test:${rootProject.springSecurityVersion}" testRuntime "mysql:mysql-connector-java:5.1.40" } diff --git a/juick-server-web/build.gradle b/juick-server-web/build.gradle index 3ca262bd..2d1e3167 100644 --- a/juick-server-web/build.gradle +++ b/juick-server-web/build.gradle @@ -27,7 +27,7 @@ dependencies { providedCompile "commons-io:commons-io:2.5" providedCompile "commons-codec:commons-codec:1.10" - compile 'com.github.ben-manes.caffeine:caffeine:2.5.2' + compile 'com.github.ben-manes.caffeine:caffeine:2.5.3' compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}" compile "org.springframework:spring-context-support:${rootProject.springFrameworkVersion}" diff --git a/juick-server-jdbc/src/test/java/com/juick/tests/util/MockUtils.java b/juick-server-web/src/main/java/com/juick/tests/util/MockUtils.java index 5344dd23..5344dd23 100644 --- a/juick-server-jdbc/src/test/java/com/juick/tests/util/MockUtils.java +++ b/juick-server-web/src/main/java/com/juick/tests/util/MockUtils.java diff --git a/juick-www/build.gradle b/juick-www/build.gradle index 86956dfb..1e274bc0 100644 --- a/juick-www/build.gradle +++ b/juick-www/build.gradle @@ -22,9 +22,10 @@ dependencies { compile project(':juick-server-jdbc') compile 'com.github.scribejava:scribejava-apis:4.1.2' compile 'com.github.ooxi:serialized-php-parser:0.5.0' - compile 'com.sun.mail:javax.mail:1.5.6' + compile 'com.sun.mail:javax.mail:1.6.0' compile 'com.mitchellbosecke:pebble-spring4:2.4.0' + testCompile project(path: ':juick-server-web', configuration: 'testArtifacts') testCompile project(path: ':juick-server-jdbc', configuration: 'testArtifacts') // htmlunit 2.25 isn't compatible with spring-test 4.3.6 testCompile ('net.sourceforge.htmlunit:htmlunit:2.24') diff --git a/juick-www/package-lock.json b/juick-www/package-lock.json index 1c201316..5642ff6f 100644 --- a/juick-www/package-lock.json +++ b/juick-www/package-lock.json @@ -1384,6 +1384,12 @@ } } }, + "eslint-plugin-only-ascii": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-only-ascii/-/eslint-plugin-only-ascii-0.0.0.tgz", + "integrity": "sha1-RS3Y15oIazhRYHNdiVy0zkMy7WU=", + "dev": true + }, "eslint-scope": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", @@ -3557,6 +3563,12 @@ "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", "dev": true }, + "requireindex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.1.0.tgz", + "integrity": "sha1-5UBLgVV+91225JxacgBIk/4D4WI=", + "dev": true + }, "resolve-from": { "version": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", diff --git a/juick-www/package.json b/juick-www/package.json index 0a3a6c61..c9a88c14 100644 --- a/juick-www/package.json +++ b/juick-www/package.json @@ -18,7 +18,7 @@ "css-loader": "^0.28.4", "eslint": "^4.0.0", "eslint-loader": "^1.8.0", - "eslint-plugin-only-ascii":"^0.0.0", + "eslint-plugin-only-ascii": "0.0.0", "extract-text-webpack-plugin": "^2.1.2", "file-loader": "^0.11.2", "globby": "^6.1.0", |