The Unified and Autonomous Development Platform
Merge branch 'stable'
Robin Shenacc8f0e52fff
diff --cc server-core/src/main/java/io/onedev/server/CoreModule.javaindex b34144b245,42e298bde4..78c830621f--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@@ -59,6 -60,8 +59,7 @@@ import org.hibernate.boot.model.naming.import org.hibernate.collection.internal.PersistentBag;import org.hibernate.exception.ConstraintViolationException;import org.hibernate.type.Type;+ import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;-import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.collect.Lists;import com.google.common.collect.Sets;@@@ -391,13 -392,7 +395,11 @@@ public class CoreModule extends Abstracbind(CommitQuerySettingManager.class).to(DefaultCommitQuerySettingManager.class);bind(BuildQuerySettingManager.class).to(DefaultBuildQuerySettingManager.class);bind(WebHookManager.class);--+ bind(SshKeyManager.class).to(DefaultSshKeyManager.class);+ bind(KeyPairProvider.class).to(DefaultKeyPairProvider.class);+ bind(ServerKeyPairPopulator.class).to(DefaultServerKeyPairPopulator.class);++ bind(SimpleGitSshServer.class);-contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);