Suppress welcome banner in tests. Add default ssh server key for tests
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/71323669 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/71323669 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/71323669 Branch: refs/heads/OPENSSH Commit: 71323669d97c89d6acdd34bddbfbe12ef015f1aa Parents: 590cdf1 Author: Christian Schneider <[email protected]> Authored: Thu Aug 3 15:52:52 2017 +0200 Committer: Christian Schneider <[email protected]> Committed: Thu Aug 3 15:53:06 2017 +0200 ---------------------------------------------------------------------- .../apache/karaf/itests/KarafTestSupport.java | 4 ++- itests/src/test/resources/etc/host.key | 28 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/71323669/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java index 97dee6f..da70446 100644 --- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java +++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java @@ -203,6 +203,7 @@ public class KarafTestSupport { mavenBundle().groupId("org.awaitility").artifactId("awaitility").versionAsInProject(), mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject(), replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg", getConfigFile("/etc/org.ops4j.pax.logging.cfg")), + replaceConfigurationFile("etc/host.key", getConfigFile("/etc/host.key")), editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "updateSnapshots", "none"), editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", httpPort), editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", rmiRegistryPort), @@ -214,7 +215,8 @@ public class KarafTestSupport { editConfigurationFilePut("etc/system.properties", "spring40.version", System.getProperty("spring40.version")), editConfigurationFilePut("etc/system.properties", "spring41.version", System.getProperty("spring41.version")), editConfigurationFilePut("etc/system.properties", "spring42.version", System.getProperty("spring42.version")), - editConfigurationFilePut("etc/system.properties", "spring43.version", System.getProperty("spring43.version")) + editConfigurationFilePut("etc/system.properties", "spring43.version", System.getProperty("spring43.version")), + editConfigurationFilePut("etc/branding.properties", "welcome", "") // No welcome banner }; } http://git-wip-us.apache.org/repos/asf/karaf/blob/71323669/itests/src/test/resources/etc/host.key ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/etc/host.key b/itests/src/test/resources/etc/host.key new file mode 100644 index 0000000..0fa8a56 --- /dev/null +++ b/itests/src/test/resources/etc/host.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCMhJc39qGSrA0N +mscLRrfaw1nJ8XpDco1lX8EKuQI409gqOLEiXPObZtM1+ATwRFaNbI5W0BoqNhPo +NwbodT/Uwny3cIohUMP6yrS0HeDxFrY3j90Ny4QviKEkVcv/2D/oKh38KEsRYb+3 +pT2kus6mKoHYcdPHwMGdl1s78EvXjDMFMdu8KhYO0RX4lfEgkoZgjaHyXa6BX87u +O1ijTW+pgSDOrTtyCS7G2FacRsadsQddo0p+gwimwYvxgIW0wEgkVm+eV8AoYmxS +fYUCxym/DNp8B7MP2mTuliEOFpsDlyWuubEevHeaE7W+0lJjZzdpmkMZ/V9+fXoU +lfpq6UNLAgMBAAECggEAFjB15Kt4lj2/De/sEJbJP61rh10vjmkPdPuq8zOF601g +rEIpjqCZA2g4YCRbO0m/VTPYQlM4XoQNnrTZzWl+e+1+XkVSOrKTUA4kfPDe7ZNF +kP6RzLTfmdX8hE1cGnmeld3YwFHokMUbzjc0xceODGVX/cLzy25f5K/bA1sNzuqh +Nw365DdGOdLKHUwT0MbBqOsw6MqRq856q0vlVVr4QbtWlBB6ko39ejgOSHuyCs+I +c3LXJWp6q+a1TeTed/7oyJRH87sSawkjtxlqQcRzCGZLxkKCpjVQohXkcDP6Nc78 +kkYYOlA0R3XgiIGqQM5ij2vLORROdBKxKvBTYKEgMQKBgQD+298SpgREiMMH84Yp +BFH66i1tiZG0toKeE3Z4/4W/KoybXgvuzdj3eA/0uc3jKfYACyKAwvv5aoHr09Mb +j1PtscFLcJBERcxYeUGcv9XorUbOVQcL6Ec8lk3OpnmFQywXyiIcQMmN6ZVnZtBS +GSsKCV40xS1YCpEP/ugFO5MG+QKBgQCNJahTiG1YlWQqKwDDg1DV4N71s8ld8ScX +oPIG9wLxguX36VGn/j2fXqzc3LWHpEZD1CQPaNE+IG9jDQZ7g8J3mZ2QOnfzqFFK +fGsx7D9gqXNsMPCNNnea11EwfQZ6T8Mug6HvC/925Q4TaVfkkr9MIOALV19EH16x +IzkYA+lZYwKBgCIxq99bqOztEIXLla+BJeKtcsTklUkSx7mf0OBxICfC9LSPzLgQ +pFCnqjRijY4x/hCJbeqqvpX7RU030XY8J72XgOC3TJPsbXtdYYE/d9rNDNf4LobZ +dl1ZqTzVty47EfprI2J5CtHgiiwibkblm5GwKhSYc/oBCO+Feung0Vw5AoGAIBX5 +Z9PRl5uOQ4+3ArrtO1F9HbmbAwH48wQhQLgSMTiicnLVnyzKcVoiTarWkVkkp/Kn +p+EZ/9d7uraRTK6tHGcNTGYeMoOGxzn1XEnqNl0O4f9WD6PcGJTt3ent+Qv8wKwn +uaGulyaGxp7h3hIF7pZil/FqtJ+09Oue5PiuqSUCgYEAq5gt/9bYJPngDgKyqrKn +IHTmW/nRzb3Eo91zRWgkWD2zzeCgDbn9JpmrTPedZG56cObSjBqOKaddV2tEXD2z +zBPigsmQbgB5E1kU+eoPLW0DwIC+e/Y88YBAMHJ2flJS3ALZaxep4RufaxKcpIXO +y+abhWcFDtxTmzz7jZV6Dk8= +-----END PRIVATE KEY-----
