diff options
| author |  Vitaly Takmazov | 2019-12-16 10:01:16 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2019-12-16 10:01:16 +0300 |
| commit | d6024741434534fa6a08351d0b862376ab4e06c7 (patch) | |
| tree | 1c13bc8fcf8efb79b08ca54c2f482e9b0a490217 | |
| parent | 6c567bdd883224ced77fc15e47fda264afce3cdd (diff) | |
Pebble 3.1.2 and other dependencies updates
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/main/java/com/juick/server/configuration/WwwAppConfiguration.java | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/build.gradle b/build.gradle index 2258d37b..985713f5 100644 --- a/build.gradle +++ b/build.gradle @@ -165,7 +165,7 @@ dependencies { runtime 'com.h2database:h2:1.4.200' compile 'com.github.ooxi:serialized-php-parser:0.5.0' - compile 'io.pebbletemplates:pebble-spring5:3.1.0' + compile 'io.pebbletemplates:pebble-spring5:3.1.2' compile 'com.atlassian.commonmark:commonmark:0.13.1' compile 'com.atlassian.commonmark:commonmark-ext-autolink:0.13.1' compile 'org.tomitribe:tomitribe-http-signatures:1.3' diff --git a/package.json b/package.json index a0a03e13..6ed41bee 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@babel/preset-env": "^7.7.6", "babel-loader": "^8.0.6", "core-js": "^3.5.0", - "css-loader": "^3.3.0", + "css-loader": "^3.3.2", "eslint": "6.7.2", "eslint-loader": "3.0.3", "eslint-plugin-only-ascii": "0.0.0", diff --git a/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java b/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java index 363b90c2..0ac90a52 100644 --- a/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java +++ b/src/main/java/com/juick/server/configuration/WwwAppConfiguration.java @@ -24,8 +24,8 @@ import com.mitchellbosecke.pebble.PebbleEngine; import com.mitchellbosecke.pebble.extension.FormatterExtension; import com.mitchellbosecke.pebble.loader.ClasspathLoader; import com.mitchellbosecke.pebble.loader.Loader; -import com.mitchellbosecke.pebble.spring.PebbleViewResolver; import com.mitchellbosecke.pebble.spring.extension.SpringExtension; +import com.mitchellbosecke.pebble.spring.servlet.PebbleViewResolver; import org.apache.commons.codec.CharEncoding; import org.commonmark.ext.autolink.AutolinkExtension; import org.commonmark.node.Link; @@ -1954,10 +1954,10 @@ css-has-pseudo@^0.10.0: postcss "^7.0.6" postcss-selector-parser "^5.0.0-rc.4" -css-loader@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.3.0.tgz#65f889807baec3197313965d6cda9899f936734d" - integrity sha512-x9Y1vvHe5RR+4tzwFdWExPueK00uqFTCw7mZy+9aE/X1SKWOArm5luaOrtJ4d05IpOwJ6S86b/tVcIdhw1Bu4A== +css-loader@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.3.2.tgz#41b2086528aa4fbf8c0692e874bc14f081129b21" + integrity sha512-4XSiURS+YEK2fQhmSaM1onnUm0VKWNf6WWBYjkp9YbSDGCBTVZ5XOM6Gkxo8tLgQlzkZOBJvk9trHlDk4gjEYg== dependencies: camelcase "^5.3.1" cssesc "^3.0.0" |