Merge remote-tracking branch 'origin/master'

sinake

6 天以前 e5c4a1f16552f115c9c5407b6008ebd9f230c747

 pom.xml

@@ -256,6 +256,13 @@
            <version>4.5</version>
        </dependency>

        <!-- Janino for logback conditional configuration -->
        <dependency>
            <groupId>org.codehaus.janino</groupId>
            <artifactId>janino</artifactId>
            <version>3.0.8</version>
        </dependency>

        <dependency>
            <groupId>commons-httpclient</groupId>
            <artifactId>commons-httpclient</artifactId>