The Unified and Autonomous Development Platform
midwork
Robin Shen98fb3bb61e27
diff --git a/pom.xml b/pom.xmlindex 03a767a9b3..1fec43d047 100644--- a/pom.xml+++ b/pom.xml@@ -161,6 +161,11 @@<type>test-jar</type><version>${commons.version}</version></dependency>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>commons-utils</artifactId>+ <version>${commons.version}</version>+ </dependency><dependency><groupId>io.onedev</groupId><artifactId>commons-codeassist</artifactId>@@ -176,6 +181,376 @@<artifactId>commons-jsyntax</artifactId><version>${commons.version}</version></dependency>+ <dependency>+ <groupId>org.slf4j</groupId>+ <artifactId>slf4j-api</artifactId>+ <version>${slf4j.version}</version>+ </dependency>+ <dependency>+ <groupId>org.slf4j</groupId>+ <artifactId>jul-to-slf4j</artifactId>+ <version>${slf4j.version}</version>+ </dependency>+ <dependency>+ <groupId>ch.qos.logback</groupId>+ <artifactId>logback-core</artifactId>+ <version>${logback.version}</version>+ </dependency>+ <dependency>+ <groupId>ch.qos.logback</groupId>+ <artifactId>logback-classic</artifactId>+ <version>${logback.version}</version>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jetty</groupId>+ <artifactId>jetty-server</artifactId>+ <version>${jetty.version}</version>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jetty</groupId>+ <artifactId>jetty-servlets</artifactId>+ <version>${jetty.version}</version>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jetty</groupId>+ <artifactId>jetty-servlet</artifactId>+ <version>${jetty.version}</version>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jetty.websocket</groupId>+ <artifactId>websocket-server</artifactId>+ <version>${jetty.version}</version>+ </dependency>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-core</artifactId>+ <version>${wicket.version}</version>+ </dependency>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-extensions</artifactId>+ <version>${wicket.version}</version>+ </dependency>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-request</artifactId>+ <version>${wicket.version}</version>+ </dependency>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-util</artifactId>+ <version>${wicket.version}</version>+ </dependency>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-devutils</artifactId>+ <version>${wicket.version}</version>+ </dependency>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-native-websocket-core</artifactId>+ <version>${wicket.version}</version>+ </dependency>+ <dependency>+ <groupId>org.glassfish.jersey.containers</groupId>+ <artifactId>jersey-container-servlet</artifactId>+ <version>${jersey.version}</version>+ </dependency>+ <dependency>+ <groupId>org.glassfish.jersey.ext</groupId>+ <artifactId>jersey-bean-validation</artifactId>+ <version>${jersey.version}</version>+ </dependency>+ <dependency>+ <groupId>org.dom4j</groupId>+ <artifactId>dom4j</artifactId>+ <version>2.1.1</version>+ </dependency>+ <dependency>+ <groupId>org.hibernate</groupId>+ <artifactId>hibernate-validator</artifactId>+ <version>5.2.4.Final</version>+ </dependency>+ <dependency>+ <groupId>org.hibernate</groupId>+ <artifactId>hibernate-core</artifactId>+ <version>${hibernate.version}</version>+ </dependency>+ <dependency>+ <groupId>org.hibernate</groupId>+ <artifactId>hibernate-jcache</artifactId>+ <version>${hibernate.version}</version>+ </dependency>+ <dependency>+ <groupId>org.hibernate</groupId>+ <artifactId>hibernate-entitymanager</artifactId>+ <version>${hibernate.version}</version>+ </dependency>+ <dependency>+ <groupId>org.hibernate</groupId>+ <artifactId>hibernate-hikaricp</artifactId>+ <version>${hibernate.version}</version>+ </dependency>+ <dependency>+ <groupId>org.ehcache</groupId>+ <artifactId>ehcache</artifactId>+ <version>3.8.0</version>+ </dependency>+ <dependency>+ <groupId>com.zaxxer</groupId>+ <artifactId>HikariCP</artifactId>+ <version>2.7.9</version>+ </dependency>+ <dependency>+ <groupId>de.agilecoders.wicket</groupId>+ <artifactId>wicket-bootstrap-core</artifactId>+ <version>${wicketbootstrap.version}</version>+ </dependency>+ <dependency>+ <groupId>de.agilecoders.wicket</groupId>+ <artifactId>wicket-bootstrap-extensions</artifactId>+ <version>${wicketbootstrap.version}</version>+ </dependency>+ <dependency>+ <groupId>org.apache.commons</groupId>+ <artifactId>commons-collections4</artifactId>+ <version>4.1</version>+ </dependency>+ <dependency>+ <groupId>org.apache.commons</groupId>+ <artifactId>commons-compress</artifactId>+ <version>1.19</version>+ </dependency>+ <dependency>+ <groupId>commons-io</groupId>+ <artifactId>commons-io</artifactId>+ <version>2.5</version>+ </dependency>+ <dependency>+ <groupId>commons-codec</groupId>+ <artifactId>commons-codec</artifactId>+ <version>1.7</version>+ </dependency>+ <dependency>+ <groupId>org.apache.commons</groupId>+ <artifactId>commons-lang3</artifactId>+ <version>3.8.1</version>+ </dependency>+ <dependency>+ <groupId>org.apache.commons</groupId>+ <artifactId>commons-text</artifactId>+ <version>1.6</version>+ </dependency>+ <dependency>+ <groupId>com.google.guava</groupId>+ <artifactId>guava</artifactId>+ <version>25.1-android</version>+ </dependency>+ <dependency>+ <groupId>commons-fileupload</groupId>+ <artifactId>commons-fileupload</artifactId>+ <version>1.3.3</version>+ </dependency>+ <dependency>+ <groupId>commons-validator</groupId>+ <artifactId>commons-validator</artifactId>+ <version>1.4.0</version>+ </dependency>+ <dependency>+ <groupId>org.ocpsoft.prettytime</groupId>+ <artifactId>prettytime</artifactId>+ <version>4.0.1.Final</version>+ </dependency>+ <dependency>+ <groupId>org.apache.httpcomponents</groupId>+ <artifactId>httpclient</artifactId>+ <version>4.5.6</version>+ </dependency>+ <dependency>+ <groupId>org.glassfish.hk2</groupId>+ <artifactId>guice-bridge</artifactId>+ <version>2.5.0</version>+ </dependency>+ <dependency>+ <groupId>org.jetbrains.xodus</groupId>+ <artifactId>xodus-entity-store</artifactId>+ <version>1.2.3</version>+ </dependency>+ <dependency>+ <groupId>org.apache.tika</groupId>+ <artifactId>tika-core</artifactId>+ <version>1.20</version>+ </dependency>+ <dependency>+ <groupId>org.apache.commons</groupId>+ <artifactId>commons-email</artifactId>+ <version>1.4</version>+ </dependency>+ <dependency>+ <groupId>org.apache.velocity</groupId>+ <artifactId>velocity</artifactId>+ <version>1.7</version>+ </dependency>+ <dependency>+ <groupId>commons-httpclient</groupId>+ <artifactId>commons-httpclient</artifactId>+ <version>3.1</version>+ </dependency>+ <dependency>+ <groupId>joda-time</groupId>+ <artifactId>joda-time</artifactId>+ <version>2.2</version>+ </dependency>+ <dependency>+ <groupId>org.yaml</groupId>+ <artifactId>snakeyaml</artifactId>+ <version>1.21</version>+ </dependency>+ <dependency>+ <groupId>org.bouncycastle</groupId>+ <artifactId>bcprov-jdk15on</artifactId>+ <version>1.62</version>+ </dependency>+ <dependency>+ <groupId>org.unbescape</groupId>+ <artifactId>unbescape</artifactId>+ <version>1.1.2.RELEASE</version>+ </dependency>+ <dependency>+ <groupId>org.quartz-scheduler</groupId>+ <artifactId>quartz</artifactId>+ <version>2.2.1</version>+ </dependency>+ <dependency>+ <groupId>org.webjars</groupId>+ <artifactId>font-awesome</artifactId>+ <version>4.7.0</version>+ </dependency>+ <dependency>+ <groupId>org.webjars.npm</groupId>+ <artifactId>codemirror</artifactId>+ <version>5.21.0</version>+ </dependency>+ <dependency>+ <groupId>org.apache.shiro</groupId>+ <artifactId>shiro-core</artifactId>+ <version>${shiro.version}</version>+ </dependency>+ <dependency>+ <artifactId>lucene-core</artifactId>+ <groupId>org.apache.lucene</groupId>+ <version>${lucene.version}</version>+ </dependency>+ <dependency>+ <artifactId>lucene-queries</artifactId>+ <groupId>org.apache.lucene</groupId>+ <version>${lucene.version}</version>+ </dependency>+ <dependency>+ <artifactId>lucene-analyzers-common</artifactId>+ <groupId>org.apache.lucene</groupId>+ <version>${lucene.version}</version>+ </dependency>+ <dependency>+ <groupId>org.apache.shiro</groupId>+ <artifactId>shiro-web</artifactId>+ <version>${shiro.version}</version>+ </dependency>+ <dependency>+ <groupId>com.pmease.security.shiro</groupId>+ <artifactId>shiro-bcrypt</artifactId>+ <version>1.0.2</version>+ </dependency>+ <dependency>+ <groupId>org.apache.shiro</groupId>+ <artifactId>shiro-guice</artifactId>+ <version>${shiro.version}</version>+ </dependency>+ <dependency>+ <groupId>javax.xml.bind</groupId>+ <artifactId>jaxb-api</artifactId>+ <version>2.3.0</version>+ </dependency>+ <dependency>+ <groupId>org.glassfish</groupId>+ <artifactId>javax.el</artifactId>+ <version>3.0.0</version>+ </dependency>+ <dependency>+ <groupId>org.hsqldb</groupId>+ <artifactId>hsqldb</artifactId>+ <version>2.4.0</version>+ </dependency>+ <dependency>+ <groupId>jaxen</groupId>+ <artifactId>jaxen</artifactId>+ <version>1.1.6</version>+ </dependency>+ <dependency>+ <groupId>com.thoughtworks.xstream</groupId>+ <artifactId>xstream</artifactId>+ <version>1.4.11.1</version>+ </dependency>+ <dependency>+ <groupId>com.joestelmach</groupId>+ <artifactId>natty</artifactId>+ <version>0.13</version>+ </dependency>+ <dependency>+ <groupId>org.codehaus.groovy</groupId>+ <artifactId>groovy</artifactId>+ <version>${groovy.version}</version>+ </dependency>+ <dependency>+ <groupId>com.googlecode.juniversalchardet</groupId>+ <artifactId>juniversalchardet</artifactId>+ <version>1.0.3</version>+ </dependency>+ <dependency>+ <groupId>com.vladsch.flexmark</groupId>+ <artifactId>flexmark</artifactId>+ <version>${flexmark.version}</version>+ </dependency>+ <dependency>+ <groupId>com.vladsch.flexmark</groupId>+ <artifactId>flexmark-ext-autolink</artifactId>+ <version>${flexmark.version}</version>+ </dependency>+ <dependency>+ <groupId>com.vladsch.flexmark</groupId>+ <artifactId>flexmark-ext-anchorlink</artifactId>+ <version>${flexmark.version}</version>+ </dependency>+ <dependency>+ <groupId>com.vladsch.flexmark</groupId>+ <artifactId>flexmark-ext-definition</artifactId>+ <version>${flexmark.version}</version>+ </dependency>+ <dependency>+ <groupId>com.vladsch.flexmark</groupId>+ <artifactId>flexmark-ext-tables</artifactId>+ <version>${flexmark.version}</version>+ </dependency>+ <dependency>+ <groupId>com.vladsch.flexmark</groupId>+ <artifactId>flexmark-ext-gfm-tasklist</artifactId>+ <version>${flexmark.version}</version>+ </dependency>+ <dependency>+ <groupId>com.vladsch.flexmark</groupId>+ <artifactId>flexmark-ext-toc</artifactId>+ <version>${flexmark.version}</version>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jgit</groupId>+ <artifactId>org.eclipse.jgit.http.server</artifactId>+ <version>${jgit.version}</version>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jgit</groupId>+ <artifactId>org.eclipse.jgit.archive</artifactId>+ <version>${jgit.version}</version>+ </dependency></dependencies></dependencyManagement><repositories>@@ -196,6 +571,19 @@</repositories><properties><commons.version>1.1.9</commons.version>+ <slf4j.version>1.7.5</slf4j.version>+ <logback.version>1.0.11</logback.version><antlr.version>4.7.2</antlr.version>+ <jetty.version>9.4.24.v20191120</jetty.version>+ <wicket.version>7.14.0</wicket.version>+ <jersey.version>2.26</jersey.version>+ <hibernate.version>5.4.9.Final</hibernate.version>+ <wicketbootstrap.version>0.10.18</wicketbootstrap.version>+ <lucene.version>7.1.0</lucene.version>+ <shiro.version>1.4.0</shiro.version>+ <jgit.version>5.1.3.201810200350-r</jgit.version>+ <flexmark.version>0.18.3</flexmark.version>+ <groovy.version>2.4.14</groovy.version>+ <servlet.version>3.1.0</servlet.version></properties></project>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 0e3b53e8fa..56f9718c33 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -43,147 +43,64 @@<dependency><groupId>commons-codec</groupId><artifactId>commons-codec</artifactId>- <version>1.7</version></dependency><dependency><groupId>org.apache.commons</groupId><artifactId>commons-compress</artifactId>- <version>1.19</version>+ </dependency>+ <dependency>+ <groupId>com.google.guava</groupId>+ <artifactId>guava</artifactId></dependency><dependency><groupId>org.jetbrains.xodus</groupId><artifactId>xodus-entity-store</artifactId>- <version>1.2.3</version></dependency><dependency><groupId>org.apache.tika</groupId><artifactId>tika-core</artifactId>- <version>1.20</version>- </dependency>- <dependency>- <groupId>com.google.guava</groupId>- <artifactId>guava</artifactId>- <version>25.1-android</version></dependency><dependency><groupId>org.apache.commons</groupId><artifactId>commons-email</artifactId>- <version>1.4</version></dependency><dependency><groupId>org.apache.velocity</groupId><artifactId>velocity</artifactId>- <version>1.7</version></dependency><dependency><groupId>commons-httpclient</groupId><artifactId>commons-httpclient</artifactId>- <version>3.1</version></dependency><dependency><groupId>joda-time</groupId><artifactId>joda-time</artifactId>- <version>2.2</version>- </dependency>- <dependency>- <groupId>org.eclipse.jetty</groupId>- <artifactId>jetty-server</artifactId>- <version>${jetty.version}</version>- </dependency>- <dependency>- <groupId>org.eclipse.jetty</groupId>- <artifactId>jetty-servlets</artifactId>- <version>${jetty.version}</version></dependency><dependency><groupId>org.yaml</groupId><artifactId>snakeyaml</artifactId>- <version>1.21</version>- </dependency>- <dependency>- <groupId>org.eclipse.jetty</groupId>- <artifactId>jetty-servlet</artifactId>- <version>${jetty.version}</version>- </dependency>- <dependency>- <groupId>org.eclipse.jetty.websocket</groupId>- <artifactId>websocket-server</artifactId>- <version>${jetty.version}</version>- </dependency>- <dependency>- <groupId>org.glassfish.jersey.containers</groupId>- <artifactId>jersey-container-servlet</artifactId>- <version>${jersey.version}</version>- </dependency>- <dependency>- <groupId>org.glassfish.jersey.ext</groupId>- <artifactId>jersey-bean-validation</artifactId>- <version>${jersey.version}</version>- </dependency>- <dependency>- <groupId>org.hibernate</groupId>- <artifactId>hibernate-validator</artifactId>- <version>5.2.4.Final</version></dependency><dependency><groupId>org.bouncycastle</groupId><artifactId>bcprov-jdk15on</artifactId>- <version>1.62</version></dependency><dependency><groupId>org.unbescape</groupId><artifactId>unbescape</artifactId>- <version>1.1.2.RELEASE</version></dependency><dependency><groupId>org.quartz-scheduler</groupId><artifactId>quartz</artifactId>- <version>2.2.1</version><exclusions><exclusion><groupId>c3p0</groupId><artifactId>c3p0</artifactId></exclusion>- <exclusion>- <groupId>org.slf4j</groupId>- <artifactId>slf4j-api</artifactId>- </exclusion></exclusions></dependency>- <dependency>- <groupId>org.apache.wicket</groupId>- <artifactId>wicket-core</artifactId>- <version>${wicket.version}</version>- </dependency>- <dependency>- <groupId>org.apache.wicket</groupId>- <artifactId>wicket-extensions</artifactId>- <version>${wicket.version}</version>- </dependency>- <dependency>- <groupId>org.apache.wicket</groupId>- <artifactId>wicket-request</artifactId>- <version>${wicket.version}</version>- </dependency>- <dependency>- <groupId>org.apache.wicket</groupId>- <artifactId>wicket-util</artifactId>- <version>${wicket.version}</version>- </dependency>- <dependency>- <groupId>org.apache.wicket</groupId>- <artifactId>wicket-devutils</artifactId>- <version>${wicket.version}</version>- </dependency>- <dependency>- <groupId>org.apache.wicket</groupId>- <artifactId>wicket-native-websocket-core</artifactId>- <version>${wicket.version}</version>- </dependency><dependency><groupId>org.webjars</groupId><artifactId>font-awesome</artifactId>- <version>4.7.0</version><exclusions><exclusion><groupId>org.webjars</groupId>@@ -191,50 +108,13 @@</exclusion></exclusions></dependency>- <dependency>- <groupId>de.agilecoders.wicket</groupId>- <artifactId>wicket-bootstrap-core</artifactId>- <version>${wicketbootstrap.version}</version>- </dependency>- <dependency>- <groupId>de.agilecoders.wicket</groupId>- <artifactId>wicket-bootstrap-extensions</artifactId>- <version>${wicketbootstrap.version}</version>- </dependency><dependency><groupId>org.webjars.npm</groupId><artifactId>codemirror</artifactId>- <version>5.21.0</version>- </dependency>- <dependency>- <groupId>commons-fileupload</groupId>- <artifactId>commons-fileupload</artifactId>- <version>1.3.3</version>- </dependency>- <dependency>- <groupId>commons-validator</groupId>- <artifactId>commons-validator</artifactId>- <version>1.4.0</version>- </dependency>- <dependency>- <groupId>org.ocpsoft.prettytime</groupId>- <artifactId>prettytime</artifactId>- <version>4.0.1.Final</version>- </dependency>- <dependency>- <groupId>org.apache.httpcomponents</groupId>- <artifactId>httpclient</artifactId>- <version>4.5.6</version>- </dependency>- <dependency>- <groupId>org.glassfish.hk2</groupId>- <artifactId>guice-bridge</artifactId>- <version>2.5.0</version></dependency><dependency><groupId>org.apache.shiro</groupId><artifactId>shiro-core</artifactId>- <version>${shiro.version}</version><exclusions><exclusion><groupId>org.slf4j</groupId>@@ -245,170 +125,202 @@<dependency><artifactId>lucene-core</artifactId><groupId>org.apache.lucene</groupId>- <version>${lucene.version}</version></dependency><dependency><artifactId>lucene-queries</artifactId><groupId>org.apache.lucene</groupId>- <version>${lucene.version}</version></dependency><dependency><artifactId>lucene-analyzers-common</artifactId><groupId>org.apache.lucene</groupId>- <version>${lucene.version}</version></dependency><dependency><groupId>org.apache.shiro</groupId><artifactId>shiro-web</artifactId>- <version>${shiro.version}</version></dependency><dependency><groupId>com.pmease.security.shiro</groupId><artifactId>shiro-bcrypt</artifactId>- <version>1.0.2</version></dependency><dependency><groupId>org.apache.shiro</groupId><artifactId>shiro-guice</artifactId>- <version>${shiro.version}</version>- <exclusions>- <exclusion>- <groupId>com.google.guava</groupId>- <artifactId>guava</artifactId>- </exclusion>- </exclusions></dependency><dependency><groupId>javax.xml.bind</groupId><artifactId>jaxb-api</artifactId>- <version>2.3.0</version>- </dependency>- <dependency>- <groupId>org.hibernate</groupId>- <artifactId>hibernate-core</artifactId>- <version>${hibernate.version}</version>- <exclusions>- <exclusion>- <groupId>dom4j</groupId>- <artifactId>dom4j</artifactId>- </exclusion>- </exclusions>- </dependency>- <dependency>- <groupId>org.hibernate</groupId>- <artifactId>hibernate-jcache</artifactId>- <version>${hibernate.version}</version>- </dependency>- <dependency>- <groupId>org.ehcache</groupId>- <artifactId>ehcache</artifactId>- <version>3.8.0</version>- </dependency>- <dependency>- <groupId>org.hibernate</groupId>- <artifactId>hibernate-entitymanager</artifactId>- <version>${hibernate.version}</version>- <exclusions>- <exclusion>- <groupId>dom4j</groupId>- <artifactId>dom4j</artifactId>- </exclusion>- </exclusions>- </dependency>- <dependency>- <groupId>org.hibernate</groupId>- <artifactId>hibernate-hikaricp</artifactId>- <version>${hibernate.version}</version>- </dependency>- <dependency>- <groupId>com.zaxxer</groupId>- <artifactId>HikariCP</artifactId>- <version>2.7.9</version></dependency><dependency><groupId>org.glassfish</groupId><artifactId>javax.el</artifactId>- <version>3.0.0</version></dependency><dependency><groupId>org.hsqldb</groupId><artifactId>hsqldb</artifactId>- <version>2.4.0</version>- </dependency>- <dependency>- <groupId>org.dom4j</groupId>- <artifactId>dom4j</artifactId>- <version>2.1.1</version></dependency><dependency><groupId>jaxen</groupId><artifactId>jaxen</artifactId>- <version>1.1.6</version></dependency><dependency><groupId>com.thoughtworks.xstream</groupId><artifactId>xstream</artifactId>- <version>1.4.11.1</version></dependency><dependency><groupId>com.joestelmach</groupId><artifactId>natty</artifactId>- <version>0.13</version></dependency><dependency><groupId>org.codehaus.groovy</groupId><artifactId>groovy</artifactId>- <version>${groovy.version}</version></dependency><dependency><groupId>com.googlecode.juniversalchardet</groupId><artifactId>juniversalchardet</artifactId>- <version>1.0.3</version></dependency><dependency><groupId>com.vladsch.flexmark</groupId><artifactId>flexmark</artifactId>- <version>${flexmark.version}</version></dependency><dependency><groupId>com.vladsch.flexmark</groupId><artifactId>flexmark-ext-autolink</artifactId>- <version>${flexmark.version}</version></dependency><dependency><groupId>com.vladsch.flexmark</groupId><artifactId>flexmark-ext-anchorlink</artifactId>- <version>${flexmark.version}</version></dependency><dependency><groupId>com.vladsch.flexmark</groupId><artifactId>flexmark-ext-definition</artifactId>- <version>${flexmark.version}</version></dependency><dependency><groupId>com.vladsch.flexmark</groupId><artifactId>flexmark-ext-tables</artifactId>- <version>${flexmark.version}</version></dependency><dependency><groupId>com.vladsch.flexmark</groupId><artifactId>flexmark-ext-gfm-tasklist</artifactId>- <version>${flexmark.version}</version></dependency><dependency><groupId>com.vladsch.flexmark</groupId><artifactId>flexmark-ext-toc</artifactId>- <version>${flexmark.version}</version></dependency><dependency><groupId>org.eclipse.jgit</groupId><artifactId>org.eclipse.jgit.http.server</artifactId>- <version>${jgit.version}</version></dependency><dependency><groupId>org.eclipse.jgit</groupId><artifactId>org.eclipse.jgit.archive</artifactId>- <version>${jgit.version}</version>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jetty</groupId>+ <artifactId>jetty-server</artifactId>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jetty</groupId>+ <artifactId>jetty-servlets</artifactId>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jetty</groupId>+ <artifactId>jetty-servlet</artifactId>+ </dependency>+ <dependency>+ <groupId>org.eclipse.jetty.websocket</groupId>+ <artifactId>websocket-server</artifactId>+ </dependency>+ <dependency>+ <groupId>org.glassfish.jersey.containers</groupId>+ <artifactId>jersey-container-servlet</artifactId>+ </dependency>+ <dependency>+ <groupId>org.glassfish.jersey.ext</groupId>+ <artifactId>jersey-bean-validation</artifactId>+ </dependency>+ <dependency>+ <groupId>org.hibernate</groupId>+ <artifactId>hibernate-validator</artifactId>+ </dependency>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-core</artifactId>+ </dependency>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-extensions</artifactId>+ </dependency>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-request</artifactId>+ </dependency>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-util</artifactId>+ </dependency>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-devutils</artifactId>+ </dependency>+ <dependency>+ <groupId>org.apache.wicket</groupId>+ <artifactId>wicket-native-websocket-core</artifactId>+ </dependency>+ <dependency>+ <groupId>de.agilecoders.wicket</groupId>+ <artifactId>wicket-bootstrap-core</artifactId>+ </dependency>+ <dependency>+ <groupId>de.agilecoders.wicket</groupId>+ <artifactId>wicket-bootstrap-extensions</artifactId>+ </dependency>+ <dependency>+ <groupId>commons-fileupload</groupId>+ <artifactId>commons-fileupload</artifactId>+ </dependency>+ <dependency>+ <groupId>commons-validator</groupId>+ <artifactId>commons-validator</artifactId>+ </dependency>+ <dependency>+ <groupId>org.ocpsoft.prettytime</groupId>+ <artifactId>prettytime</artifactId>+ </dependency>+ <dependency>+ <groupId>org.apache.httpcomponents</groupId>+ <artifactId>httpclient</artifactId>+ </dependency>+ <dependency>+ <groupId>org.glassfish.hk2</groupId>+ <artifactId>guice-bridge</artifactId>+ </dependency>+ <dependency>+ <groupId>org.hibernate</groupId>+ <artifactId>hibernate-core</artifactId>+ </dependency>+ <dependency>+ <groupId>org.hibernate</groupId>+ <artifactId>hibernate-jcache</artifactId>+ </dependency>+ <dependency>+ <groupId>org.ehcache</groupId>+ <artifactId>ehcache</artifactId>+ </dependency>+ <dependency>+ <groupId>org.hibernate</groupId>+ <artifactId>hibernate-entitymanager</artifactId>+ </dependency>+ <dependency>+ <groupId>org.hibernate</groupId>+ <artifactId>hibernate-hikaricp</artifactId>+ </dependency>+ <dependency>+ <groupId>com.zaxxer</groupId>+ <artifactId>HikariCP</artifactId>+ </dependency>+ <dependency>+ <groupId>org.dom4j</groupId>+ <artifactId>dom4j</artifactId></dependency><dependency><groupId>io.onedev</groupId>@@ -418,16 +330,5 @@</dependencies><properties><moduleClass>io.onedev.server.CoreModule</moduleClass>- <lucene.version>7.1.0</lucene.version>- <hibernate.version>5.4.9.Final</hibernate.version>- <shiro.version>1.4.0</shiro.version>- <jgit.version>5.1.3.201810200350-r</jgit.version>- <flexmark.version>0.18.3</flexmark.version>- <groovy.version>2.4.14</groovy.version>- <wicket.version>7.14.0</wicket.version>- <wicketbootstrap.version>0.10.18</wicketbootstrap.version>- <jersey.version>2.26</jersey.version>- <jetty.version>9.3.27.v20190418</jetty.version>- <servlet.version>3.1.0</servlet.version></properties></project>diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.javaindex 45c7f93ab0..c20f420d91 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java@@ -1,6 +1,7 @@package io.onedev.server.buildspec;import java.io.Serializable;+import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.HashSet;import java.util.LinkedHashMap;@@ -16,7 +17,6 @@ import javax.validation.ValidationException;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.google.common.base.Charsets;import com.google.common.collect.Lists;import io.onedev.commons.utils.StringUtils;@@ -184,7 +184,7 @@ public class BuildSpec implements Serializable, Validatable {@Nullablepublic static BuildSpec parse(byte[] bytes) {- String buildSpecString = new String(bytes, Charsets.UTF_8);+ String buildSpecString = new String(bytes, StandardCharsets.UTF_8);if (StringUtils.isNotBlank(buildSpecString)) {try {return (BuildSpec) VersionedDocument.fromXML(buildSpecString).toBean();diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.javaindex c9e17bfc1a..9c5c592bdb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java@@ -10,6 +10,7 @@ import java.io.IOException;import java.io.InputStream;import java.io.ObjectInputStream;import java.io.ObjectOutputStream;+import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Collection;import java.util.Date;@@ -32,7 +33,6 @@ import org.joda.time.format.DateTimeFormatter;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.google.common.base.Charsets;import com.google.common.base.Splitter;import io.onedev.commons.launcher.loader.Listen;@@ -403,7 +403,7 @@ public class DefaultLogManager implements LogManager {StringBuilder builder = new StringBuilder();for (JobLogEntry entry: snippet.entries)builder.append(renderAsText(entry) + "\n");- recentBuffer = builder.toString().getBytes(Charsets.UTF_8);+ recentBuffer = builder.toString().getBytes(StandardCharsets.UTF_8);}} catch (Exception e) {lock.unlock();@@ -432,7 +432,7 @@ public class DefaultLogManager implements LogManager {if (pos == buffer.length) {if (ois != null) {try {- buffer = (renderAsText((JobLogEntry) ois.readObject()) + "\n").getBytes(Charsets.UTF_8);+ buffer = (renderAsText((JobLogEntry) ois.readObject()) + "\n").getBytes(StandardCharsets.UTF_8);} catch (EOFException e) {IOUtils.closeQuietly(ois);ois = null;diff --git a/server-core/src/main/java/io/onedev/server/git/Blob.java b/server-core/src/main/java/io/onedev/server/git/Blob.javaindex 849eac27b2..7297067d65 100644--- a/server-core/src/main/java/io/onedev/server/git/Blob.java+++ b/server-core/src/main/java/io/onedev/server/git/Blob.java@@ -3,6 +3,7 @@ package io.onedev.server.git;import java.io.IOException;import java.io.InputStream;import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.List;@@ -13,7 +14,6 @@ import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.ObjectLoader;import org.eclipse.jgit.lib.ObjectReader;-import com.google.common.base.Charsets;import com.google.common.base.Optional;import io.onedev.server.util.ContentDetector;@@ -110,7 +110,7 @@ public class Blob {public @Nullable Text getText() {if (optionalText == null) {if (ident.isGitLink() || ident.isSymbolLink() || ident.isTree()) {- Charset charset = Charsets.UTF_8;+ Charset charset = StandardCharsets.UTF_8;optionalText = Optional.of(new Text(charset, new String(bytes, charset)));} else if (!isPartial()) {if (!ContentDetector.isBinary(bytes, ident.path)) {diff --git a/server-core/src/main/java/io/onedev/server/git/BlobEdits.java b/server-core/src/main/java/io/onedev/server/git/BlobEdits.javaindex d847d9bec6..80ea8e1d7a 100644--- a/server-core/src/main/java/io/onedev/server/git/BlobEdits.java+++ b/server-core/src/main/java/io/onedev/server/git/BlobEdits.java@@ -2,6 +2,7 @@ package io.onedev.server.git;import java.io.IOException;import java.io.Serializable;+import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Collections;import java.util.HashMap;@@ -27,7 +28,6 @@ import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import com.google.common.base.Charsets;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;@@ -278,9 +278,9 @@ public class BlobEdits implements Serializable {this.mode = mode;this.id = id;if (mode.equals(FileMode.TYPE_TREE))- nameBytes = (name + "/").getBytes(Charsets.UTF_8);+ nameBytes = (name + "/").getBytes(StandardCharsets.UTF_8);else- nameBytes = name.getBytes(Charsets.UTF_8);+ nameBytes = name.getBytes(StandardCharsets.UTF_8);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/infomanager/AbstractEnvironmentManager.java b/server-core/src/main/java/io/onedev/server/infomanager/AbstractEnvironmentManager.javaindex 5e8afbc8b8..c50fb80007 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/AbstractEnvironmentManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/AbstractEnvironmentManager.java@@ -4,6 +4,7 @@ import java.io.File;import java.io.IOException;import java.nio.ByteBuffer;import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;import java.util.Arrays;import java.util.Collection;import java.util.HashSet;@@ -17,9 +18,6 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.FileUtils;import io.onedev.server.event.system.SystemStopping;--import com.google.common.base.Charsets;-import jetbrains.exodus.ArrayByteIterable;import jetbrains.exodus.ByteIterable;import jetbrains.exodus.env.Environment;@@ -223,7 +221,7 @@ public abstract class AbstractEnvironmentManager {static class StringByteIterable extends ArrayByteIterable {StringByteIterable(String value) {- super(value.getBytes(Charsets.UTF_8));+ super(value.getBytes(StandardCharsets.UTF_8));}}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.javaindex 9f8a5d8f9f..fc2f4253c6 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java@@ -4,6 +4,7 @@ import java.io.File;import java.io.IOException;import java.io.Serializable;import java.nio.ByteBuffer;+import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -36,7 +37,6 @@ import org.eclipse.jgit.revwalk.RevWalk;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.google.common.base.Charsets;import com.google.common.base.Preconditions;import com.google.common.base.Splitter;@@ -1198,7 +1198,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemefor (int pathIndex: pathIndexes) {byte[] pathBytes = readBytes(indexToPathStore, txn, new IntByteIterable(pathIndex));if (pathBytes != null)- paths.add(new String(pathBytes, Charsets.UTF_8));+ paths.add(new String(pathBytes, StandardCharsets.UTF_8));}return paths;}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.javaindex ab37a124ef..634cee6736 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java@@ -3,6 +3,7 @@ package io.onedev.server.maintenance;import java.io.File;import java.io.IOException;import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;import java.util.List;import java.util.concurrent.atomic.AtomicInteger;@@ -17,8 +18,6 @@ import org.joda.time.format.DateTimeFormat;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.google.common.base.Charsets;-import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.launcher.loader.PluginManager;import io.onedev.commons.utils.FileUtils;@@ -450,7 +449,7 @@ public class Upgrade extends DefaultPersistManager {}try {File wrapperConfFile = new File(upgradeDir, "conf/wrapper.conf");- String wrapperConf = FileUtils.readFileToString(wrapperConfFile, Charsets.UTF_8);+ String wrapperConf = FileUtils.readFileToString(wrapperConfFile, StandardCharsets.UTF_8);wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.commons.bootstrap.Bootstrap","io.onedev.commons.launcher.bootstrap.Bootstrap");wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.launcher.bootstrap.Bootstrap",@@ -459,10 +458,10 @@ public class Upgrade extends DefaultPersistManager {"io.onedev.commons.launcher.bootstrap.Bootstrap");wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.launcher.bootstrap.Bootstrap","io.onedev.commons.launcher.bootstrap.Bootstrap");- FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, Charsets.UTF_8);+ FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, StandardCharsets.UTF_8);File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties");- String hibernateProps = FileUtils.readFileToString(hibernatePropsFile, Charsets.UTF_8);+ String hibernateProps = FileUtils.readFileToString(hibernatePropsFile, StandardCharsets.UTF_8);hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.autoCommit=false","hibernate.hikari.autoCommit=true");hibernateProps = StringUtils.replace(hibernateProps, "GitPlex", "OneDev");@@ -485,15 +484,15 @@ public class Upgrade extends DefaultPersistManager {hibernateProps += "hibernate.javax.cache.missing_cache_strategy=create\r\n";}- FileUtils.writeStringToFile(hibernatePropsFile, hibernateProps, Charsets.UTF_8);+ FileUtils.writeStringToFile(hibernatePropsFile, hibernateProps, StandardCharsets.UTF_8);File serverPropsFile = new File(upgradeDir, "conf/server.properties");- String serverProps = FileUtils.readFileToString(serverPropsFile, Charsets.UTF_8);+ String serverProps = FileUtils.readFileToString(serverPropsFile, StandardCharsets.UTF_8);if (serverProps.contains("sessionTimeout"))FileUtils.copyFile(new File(Bootstrap.getConfDir(), "server.properties"), serverPropsFile);File logbackPropsFile = new File(upgradeDir, "conf/logback.xml");- String logbackProps = FileUtils.readFileToString(logbackPropsFile, Charsets.UTF_8);+ String logbackProps = FileUtils.readFileToString(logbackPropsFile, StandardCharsets.UTF_8);if (!logbackProps.contains("AggregatedServiceLoader"))FileUtils.copyFile(new File(Bootstrap.getConfDir(), "logback.xml"), logbackPropsFile);@@ -502,13 +501,13 @@ public class Upgrade extends DefaultPersistManager {FileUtils.deleteFile(sampleKeystoreFile);File logbackConfigFile = new File(upgradeDir, "conf/logback.xml");- String logbackConfig = FileUtils.readFileToString(logbackConfigFile, Charsets.UTF_8);+ String logbackConfig = FileUtils.readFileToString(logbackConfigFile, StandardCharsets.UTF_8);logbackConfig = StringUtils.replace(logbackConfig, "<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"/>","<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"><maxFileSize>1MB</maxFileSize></triggeringPolicy>");logbackConfig = StringUtils.replace(logbackConfig, "gitplex", "turbodev");logbackConfig = StringUtils.replace(logbackConfig, "com.turbodev", "io.onedev");logbackConfig = StringUtils.replace(logbackConfig, "turbodev", "onedev");- FileUtils.writeStringToFile(logbackConfigFile, logbackConfig, Charsets.UTF_8);+ FileUtils.writeStringToFile(logbackConfigFile, logbackConfig, StandardCharsets.UTF_8);FileUtils.copyFile(new File(Bootstrap.installDir, "conf/wrapper-license.conf"),new File(upgradeDir, "conf/wrapper-license.conf"));diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex afd672d745..1a26848c6e 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -120,7 +120,7 @@ public class DataMigrator {private void migrate7(File dataDir, Stack<Integer> versions) {for (File file: dataDir.listFiles()) {try {- String content = FileUtils.readFileToString(file, Charsets.UTF_8);+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);content = StringUtils.replace(content,"com.gitplex.commons.hibernate.migration.VersionTable","com.gitplex.server.model.ModelVersion");@@ -140,7 +140,7 @@ public class DataMigrator {"com.gitplex.server.core.setting.", "com.gitplex.server.model.support.setting.");content = StringUtils.replace(content,"com.gitplex.server.core.gatekeeper.", "com.gitplex.server.gatekeeper.");- FileUtils.writeStringToFile(file, content, Charsets.UTF_8);+ FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8);if (file.getName().equals("VersionTables.xml")) {FileUtils.moveFile(file, new File(file.getParentFile(), "ModelVersions.xml"));@@ -250,7 +250,7 @@ public class DataMigrator {if (file.getName().startsWith("Accounts.xml")) {File renamedFile = new File(dataDir, file.getName().replace("Accounts.xml", "Users.xml"));FileUtils.moveFile(file, renamedFile);- String content = FileUtils.readFileToString(renamedFile, Charsets.UTF_8);+ String content = FileUtils.readFileToString(renamedFile, StandardCharsets.UTF_8);content = StringUtils.replace(content, "com.gitplex.server.model.Account","com.gitplex.server.model.User");VersionedDocument dom = VersionedDocument.fromXML(content);@@ -279,7 +279,7 @@ public class DataMigrator {if (file.getName().startsWith("Depots.xml")) {File renamedFile = new File(dataDir, file.getName().replace("Depots.xml", "Projects.xml"));FileUtils.moveFile(file, renamedFile);- String content = FileUtils.readFileToString(renamedFile, Charsets.UTF_8);+ String content = FileUtils.readFileToString(renamedFile, StandardCharsets.UTF_8);content = StringUtils.replace(content, "com.gitplex.server.model.Depot","com.gitplex.server.model.Project");VersionedDocument dom = VersionedDocument.fromXML(content);@@ -434,10 +434,10 @@ public class DataMigrator {private void migrate13(File dataDir, Stack<Integer> versions) {for (File file: dataDir.listFiles()) {try {- String content = FileUtils.readFileToString(file, Charsets.UTF_8);+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);content = StringUtils.replace(content, "gitplex", "turbodev");content = StringUtils.replace(content, "GitPlex", "TurboDev");- FileUtils.writeFile(file, content, Charsets.UTF_8.name());+ FileUtils.writeFile(file, content, StandardCharsets.UTF_8.name());} catch (IOException e) {throw new RuntimeException(e);}@@ -466,13 +466,13 @@ public class DataMigrator {private void migrate15(File dataDir, Stack<Integer> versions) {for (File file: dataDir.listFiles()) {try {- String content = FileUtils.readFileToString(file, Charsets.UTF_8);+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);content = StringUtils.replace(content, "com.turbodev", "io.onedev");content = StringUtils.replace(content, "com/turbodev", "io/onedev");content = StringUtils.replace(content, "turbodev.com", "onedev.io");content = StringUtils.replace(content, "turbodev", "onedev");content = StringUtils.replace(content, "TurboDev", "OneDev");- FileUtils.writeFile(file, content, Charsets.UTF_8.name());+ FileUtils.writeFile(file, content, StandardCharsets.UTF_8.name());} catch (IOException e) {throw new RuntimeException(e);}@@ -689,7 +689,7 @@ public class DataMigrator {} else if (file.getName().startsWith("Configs.xml")) {String content;try {- content = FileUtils.readFileToString(file, Charsets.UTF_8);+ content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);} catch (IOException e) {throw new RuntimeException(e);}@@ -1048,7 +1048,7 @@ public class DataMigrator {if (file.getName().startsWith("Settings.xml")) {String content;try {- content = FileUtils.readFileToString(file, Charsets.UTF_8.name());+ content = FileUtils.readFileToString(file, StandardCharsets.UTF_8.name());} catch (IOException e) {throw new RuntimeException(e);}@@ -1166,7 +1166,7 @@ public class DataMigrator {} else if (file.getName().startsWith("PullRequests.xml")) {String content;try {- content = FileUtils.readFileToString(file, Charsets.UTF_8.name());+ content = FileUtils.readFileToString(file, StandardCharsets.UTF_8.name());} catch (IOException e) {throw new RuntimeException(e);}@@ -1235,7 +1235,7 @@ public class DataMigrator {} else if (file.getName().startsWith("IssueFieldEntitys.xml")) {String content;try {- content = FileUtils.readFileToString(file, Charsets.UTF_8.name());+ content = FileUtils.readFileToString(file, StandardCharsets.UTF_8.name());} catch (IOException e) {throw new RuntimeException(e);}@@ -1246,14 +1246,14 @@ public class DataMigrator {File renamedFile = new File(dataDir, file.getName().replace("IssueFieldEntitys.xml", "IssueFields.xml"));- FileUtils.writeFile(renamedFile, content, Charsets.UTF_8.name());+ FileUtils.writeFile(renamedFile, content, StandardCharsets.UTF_8.name());}}try (InputStream is = getClass().getResourceAsStream("migrate25_roles.xml")) {Preconditions.checkNotNull(is);FileUtils.writeFile(new File(dataDir, "Roles.xml"),- StringUtils.join(IOUtils.readLines(is, Charsets.UTF_8.name()), "\n"));+ StringUtils.join(IOUtils.readLines(is, StandardCharsets.UTF_8.name()), "\n"));} catch (IOException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/migration/VersionedDocument.java b/server-core/src/main/java/io/onedev/server/migration/VersionedDocument.javaindex 2b8836914a..259293381d 100644--- a/server-core/src/main/java/io/onedev/server/migration/VersionedDocument.java+++ b/server-core/src/main/java/io/onedev/server/migration/VersionedDocument.java@@ -10,6 +10,7 @@ import java.io.ObjectOutput;import java.io.OutputStream;import java.io.StringReader;import java.io.Writer;+import java.nio.charset.StandardCharsets;import java.util.Iterator;import java.util.List;import java.util.Map;@@ -38,7 +39,6 @@ import org.dom4j.io.XMLWriter;import org.hibernate.proxy.HibernateProxyHelper;import org.xml.sax.EntityResolver;-import com.google.common.base.Charsets;import com.google.common.base.Preconditions;import com.thoughtworks.xstream.XStream;import com.thoughtworks.xstream.core.util.HierarchicalStreams;@@ -370,7 +370,7 @@ public final class VersionedDocument implements Document, Externalizable {ByteArrayOutputStream baos = new ByteArrayOutputStream();try {OutputFormat format = new OutputFormat();- format.setEncoding(Charsets.UTF_8.name());+ format.setEncoding(StandardCharsets.UTF_8.name());if (pretty) {format.setIndent(true);format.setIndentSize(4);@@ -380,7 +380,7 @@ public final class VersionedDocument implements Document, Externalizable {format.setNewlines(false);}new XMLWriter(baos, format).write(getWrapped());- return baos.toString(Charsets.UTF_8.name());+ return baos.toString(StandardCharsets.UTF_8.name());} catch (Exception e) {throw ExceptionUtils.unchecked(e);}@@ -393,7 +393,7 @@ public final class VersionedDocument implements Document, Externalizable {OutputFormat format = new OutputFormat();format.setIndent(pretty);format.setNewlines(pretty);- format.setEncoding(Charsets.UTF_8.name());+ format.setEncoding(StandardCharsets.UTF_8.name());XMLWriter writer = new XMLWriter(os, format);writer.write(this);} catch (Exception e) {@@ -413,7 +413,7 @@ public final class VersionedDocument implements Document, Externalizable {public static VersionedDocument fromFile(File file) {try {- return fromXML(FileUtils.readFileToString(file, Charsets.UTF_8.name()));+ return fromXML(FileUtils.readFileToString(file, StandardCharsets.UTF_8.name()));} catch (IOException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.javaindex 18efc2e5a6..8ed03d697d 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java@@ -2,6 +2,7 @@ package io.onedev.server.util.markdown;import java.io.IOException;import java.net.URLDecoder;+import java.nio.charset.StandardCharsets;import org.apache.commons.lang.StringUtils;import org.apache.wicket.request.cycle.RequestCycle;@@ -15,8 +16,6 @@ import org.jsoup.nodes.Node;import org.jsoup.select.NodeTraversor;import org.jsoup.select.NodeVisitor;-import com.google.common.base.Charsets;-import io.onedev.commons.utils.PathUtils;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;@@ -61,7 +60,7 @@ public class UrlProcessor implements MarkdownProcessor {Element element = (Element) node;element.attr("href", resolveUrl(blobRenderContext.getDirectoryUrl(), url));try {- String path = UrlUtils.trimHashAndQuery(URLDecoder.decode(url, Charsets.UTF_8.name()));+ String path = UrlUtils.trimHashAndQuery(URLDecoder.decode(url, StandardCharsets.UTF_8.name()));String directory = blobRenderContext.getDirectory();String referencedPath = PathUtils.resolve(directory, path);referencedPath = GitUtils.normalizePath(referencedPath);@@ -98,7 +97,7 @@ public class UrlProcessor implements MarkdownProcessor {element.attr("src", blobRenderContext.appendRaw(resolveUrl(blobRenderContext.getDirectoryUrl(), url)));try {String basePath = blobRenderContext.getDirectory();- String referencedPath = PathUtils.resolve(basePath, UrlUtils.trimHashAndQuery(URLDecoder.decode(url, Charsets.UTF_8.name())));+ String referencedPath = PathUtils.resolve(basePath, UrlUtils.trimHashAndQuery(URLDecoder.decode(url, StandardCharsets.UTF_8.name())));referencedPath = GitUtils.normalizePath(referencedPath);if (referencedPath != null && (commit == null || TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null)) {element.after("<span class='missing'>!!missing!!</span>");diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/AttachmentUploadServlet.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/AttachmentUploadServlet.javaindex f8908ae725..c6b0ea6157 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/AttachmentUploadServlet.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/AttachmentUploadServlet.java@@ -3,6 +3,7 @@ package io.onedev.server.web.component.markdown;import java.io.IOException;import java.net.URLDecoder;import java.net.URLEncoder;+import java.nio.charset.StandardCharsets;import javax.servlet.ServletException;import javax.servlet.http.HttpServlet;@@ -14,8 +15,6 @@ import org.apache.wicket.util.crypt.Base64;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.google.common.base.Charsets;-@SuppressWarnings("serial")public class AttachmentUploadServlet extends HttpServlet {@@ -24,12 +23,12 @@ public class AttachmentUploadServlet extends HttpServlet {@Overrideprotected void doPost(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException {- String fileName = URLDecoder.decode(request.getHeader("File-Name"), Charsets.UTF_8.name());+ String fileName = URLDecoder.decode(request.getHeader("File-Name"), StandardCharsets.UTF_8.name());AttachmentSupport attachmentSuppport = (AttachmentSupport) SerializationUtils.deserialize(Base64.decodeBase64(request.getHeader("Attachment-Support")));try {String attachmentName = attachmentSuppport.saveAttachment(fileName, request.getInputStream());- response.getWriter().print(URLEncoder.encode(attachmentName, Charsets.UTF_8.name()));+ response.getWriter().print(URLEncoder.encode(attachmentName, StandardCharsets.UTF_8.name()));response.setStatus(HttpServletResponse.SC_OK);} catch (Exception e) {logger.error("Error uploading attachment.", e);diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex f87a18fdbf..be7325c75c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -5,6 +5,7 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;import java.io.Serializable;import java.io.UnsupportedEncodingException;import java.net.URLDecoder;+import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.HashMap;import java.util.List;@@ -44,7 +45,6 @@ import org.unbescape.javascript.JavaScriptEscape;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;-import com.google.common.base.Charsets;import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.AppLoader;@@ -396,7 +396,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {case "insertUrl":String name;try {- name = URLDecoder.decode(params.getParameterValue("param1").toString(), Charsets.UTF_8.name());+ name = URLDecoder.decode(params.getParameterValue("param1").toString(), StandardCharsets.UTF_8.name());} catch (UnsupportedEncodingException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.javaindex 875a21f802..28d29e1d9c 100644--- a/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java@@ -3,6 +3,7 @@ package io.onedev.server.web.download;import java.io.IOException;import java.io.UnsupportedEncodingException;import java.net.URLEncoder;+import java.nio.charset.StandardCharsets;import javax.persistence.EntityNotFoundException;@@ -17,8 +18,6 @@ import org.eclipse.jgit.api.errors.GitAPIException;import org.eclipse.jgit.archive.TgzFormat;import org.eclipse.jgit.archive.ZipFormat;-import com.google.common.base.Charsets;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;@@ -74,7 +73,7 @@ public class ArchiveDownloadResource extends AbstractResource {fileName = revision + ".zip";elsefileName = revision + ".tar.gz";- response.setFileName(URLEncoder.encode(fileName, Charsets.UTF_8.name()));+ response.setFileName(URLEncoder.encode(fileName, StandardCharsets.UTF_8.name()));} catch (UnsupportedEncodingException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.javaindex 1ec0ca8a27..5acaf2e56a 100644--- a/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/ArtifactDownloadResource.java@@ -6,6 +6,7 @@ import java.io.IOException;import java.io.InputStream;import java.io.UnsupportedEncodingException;import java.net.URLEncoder;+import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.List;import java.util.concurrent.Callable;@@ -19,7 +20,6 @@ import org.apache.tika.mime.MimeTypes;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;-import com.google.common.base.Charsets;import com.google.common.base.Joiner;import io.onedev.commons.utils.LockUtils;@@ -99,7 +99,7 @@ public class ArtifactDownloadResource extends AbstractResource {response.disableCaching();try {- response.setFileName(URLEncoder.encode(artifactFile.getName(), Charsets.UTF_8.name()));+ response.setFileName(URLEncoder.encode(artifactFile.getName(), StandardCharsets.UTF_8.name()));} catch (UnsupportedEncodingException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.javaindex 3781be29f9..835d554c19 100644--- a/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java@@ -4,6 +4,7 @@ import java.io.IOException;import java.io.InputStream;import java.io.UnsupportedEncodingException;import java.net.URLEncoder;+import java.nio.charset.StandardCharsets;import javax.persistence.EntityNotFoundException;@@ -14,8 +15,6 @@ import org.apache.tika.mime.MimeTypes;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;-import com.google.common.base.Charsets;-import io.onedev.server.OneDev;import io.onedev.server.buildspec.job.log.LogManager;import io.onedev.server.entitymanager.BuildManager;@@ -67,7 +66,7 @@ public class BuildLogDownloadResource extends AbstractResource {response.disableCaching();try {- response.setFileName(URLEncoder.encode("build-log.txt", Charsets.UTF_8.name()));+ response.setFileName(URLEncoder.encode("build-log.txt", StandardCharsets.UTF_8.name()));} catch (UnsupportedEncodingException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.javaindex ab718bd082..418229e982 100644--- a/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java@@ -6,6 +6,7 @@ import java.io.InputStream;import java.io.OutputStream;import java.io.UnsupportedEncodingException;import java.net.URLEncoder;+import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.List;@@ -19,8 +20,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;import org.eclipse.jgit.lib.ObjectId;-import com.google.common.base.Charsets;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.git.Blob;@@ -91,7 +90,7 @@ public class RawBlobDownloadResource extends AbstractResource {response.disableCaching();try {- response.setFileName(URLEncoder.encode(blob.getIdent().getName(), Charsets.UTF_8.name()));+ response.setFileName(URLEncoder.encode(blob.getIdent().getName(), StandardCharsets.UTF_8.name()));} catch (UnsupportedEncodingException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.javaindex dc20940942..4ea89f3e45 100644--- a/server-core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.java+++ b/server-core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.java@@ -4,6 +4,7 @@ import java.io.File;import java.io.IOException;import java.io.UnsupportedEncodingException;import java.net.URLEncoder;+import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.List;@@ -11,13 +12,12 @@ import org.apache.shiro.authz.UnauthorizedException;import org.apache.tika.mime.MimeTypes;import org.apache.wicket.request.resource.AbstractResource;+import com.google.common.base.Joiner;+import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;import io.onedev.server.util.SecurityUtils;-import com.google.common.base.Charsets;-import com.google.common.base.Joiner;-public class ServerLogDownloadResource extends AbstractResource {private static final long serialVersionUID = 1L;@@ -33,7 +33,7 @@ public class ServerLogDownloadResource extends AbstractResource {response.disableCaching();try {- response.setFileName(URLEncoder.encode("server-log.txt", Charsets.UTF_8.name()));+ response.setFileName(URLEncoder.encode("server-log.txt", StandardCharsets.UTF_8.name()));} catch (UnsupportedEncodingException e) {throw new RuntimeException(e);}@@ -42,7 +42,7 @@ public class ServerLogDownloadResource extends AbstractResource {@Overridepublic void writeData(Attributes attributes) throws IOException {String content = Joiner.on("\n").join(readServerLog());- attributes.getResponse().getOutputStream().write(content.getBytes(Charsets.UTF_8));+ attributes.getResponse().getOutputStream().write(content.getBytes(StandardCharsets.UTF_8));}});@@ -58,9 +58,9 @@ public class ServerLogDownloadResource extends AbstractResource {for (int i=index; i>=1; i--) {File rollFile = new File(logDir, logFile.getName() + "." + i);if (rollFile.exists())- lines.addAll((FileUtils.readLines(rollFile, Charsets.UTF_8)));+ lines.addAll((FileUtils.readLines(rollFile, StandardCharsets.UTF_8)));}- lines.addAll((FileUtils.readLines(logFile, Charsets.UTF_8)));+ lines.addAll((FileUtils.readLines(logFile, StandardCharsets.UTF_8)));} catch (IOException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/PathAwareUrl.java b/server-core/src/main/java/io/onedev/server/web/mapper/PathAwareUrl.javaindex a6275088f7..c15f9ed94e 100644--- a/server-core/src/main/java/io/onedev/server/web/mapper/PathAwareUrl.java+++ b/server-core/src/main/java/io/onedev/server/web/mapper/PathAwareUrl.java@@ -1,11 +1,11 @@package io.onedev.server.web.mapper;import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;import org.apache.wicket.request.Url;import org.apache.wicket.util.encoding.UrlEncoder;-import com.google.common.base.Charsets;import com.google.common.base.Splitter;public class PathAwareUrl extends Url {@@ -26,7 +26,7 @@ public class PathAwareUrl extends Url {path.append('/');}if (segment.indexOf('/') != -1) {- Url url = new Url(Splitter.on('/').splitToList(segment), Charsets.UTF_8);+ Url url = new Url(Splitter.on('/').splitToList(segment), StandardCharsets.UTF_8);path.append(url.getPath());} else {path.append(UrlEncoder.PATH_INSTANCE.encode(segment, charset));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.javaindex 8f7f5ddb59..d0e6c6f30d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.blob.render.edit.plain;+import java.nio.charset.StandardCharsets;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -7,8 +9,6 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.model.Model;-import com.google.common.base.Charsets;-@SuppressWarnings("serial")public class PlainEditPanel extends FormComponentPanel<byte[]> {@@ -25,7 +25,7 @@ public class PlainEditPanel extends FormComponentPanel<byte[]> {protected void onInitialize() {super.onInitialize();- add(input = new TextArea<String>("input", Model.of(new String(getModelObject(), Charsets.UTF_8))) {+ add(input = new TextArea<String>("input", Model.of(new String(getModelObject(), StandardCharsets.UTF_8))) {@Overrideprotected boolean shouldTrimInput() {@@ -38,7 +38,7 @@ public class PlainEditPanel extends FormComponentPanel<byte[]> {@Overridepublic void convertInput() {if (input.getConvertedInput() != null)- setConvertedInput(input.getConvertedInput().getBytes(Charsets.UTF_8));+ setConvertedInput(input.getConvertedInput().getBytes(StandardCharsets.UTF_8));elsesetConvertedInput(new byte[0]);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.javaindex ed5013c45d..ed4fdd5bfa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java@@ -1,6 +1,7 @@package io.onedev.server.web.page.project.blob.render.renderers.buildspec;import java.io.Serializable;+import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.List;@@ -26,7 +27,6 @@ import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidator;import org.unbescape.javascript.JavaScriptEscape;-import com.google.common.base.Charsets;import com.google.common.base.Throwables;import io.onedev.commons.launcher.loader.AppLoader;@@ -290,7 +290,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bupublic void convertInput() {if (parseResult instanceof BuildSpec) {BuildSpec buildSpec = getBuildSpec();- setConvertedInput(VersionedDocument.fromBean(buildSpec).toXML().getBytes(Charsets.UTF_8));+ setConvertedInput(VersionedDocument.fromBean(buildSpec).toXML().getBytes(StandardCharsets.UTF_8));} else {setConvertedInput(getModelObject());}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.javaindex d7f365fbab..5f61ff167a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java@@ -1,6 +1,7 @@package io.onedev.server.web.page.project.blob.render.renderers.markdown;import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.IHeaderResponse;@@ -8,8 +9,6 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.model.Model;-import com.google.common.base.Charsets;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.util.ContentDetector;@@ -69,7 +68,7 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {String initialContent = input.getModelObject();if (initialContent == null || !initialContent.contains("\r\n"))content = StringUtils.replace(content, "\r\n", "\n");- setConvertedInput(content.getBytes(Charsets.UTF_8));+ setConvertedInput(content.getBytes(StandardCharsets.UTF_8));} else {setConvertedInput(new byte[0]);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.javaindex 0480b29814..605d5f34e1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java@@ -1,6 +1,7 @@package io.onedev.server.web.page.project.blob.render.renderers.source;import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -11,7 +12,6 @@ import org.unbescape.javascript.JavaScriptEscape;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;-import com.google.common.base.Charsets;import io.onedev.commons.utils.PlanarRange;import io.onedev.commons.utils.StringUtils;@@ -59,7 +59,7 @@ abstract class SourceFormComponent extends FormComponentPanel<byte[]> {String initialContent = input.getModelObject();if (initialContent == null || !initialContent.contains("\r\n"))content = StringUtils.replace(content, "\r\n", "\n");- setConvertedInput(content.getBytes(Charsets.UTF_8));+ setConvertedInput(content.getBytes(StandardCharsets.UTF_8));} else {setConvertedInput(new byte[0]);}diff --git a/server-core/src/main/java/org/eclipse/jetty/server/Response.java b/server-core/src/main/java/org/eclipse/jetty/server/Response.javaindex 580276427d..be239bc653 100644--- a/server-core/src/main/java/org/eclipse/jetty/server/Response.java+++ b/server-core/src/main/java/org/eclipse/jetty/server/Response.java@@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.Collectors;import javax.servlet.RequestDispatcher;+import javax.servlet.ServletException;import javax.servlet.ServletOutputStream;import javax.servlet.http.Cookie;import javax.servlet.http.HttpServletResponse;@@ -549,7 +550,11 @@ public class Response implements HttpServletResponserequest.setAttribute(RequestDispatcher.ERROR_MESSAGE, message);request.setAttribute(RequestDispatcher.ERROR_REQUEST_URI, request.getRequestURI());request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME,request.getServletName());- error_handler.handle(null,_channel.getRequest(),_channel.getRequest(),this );+ try {+ error_handler.handle(null,_channel.getRequest(),_channel.getRequest(),this );+ } catch (ServletException e) {+ throw new RuntimeException(e);+ }}else{diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.javaindex a554ecea09..6fc5f256ad 100644--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java@@ -6,6 +6,7 @@ import java.io.IOException;import java.io.Serializable;import java.io.UnsupportedEncodingException;import java.net.URLEncoder;+import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Date;import java.util.HashSet;@@ -20,7 +21,6 @@ import java.util.function.Consumer;import javax.validation.ConstraintValidatorContext;-import org.apache.commons.codec.Charsets;import org.apache.commons.lang3.SystemUtils;import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;@@ -359,7 +359,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, VStringBuilder builder = new StringBuilder();docker.clearArgs();docker.addArgs("inspect", containerName);- docker.execute(new LineConsumer(Charsets.UTF_8.name()) {+ docker.execute(new LineConsumer(StandardCharsets.UTF_8.name()) {@Overridepublic void consume(String line) {@@ -417,14 +417,14 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, Vdocker.clearArgs();docker.addArgs("logs", containerName);- docker.execute(new LineConsumer(Charsets.UTF_8.name()) {+ docker.execute(new LineConsumer(StandardCharsets.UTF_8.name()) {@Overridepublic void consume(String line) {jobLogger.log(line);}- }, new LineConsumer(Charsets.UTF_8.name()) {+ }, new LineConsumer(StandardCharsets.UTF_8.name()) {@Overridepublic void consume(String line) {@@ -614,7 +614,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, Vif (serverConfig.getTrustCertsDir() != null) {for (File file: serverConfig.getTrustCertsDir().listFiles()) {if (file.isFile())- trustCertContent.addAll(FileUtils.readLines(file));+ trustCertContent.addAll(FileUtils.readLines(file, StandardCharsets.UTF_8));}}@@ -644,8 +644,8 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, VList<String> submoduleCredentials = new ArrayList<>();for (SubmoduleCredential submoduleCredential: jobContext.getSubmoduleCredentials()) {String url = submoduleCredential.getUrl();- String userName = URLEncoder.encode(submoduleCredential.getUserName(), Charsets.UTF_8.name());- String password = URLEncoder.encode(submoduleCredential.getPasswordSecret(), Charsets.UTF_8.name());+ String userName = URLEncoder.encode(submoduleCredential.getUserName(), StandardCharsets.UTF_8.name());+ String password = URLEncoder.encode(submoduleCredential.getPasswordSecret(), StandardCharsets.UTF_8.name());if (url.startsWith("http://")) {submoduleCredentials.add("http://" + userName + ":" + password+ "@" + url.substring("http://".length()).replace(":", "%3a"));@@ -822,14 +822,14 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, VjobLogger.log("Running job container...");try {- docker.execute(new LineConsumer(Charsets.UTF_8.name()) {+ docker.execute(new LineConsumer(StandardCharsets.UTF_8.name()) {@Overridepublic void consume(String line) {jobLogger.log(line);}- }, new LineConsumer(Charsets.UTF_8.name()) {+ }, new LineConsumer(StandardCharsets.UTF_8.name()) {@Overridepublic void consume(String line) {@@ -902,7 +902,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, Vcmd.addArgs(login.getRegistryUrl());ByteArrayInputStream input;try {- input = new ByteArrayInputStream(login.getPassword().getBytes(Charsets.UTF_8.name()));+ input = new ByteArrayInputStream(login.getPassword().getBytes(StandardCharsets.UTF_8.name()));} catch (UnsupportedEncodingException e) {throw new RuntimeException(e);}diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex 5fc87a3bc6..be23ee679a 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -5,6 +5,7 @@ import java.io.File;import java.io.IOException;import java.io.InputStream;import java.io.Serializable;+import java.nio.charset.StandardCharsets;import java.time.Instant;import java.time.format.DateTimeFormatter;import java.time.format.DateTimeParseException;@@ -20,7 +21,6 @@ import java.util.concurrent.atomic.AtomicReference;import javax.annotation.Nullable;-import org.apache.commons.codec.Charsets;import org.apache.commons.codec.binary.Base64;import org.apache.commons.io.IOUtils;import org.hibernate.validator.constraints.NotEmpty;@@ -208,7 +208,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatamaskedYaml = StringUtils.replace(maskedYaml, secret, SecretInput.MASK);logger.trace("Creating resource:\n" + maskedYaml);- FileUtils.writeFile(file, resourceYaml, Charsets.UTF_8.name());+ FileUtils.writeFile(file, resourceYaml, StandardCharsets.UTF_8.name());kubectl.addArgs("create", "-f", file.getAbsolutePath(), "-o", "jsonpath={.metadata.name}");kubectl.execute(new LineConsumer() {@@ -400,7 +400,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataif (registryUrl == null)registryUrl = "https://index.docker.io/v1/";auths.put(registryUrl, CollectionUtils.newLinkedHashMap(- "auth", Base64.encodeBase64String(auth.getBytes(Charsets.UTF_8))));+ "auth", Base64.encodeBase64String(auth.getBytes(StandardCharsets.UTF_8))));}ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);try {@@ -415,7 +415,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData"name", secretName,"namespace", namespace),"data", CollectionUtils.newLinkedHashMap(- ".dockerconfigjson", Base64.encodeBase64String(dockerConfig.getBytes(Charsets.UTF_8))));+ ".dockerconfigjson", Base64.encodeBase64String(dockerConfig.getBytes(StandardCharsets.UTF_8))));secretDef.put("type", "kubernetes.io/dockerconfigjson");createResource(secretDef, encodedSecrets.values(), jobLogger);return secretName;@@ -442,7 +442,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatafor (File file: trustCertsDir.listFiles()) {if (file.isFile()) {try {- configMapData.put("specified-cert-" + file.getName(), FileUtils.readFileToString(file));+ configMapData.put("specified-cert-" + file.getName(),+ FileUtils.readFileToString(file, StandardCharsets.UTF_8));} catch (IOException e) {throw new RuntimeException(e);}diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.javaindex d54ae1ec0c..ee775d6af9 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportDownloadResource.java@@ -6,6 +6,7 @@ import java.io.IOException;import java.io.InputStream;import java.io.UnsupportedEncodingException;import java.net.URLEncoder;+import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.util.ArrayList;import java.util.List;@@ -19,7 +20,6 @@ import org.apache.tika.io.IOUtils;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;-import com.google.common.base.Charsets;import com.google.common.base.Joiner;import io.onedev.commons.utils.LockUtils;@@ -113,7 +113,7 @@ public class HtmlReportDownloadResource extends AbstractResource {response.disableCaching();try {- response.setFileName(URLEncoder.encode(htmlFile.getName(), Charsets.UTF_8.name()));+ response.setFileName(URLEncoder.encode(htmlFile.getName(), StandardCharsets.UTF_8.name()));} catch (UnsupportedEncodingException e) {throw new RuntimeException(e);}diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.javaindex c94893eeb9..7e5034b3e0 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java@@ -1,6 +1,7 @@package io.onedev.server.plugin.report.html;import java.io.File;+import java.nio.charset.StandardCharsets;import java.util.concurrent.Callable;import javax.annotation.Nullable;@@ -47,7 +48,7 @@ public class HtmlReportPage extends BuildDetailPage {File startPageFile = new File(getBuild().getReportDir(JobHtmlReport.DIR),reportName + "/" + JobHtmlReport.START_PAGE);if (startPageFile.exists())- return FileUtils.readFileToString(startPageFile);+ return FileUtils.readFileToString(startPageFile, StandardCharsets.UTF_8);elsereturn null;}diff --git a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.javaindex ce1b0da911..73652195a6 100644--- a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java+++ b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java@@ -2,6 +2,7 @@ package io.onedev.server.product;import java.io.File;import java.io.IOException;+import java.nio.charset.StandardCharsets;import javax.inject.Inject;import javax.inject.Singleton;@@ -79,7 +80,7 @@ public class DefaultServerConfig implements ServerConfig {keystoreEncoding = keystoreEncoding.trim();if ("base64".equals(keystoreEncoding)) {try {- String content = FileUtils.readFileToString(keystoreFile);+ String content = FileUtils.readFileToString(keystoreFile, StandardCharsets.UTF_8);keystoreFile = File.createTempFile("keystore", "pfx");FileUtils.writeByteArrayToFile(keystoreFile, Base64.decodeBase64(content));} catch (IOException e) {diff --git a/server-product/src/main/java/io/onedev/server/product/ProductConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductConfigurator.javaindex d385732a66..c6919ad68c 100644--- a/server-product/src/main/java/io/onedev/server/product/ProductConfigurator.java+++ b/server-product/src/main/java/io/onedev/server/product/ProductConfigurator.java@@ -31,7 +31,7 @@ public class ProductConfigurator implements ServerConfigurator {}if (serverConfig.getHttpsPort() != 0) {- SslContextFactory sslContextFactory = new SslContextFactory();+ SslContextFactory sslContextFactory = new SslContextFactory.Server();sslContextFactory.setKeyStoreType("pkcs12");sslContextFactory.setKeyStorePath(serverConfig.getKeystoreFile().getAbsolutePath());sslContextFactory.setKeyStorePassword(serverConfig.getKeystorePassword());