diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55aed6a..ff2932d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,11 +15,11 @@ on: description: Open SSH session in the runner required: false default: false - + jobs: build: - uses: sentrysoftware/workflows/.github/workflows/maven-build.yml@v3 + uses: metricshub/workflows/.github/workflows/maven-build.yml@v2 with: jdkVersion: "17" debug: ${{ github.event_name == 'workflow_dispatch' && inputs.debug }} - ssh: ${{ github.event_name == 'workflow_dispatch' && inputs.ssh }} + ssh: ${{ github.event_name == 'workflow_dispatch' && inputs.ssh }} \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5a72abb..cf17156 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,7 +10,7 @@ on: jobs: deploy: - uses: sentrysoftware/workflows/.github/workflows/maven-central-deploy.yml@v3 + uses: metricshub/workflows/.github/workflows/maven-central-deploy.yml@v2 with: jdkVersion: "17" secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 14d640c..ba8ec25 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ on: jobs: release: - uses: sentrysoftware/workflows/.github/workflows/maven-central-release.yml@v3 + uses: metricshub/workflows/.github/workflows/maven-central-release.yml@v2 with: releaseVersion: ${{ inputs.releaseVersion }} developmentVersion: ${{ inputs.developmentVersion }} diff --git a/README.md b/README.md index 6db4939..8b71869 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # SSH Java Client -![GitHub release (with filter)](https://img.shields.io/github/v/release/sentrysoftware/ssh) -![Build](https://img.shields.io/github/actions/workflow/status/sentrysoftware/ssh/deploy.yml) -![GitHub top language](https://img.shields.io/github/languages/top/sentrysoftware/ssh) -![License](https://img.shields.io/github/license/sentrysoftware/ssh) +![GitHub release (with filter)](https://img.shields.io/github/v/release/metricshub/ssh-java) +![Build](https://img.shields.io/github/actions/workflow/status/metricshub/ssh-java/deploy.yml) +![GitHub top language](https://img.shields.io/github/languages/top/metricshub/ssh-java) +![License](https://img.shields.io/github/license/metricshub/ssh-java) The SSH Java client is a library that allows to execute commands using SSH protocol in distant hosts. -See **[Project Documentation](https://sentrysoftware.org/ssh)** and the [Javadoc](https://sentrysoftware.org/ssh/apidocs) for more information on how to use this library in your code. +See **[Project Documentation](https://metricshub.org/ssh-java)** and the [Javadoc](https://metricshub.org/ssh-java/apidocs) for more information on how to use this library in your code. ## Build instructions diff --git a/checkstyle.origin.xml b/checkstyle.origin.xml new file mode 100644 index 0000000..2098fe6 --- /dev/null +++ b/checkstyle.origin.xml @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/checkstyle.xml b/checkstyle.xml index 2098fe6..6f36b51 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -1,8 +1,5 @@ - - - + + - - + + - + - + - - - - + + - + - - - - - - - @@ -92,15 +80,15 @@ - - - - - - - - - + + + + + + + + + @@ -123,10 +111,10 @@ - - - - + + + + @@ -143,14 +131,8 @@ - - - - - - @@ -159,17 +141,13 @@ - - - - + - @@ -194,16 +172,11 @@ - - - - - diff --git a/pom.xml b/pom.xml index c454762..82b689b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,23 +2,23 @@ 4.0.0 - org.sentrysoftware + org.metricshub oss-parent 2 - org.sentrysoftware - ssh + org.metricshub + ssh-java SSH Java Client 1.0.03-SNAPSHOT SSH Cilent Library for Java - Sentry Software - https://sentrysoftware.com + MetricsHub + https://metricsHub.com - https://sentrysoftware.org/ssh + https://metricsHub.org/ssh-java 2023 @@ -31,12 +31,12 @@ GitHub - https://github.com/sentrysoftware/ssh/issues/ + https://github.com/metricsHub/ssh-java/issues/ - scm:git:https://github.com/sentrysoftware/ssh.git - https://github.com/sentrysoftware/ssh + scm:git:https://github.com/metricsHub/ssh-java.git + https://github.com/metricsHub/ssh-java HEAD diff --git a/src/main/java/org/sentrysoftware/ssh/SshClient.java b/src/main/java/org/metricshub/ssh/SshClient.java similarity index 99% rename from src/main/java/org/sentrysoftware/ssh/SshClient.java rename to src/main/java/org/metricshub/ssh/SshClient.java index 1ac77cd..ed12d21 100644 --- a/src/main/java/org/sentrysoftware/ssh/SshClient.java +++ b/src/main/java/org/metricshub/ssh/SshClient.java @@ -3,13 +3,13 @@ * and open the template in the editor. */ -package org.sentrysoftware.ssh; +package org.metricshub.ssh; /*- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ * SSH Java Client * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software + * Copyright (C) 2023 Metricshub * ჻჻჻჻჻჻ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -305,14 +305,15 @@ public String readFileAttributes(String filePath) throws IOException { // Determine the file type String fileType; - if (fileAttributes.isRegularFile()) + if (fileAttributes.isRegularFile()) { fileType = "FILE"; - else if (fileAttributes.isDirectory()) + } else if (fileAttributes.isDirectory()) { fileType = "DIR"; - else if (fileAttributes.isSymlink()) + } else if (fileAttributes.isSymlink()) { fileType = "LINK"; - else + } else { fileType = "UNKNOWN"; + } // Build the result in the same format as the PSL function file() StringBuilder pslFileResult = new StringBuilder(); @@ -515,7 +516,7 @@ public String readFile(String remoteFilePath, Long readOffset, Integer readSize) // Close the SFTP client sftpClient.close(); - // Sentry Collection format + // Metricshub Collection format return out.toString(); } diff --git a/src/main/java/org/sentrysoftware/ssh/Utils.java b/src/main/java/org/metricshub/ssh/Utils.java similarity index 98% rename from src/main/java/org/sentrysoftware/ssh/Utils.java rename to src/main/java/org/metricshub/ssh/Utils.java index 18a689f..b22c6ac 100644 --- a/src/main/java/org/sentrysoftware/ssh/Utils.java +++ b/src/main/java/org/metricshub/ssh/Utils.java @@ -1,10 +1,10 @@ -package org.sentrysoftware.ssh; +package org.metricshub.ssh; /*- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ * SSH Java Client * ჻჻჻჻჻჻ - * Copyright 2023 Sentry Software + * Copyright 2023 Metricshub * ჻჻჻჻჻჻ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index 62dc0d6..1103aed 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -15,7 +15,7 @@ Add SSH in the list of dependencies in your [Maven **pom.xml**](https://maven.ap - org.sentrysoftware + org.metricshub ssh ${project.version} @@ -29,9 +29,9 @@ import java.io.File; import java.io.IOException; import java.nio.charset.Charset; -import org.sentrysoftware.ssh.SshClient; -import org.sentrysoftware.ssh.Utils; -import org.sentrysoftware.ssh.SshClient.CommandResult; +import org.metricshub.ssh.SshClient; +import org.metricshub.ssh.Utils; +import org.metricshub.ssh.SshClient.CommandResult; public class Main { diff --git a/src/site/resources/images/metricshub-logo-only.png b/src/site/resources/images/metricshub-logo-only.png new file mode 100644 index 0000000..89d6fb8 Binary files /dev/null and b/src/site/resources/images/metricshub-logo-only.png differ diff --git a/src/site/resources/images/sentry-logo-179x75px.png b/src/site/resources/images/sentry-logo-179x75px.png deleted file mode 100644 index 42e53f7..0000000 Binary files a/src/site/resources/images/sentry-logo-179x75px.png and /dev/null differ diff --git a/src/site/site.xml b/src/site/site.xml index 7e6fe8d..6ab08a6 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -13,8 +13,8 @@ - images/sentry-logo-179x75px.png - https://sentrysoftware.com + images/metricshub-logo-only.png + https://metricsHub.com diff --git a/src/test/java/org/sentrysoftware/ssh/SSHClientTest.java b/src/test/java/org/metricshub/ssh/SSHClientTest.java similarity index 99% rename from src/test/java/org/sentrysoftware/ssh/SSHClientTest.java rename to src/test/java/org/metricshub/ssh/SSHClientTest.java index 93f6631..a8bc3fe 100644 --- a/src/test/java/org/sentrysoftware/ssh/SSHClientTest.java +++ b/src/test/java/org/metricshub/ssh/SSHClientTest.java @@ -1,4 +1,4 @@ -package org.sentrysoftware.ssh; +package org.metricshub.ssh; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream;