You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2018/07/25 06:13:42 UTC
[1/5] mina-sshd git commit: [SSHD-340] Mark SSH client/server as
having 'Opened' state if re-started after being stopped
Repository: mina-sshd
Updated Branches:
refs/heads/master c7f3a3d83 -> 0cf8186ad
[SSHD-340] Mark SSH client/server as having 'Opened' state if re-started after being stopped
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/738264f4
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/738264f4
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/738264f4
Branch: refs/heads/master
Commit: 738264f423540c095bfb919d4e066721762e00ca
Parents: bd8fe7e
Author: Goldstein Lyor <ly...@c-b4.com>
Authored: Wed Jul 25 09:04:11 2018 +0300
Committer: Goldstein Lyor <ly...@c-b4.com>
Committed: Wed Jul 25 09:04:40 2018 +0300
----------------------------------------------------------------------
.../java/org/apache/sshd/client/SshClient.java | 8 ++++-
.../org/apache/sshd/common/io/IoAcceptor.java | 32 ++++++++++++++++++++
.../util/closeable/AbstractCloseable.java | 17 +++++++++++
.../java/org/apache/sshd/server/SshServer.java | 20 ++++++++----
.../java/org/apache/sshd/client/ClientTest.java | 26 ++++++++++++++++
.../org/apache/sshd/server/SshServerTest.java | 27 ++++++++++++++++-
6 files changed, 122 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/738264f4/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
index 143e4d7..dc4cfdf 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
@@ -72,6 +72,7 @@ import org.apache.sshd.common.future.SshFutureListener;
import org.apache.sshd.common.helpers.AbstractFactoryManager;
import org.apache.sshd.common.io.IoConnectFuture;
import org.apache.sshd.common.io.IoConnector;
+import org.apache.sshd.common.io.IoServiceFactory;
import org.apache.sshd.common.io.IoSession;
import org.apache.sshd.common.keyprovider.KeyPairProvider;
import org.apache.sshd.common.session.helpers.AbstractSession;
@@ -371,6 +372,9 @@ public class SshClient extends AbstractFactoryManager implements ClientFactoryMa
*/
public void start() {
if (isStarted()) {
+ if (log.isDebugEnabled()) {
+ log.debug("start({}) already started", this);
+ }
return;
}
@@ -380,6 +384,7 @@ public class SshClient extends AbstractFactoryManager implements ClientFactoryMa
}
setupSessionTimeout(sessionFactory);
+ reopenIfNotOpen();
connector = createConnector();
started.set(true);
@@ -687,7 +692,8 @@ public class SshClient extends AbstractFactoryManager implements ClientFactoryMa
}
protected IoConnector createConnector() {
- return getIoServiceFactory().createConnector(getSessionFactory());
+ IoServiceFactory factory = getIoServiceFactory();
+ return factory.createConnector(getSessionFactory());
}
protected SessionFactory createSessionFactory() {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/738264f4/sshd-core/src/main/java/org/apache/sshd/common/io/IoAcceptor.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/io/IoAcceptor.java b/sshd-core/src/main/java/org/apache/sshd/common/io/IoAcceptor.java
index a86b73e..8ea353d 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/io/IoAcceptor.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/io/IoAcceptor.java
@@ -19,10 +19,15 @@
package org.apache.sshd.common.io;
import java.io.IOException;
+import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
import java.util.Set;
+import org.apache.sshd.common.util.GenericUtils;
+
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
@@ -41,4 +46,31 @@ public interface IoAcceptor extends IoService {
Set<SocketAddress> getBoundAddresses();
+ /**
+ * @param acceptor The {@link IoAcceptor} - ignored if {@code null}
+ * @return The port associated with the <u>first</u> bound address - {@code -1} if none available
+ * @see #resolveBoundAddress(IoAcceptor)
+ */
+ static int resolveBoundPort(IoAcceptor acceptor) {
+ SocketAddress boundEndpoint = resolveBoundAddress(acceptor);
+ if (boundEndpoint instanceof InetSocketAddress) {
+ return ((InetSocketAddress) boundEndpoint).getPort();
+ }
+
+ return -1;
+ }
+
+ /**
+ * @param acceptor The {@link IoAcceptor} - ignored if {@code null}
+ * @return The <u>first</u> bound address - {@code null} if none available
+ * @see #getBoundAddresses()
+ */
+ static SocketAddress resolveBoundAddress(IoAcceptor acceptor) {
+ Collection<SocketAddress> boundAddresses = (acceptor == null) ? Collections.emptySet() : acceptor.getBoundAddresses();
+ if (GenericUtils.isEmpty(boundAddresses)) {
+ return null;
+ }
+ Iterator<SocketAddress> boundIterator = boundAddresses.iterator();
+ return boundIterator.next();
+ }
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/738264f4/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/AbstractCloseable.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/AbstractCloseable.java b/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/AbstractCloseable.java
index dffbd5b..dc1838f 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/AbstractCloseable.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/AbstractCloseable.java
@@ -145,6 +145,23 @@ public abstract class AbstractCloseable extends IoBaseCloseable {
}
/**
+ * Checks if the current state is {@link State#Opened} and sets it
+ * as such if not.
+ *
+ * @return {@code true} if had to set the state to {@link State#Opened}
+ */
+ protected boolean reopenIfNotOpen() {
+ State curState = state.get();
+ if (curState == State.Opened) {
+ return false;
+ }
+
+ log.info("reopenIfNotOpen({}) update state {} -> {}", this, curState, State.Opened);
+ state.set(State.Opened);
+ return true;
+ }
+
+ /**
* <P>doCloseImmediately is called once and only once
* with state == Immediate</P>
*
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/738264f4/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java b/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
index 35b72cc..0cd139e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
@@ -278,7 +278,11 @@ public class SshServer extends AbstractFactoryManager implements ServerFactoryMa
* @throws IOException If failed to start
*/
public void start() throws IOException {
+ boolean debugEnabled = log.isDebugEnabled();
if (isStarted()) {
+ if (debugEnabled) {
+ log.debug("start({}) already started", this);
+ }
return;
}
@@ -289,33 +293,37 @@ public class SshServer extends AbstractFactoryManager implements ServerFactoryMa
acceptor = createAcceptor();
setupSessionTimeout(sessionFactory);
+ reopenIfNotOpen();
String hostsList = getHost();
if (!GenericUtils.isEmpty(hostsList)) {
String[] hosts = GenericUtils.split(hostsList, ',');
+ boolean traceEnabled = log.isTraceEnabled();
for (String host : hosts) {
- if (log.isDebugEnabled()) {
+ if (debugEnabled) {
log.debug("start() - resolve bind host={}", host);
}
InetAddress[] inetAddresses = InetAddress.getAllByName(host);
for (InetAddress inetAddress : inetAddresses) {
- if (log.isTraceEnabled()) {
+ if (traceEnabled) {
log.trace("start() - bind host={} / {}", host, inetAddress);
}
acceptor.bind(new InetSocketAddress(inetAddress, port));
if (port == 0) {
- port = ((InetSocketAddress) acceptor.getBoundAddresses().iterator().next()).getPort();
- log.info("start() listen on auto-allocated port=" + port);
+ port = IoAcceptor.resolveBoundPort(acceptor);
+ ValidateUtils.checkState(port > 0, "Cannot resolve bound port for host=%s", host);
+ log.info("start() listen on auto-allocated port={} for host={}[{}]", port, host, inetAddress);
}
}
}
} else {
acceptor.bind(new InetSocketAddress(port));
if (port == 0) {
- port = ((InetSocketAddress) acceptor.getBoundAddresses().iterator().next()).getPort();
- log.info("start() listen on auto-allocated port=" + port);
+ port = IoAcceptor.resolveBoundPort(acceptor);
+ ValidateUtils.checkState(port > 0, "Cannot resolve generic bound port");
+ log.info("start({}) listen on auto-allocated port={}", this, port);
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/738264f4/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java b/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java
index 43d6d33..4589b48 100644
--- a/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java
@@ -245,6 +245,32 @@ public class ClientTest extends BaseTestSupport {
}
@Test
+ public void testClientStopIsIdempotent() throws Exception {
+ client.start();
+ for (int index = 1; index <= 4; index++) {
+ client.stop();
+ }
+ }
+
+ @Test // see SSHD-340
+ public void testClientIsRestartable() throws Exception {
+ for (int index = 1; index <= 4; index++) {
+ client.start();
+ assertTrue("Client not started at attempt #" + index, client.isStarted());
+ assertTrue("Client not open at attempt #" + index, client.isOpen());
+
+ try (ClientSession s = client.connect(getCurrentTestName(), TEST_LOCALHOST, port).verify(7L, TimeUnit.SECONDS).getSession()) {
+ s.addPasswordIdentity(getCurrentTestName());
+ s.auth().verify(11L, TimeUnit.SECONDS);
+ } catch (Exception e) {
+ fail("Failed (" + e.getClass().getSimpleName() + ") to authenticate at attempt #" + index + ": " + e.getMessage());
+ }
+
+ client.stop();
+ }
+ }
+
+ @Test
public void testPropertyResolutionHierarchy() throws Exception {
String sessionPropName = getCurrentTestName() + "-session";
AtomicReference<Object> sessionConfigValueHolder = new AtomicReference<>(null);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/738264f4/sshd-core/src/test/java/org/apache/sshd/server/SshServerTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/server/SshServerTest.java b/sshd-core/src/test/java/org/apache/sshd/server/SshServerTest.java
index a683afb..43cadec 100644
--- a/sshd-core/src/test/java/org/apache/sshd/server/SshServerTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/server/SshServerTest.java
@@ -20,7 +20,10 @@ package org.apache.sshd.server;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.apache.sshd.client.SshClient;
+import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.util.test.BaseTestSupport;
import org.junit.FixMethodOrder;
import org.junit.Test;
@@ -81,8 +84,30 @@ public class SshServerTest extends BaseTestSupport {
sshd.start();
assertNotEquals(0, sshd.getPort());
-
sshd.stop();
}
}
+
+ @Test // see SSHD-340
+ public void testServerRestartable() throws Exception {
+ try (SshClient client = setupTestClient();
+ SshServer sshd = setupTestServer()) {
+ sshd.setHost(TEST_LOCALHOST);
+ client.start();
+
+ for (int index = 1; index <= 4; index++) {
+ sshd.start();
+ assertTrue("SSHD not started at attempt #" + index, sshd.isStarted());
+ assertTrue("SSHD not open at attempt #" + index, sshd.isOpen());
+
+ int port = sshd.getPort();
+ try (ClientSession s = client.connect(getCurrentTestName(), TEST_LOCALHOST, port).verify(7L, TimeUnit.SECONDS).getSession()) {
+ s.addPasswordIdentity(getCurrentTestName());
+ s.auth().verify(11L, TimeUnit.SECONDS);
+ } catch (Exception e) {
+ fail("Failed (" + e.getClass().getSimpleName() + ") to authenticate at attempt #" + index + ": " + e.getMessage());
+ }
+ }
+ }
+ }
}
[3/5] mina-sshd git commit: Added checkstyle suppressions
configuration
Posted by lg...@apache.org.
Added checkstyle suppressions configuration
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/75a56bcd
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/75a56bcd
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/75a56bcd
Branch: refs/heads/master
Commit: 75a56bcdcc17f568a4f024c0bdf50d8a46667195
Parents: c7f3a3d
Author: Goldstein Lyor <ly...@c-b4.com>
Authored: Wed Jul 25 08:10:05 2018 +0300
Committer: Goldstein Lyor <ly...@c-b4.com>
Committed: Wed Jul 25 09:04:40 2018 +0300
----------------------------------------------------------------------
pom.xml | 2 ++
sshd-checkstyle-suppressions.xml | 10 ++++++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/75a56bcd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c3d395e..9f5b4d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -800,6 +800,8 @@
<configuration>
<configLocation>${workspace.root.dir}${file.separator}sshd-checkstyle.xml</configLocation>
<headerLocation>${workspace.root.dir}${file.separator}java-checkstyle-license-header.txt</headerLocation>
+ <suppressionsLocation>${workspace.root.dir}${file.separator}sshd-checkstyle-suppressions.xml</suppressionsLocation>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/75a56bcd/sshd-checkstyle-suppressions.xml
----------------------------------------------------------------------
diff --git a/sshd-checkstyle-suppressions.xml b/sshd-checkstyle-suppressions.xml
new file mode 100644
index 0000000..0cd2719
--- /dev/null
+++ b/sshd-checkstyle-suppressions.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<!-- Suppress text files checks -->
+<!-- See http://stackoverflow.com/questions/18013322/checkstyle-exclude-folder -->
+<suppressions>
+ <suppress files="[\\/]*\.txt" checks="[a-zA-Z0-9]*"/>
+ <suppress files="[\\/]*\.properties" checks="[a-zA-Z0-9]*"/>
+</suppressions>
+
[5/5] mina-sshd git commit: Fixed typo error in VersionProperties +
added unit test for it
Posted by lg...@apache.org.
Fixed typo error in VersionProperties + added unit test for it
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/0cf8186a
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/0cf8186a
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/0cf8186a
Branch: refs/heads/master
Commit: 0cf8186ad1ab1a3db7e66a3a4e5a13bbaf9a51fd
Parents: 738264f
Author: Goldstein Lyor <ly...@c-b4.com>
Authored: Wed Jul 25 09:13:33 2018 +0300
Committer: Goldstein Lyor <ly...@c-b4.com>
Committed: Wed Jul 25 09:13:33 2018 +0300
----------------------------------------------------------------------
.../sshd/common/config/VersionProperties.java | 25 ++++++-----
.../sshd/common/VersionPropertiesTest.java | 45 ++++++++++++++++++++
2 files changed, 59 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0cf8186a/sshd-core/src/main/java/org/apache/sshd/common/config/VersionProperties.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/VersionProperties.java b/sshd-core/src/main/java/org/apache/sshd/common/config/VersionProperties.java
index 16beb8e..c7e4271 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/config/VersionProperties.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/config/VersionProperties.java
@@ -22,7 +22,7 @@ package org.apache.sshd.common.config;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.Collections;
-import java.util.Map;
+import java.util.NavigableMap;
import java.util.Properties;
import java.util.TreeMap;
@@ -36,19 +36,19 @@ import org.slf4j.LoggerFactory;
*/
public final class VersionProperties {
private static class LazyHolder {
- private static final Map<String, String> PROPERTIES =
- Collections.unmodifiableMap(loadVersionProperties(LazyHolder.class));
+ private static final NavigableMap<String, String> PROPERTIES =
+ Collections.unmodifiableNavigableMap(loadVersionProperties(LazyHolder.class));
- private static Map<String, String> loadVersionProperties(Class<?> anchor) {
+ private static NavigableMap<String, String> loadVersionProperties(Class<?> anchor) {
return loadVersionProperties(anchor, ThreadUtils.resolveDefaultClassLoader(anchor));
}
- private static Map<String, String> loadVersionProperties(Class<?> anchor, ClassLoader loader) {
- Map<String, String> result = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ private static NavigableMap<String, String> loadVersionProperties(Class<?> anchor, ClassLoader loader) {
+ NavigableMap<String, String> result = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
try {
InputStream input = loader.getResourceAsStream("org/apache/sshd/sshd-version.properties");
if (input == null) {
- throw new FileNotFoundException("Resource does not exists");
+ throw new FileNotFoundException("Version resource does not exist");
}
Properties props = new Properties();
@@ -59,9 +59,10 @@ public final class VersionProperties {
}
for (String key : props.stringPropertyNames()) {
- String value = GenericUtils.trimToEmpty(props.getProperty(key));
+ String propValue = props.getProperty(key);
+ String value = GenericUtils.trimToEmpty(propValue);
if (GenericUtils.isEmpty(value)) {
- continue; // we have no need for empty value
+ continue; // we have no need for empty values
}
String prev = result.put(key, value);
@@ -83,9 +84,11 @@ public final class VersionProperties {
throw new UnsupportedOperationException("No instance");
}
+ /**
+ * @return A case <u>insensitive</u> un-modifiable {@link NavigableMap} of the {@code sshd-version.properties} data
+ */
@SuppressWarnings("synthetic-access")
- public static Map<String, String> getVersionProperties() {
+ public static NavigableMap<String, String> getVersionProperties() {
return LazyHolder.PROPERTIES;
}
-
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0cf8186a/sshd-core/src/test/java/org/apache/sshd/common/VersionPropertiesTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/VersionPropertiesTest.java b/sshd-core/src/test/java/org/apache/sshd/common/VersionPropertiesTest.java
new file mode 100644
index 0000000..06cfffc
--- /dev/null
+++ b/sshd-core/src/test/java/org/apache/sshd/common/VersionPropertiesTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sshd.common;
+
+import java.util.Map;
+
+import org.apache.sshd.common.config.VersionProperties;
+import org.apache.sshd.common.util.GenericUtils;
+import org.apache.sshd.util.test.BaseTestSupport;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+/**
+ * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class VersionPropertiesTest extends BaseTestSupport {
+ public VersionPropertiesTest() {
+ super();
+ }
+
+ @Test
+ public void testNonEmptyProperties() {
+ Map<?, ?> props = VersionProperties.getVersionProperties();
+ assertTrue(GenericUtils.isNotEmpty(props));
+ }
+}
[4/5] mina-sshd git commit: Upgraded Bouncycastle version to 1.60
Posted by lg...@apache.org.
Upgraded Bouncycastle version to 1.60
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/5cada43a
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/5cada43a
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/5cada43a
Branch: refs/heads/master
Commit: 5cada43aa31d48867e7bdff492c071d74a22dd65
Parents: 75a56bc
Author: Goldstein Lyor <ly...@c-b4.com>
Authored: Wed Jul 25 08:33:49 2018 +0300
Committer: Goldstein Lyor <ly...@c-b4.com>
Committed: Wed Jul 25 09:04:40 2018 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5cada43a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9f5b4d0..b1b812a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<groovy.compliance.level>2.0</groovy.compliance.level>
<groovy.version>${groovy.major.version}.${groovy.minor.version}.${groovy.release.version}</groovy.version>
- <bouncycastle.version>1.59</bouncycastle.version>
+ <bouncycastle.version>1.60</bouncycastle.version>
<slf4j.version>1.7.25</slf4j.version>
<spring.version>5.0.7.RELEASE</spring.version>
<jgit.version>5.0.1.201806211838-r</jgit.version>
[2/5] mina-sshd git commit: Upgraded Mockito version to 2.20.0
Posted by lg...@apache.org.
Upgraded Mockito version to 2.20.0
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/bd8fe7e2
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/bd8fe7e2
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/bd8fe7e2
Branch: refs/heads/master
Commit: bd8fe7e2c7498db853d66a13d2661ba25347aba7
Parents: 5cada43
Author: Goldstein Lyor <ly...@c-b4.com>
Authored: Wed Jul 25 09:03:20 2018 +0300
Committer: Goldstein Lyor <ly...@c-b4.com>
Committed: Wed Jul 25 09:04:40 2018 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd8fe7e2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b1b812a..e9bb41a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -427,7 +427,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.18.3</version>
+ <version>2.20.0</version>
</dependency>
<dependency>
<groupId>net.sf.jpam</groupId>