You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2019/12/11 13:38:09 UTC
[sling-org-apache-sling-committer-cli] 01/02: SLING-8741 - Remove
separate Jira credentials
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-committer-cli.git
commit 3044b64d0b116fc17556cb4ce6c3ff2970375658
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Wed Dec 11 14:32:45 2019 +0100
SLING-8741 - Remove separate Jira credentials
* adapted code to use only the ASF credentials when interacting
with Jira
---
src/main/java/org/apache/sling/cli/impl/CredentialsService.java | 9 ---------
.../java/org/apache/sling/cli/impl/http/HttpClientFactory.java | 5 ++---
.../java/org/apache/sling/cli/impl/CredentialsServiceTest.java | 3 ---
src/test/java/org/apache/sling/cli/impl/jira/MockJira.java | 4 ++--
.../java/org/apache/sling/cli/impl/jira/VersionClientTest.java | 2 --
5 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/apache/sling/cli/impl/CredentialsService.java b/src/main/java/org/apache/sling/cli/impl/CredentialsService.java
index 127c8fe..f869972 100644
--- a/src/main/java/org/apache/sling/cli/impl/CredentialsService.java
+++ b/src/main/java/org/apache/sling/cli/impl/CredentialsService.java
@@ -29,25 +29,16 @@ public class CredentialsService {
private static final ValueSource ASF_USER = new ValueSource("asf.username", "ASF_USERNAME", "ASF user information");
private static final ValueSource ASF_PWD = new ValueSource("asf.password", "ASF_PASSWORD", "ASF password");
- private static final ValueSource JIRA_USER = new ValueSource("jira.username", "JIRA_USERNAME", "Jira user information");
- private static final ValueSource JIRA_PWD = new ValueSource("jira.password", "JIRA_PASSWORD", "Jira password");
-
private Credentials asfCredentials;
- private Credentials jiraCredentials;
@Activate
protected void activate() {
asfCredentials = new Credentials(ASF_USER.getValue(), ASF_PWD.getValue());
- jiraCredentials = new Credentials(JIRA_USER.getValue(), JIRA_PWD.getValue());
}
public Credentials getAsfCredentials() {
return asfCredentials;
}
-
- public Credentials getJiraCredentials() {
- return jiraCredentials;
- }
static class ValueSource {
diff --git a/src/main/java/org/apache/sling/cli/impl/http/HttpClientFactory.java b/src/main/java/org/apache/sling/cli/impl/http/HttpClientFactory.java
index 4fbc065..3040429 100644
--- a/src/main/java/org/apache/sling/cli/impl/http/HttpClientFactory.java
+++ b/src/main/java/org/apache/sling/cli/impl/http/HttpClientFactory.java
@@ -82,15 +82,14 @@ public class HttpClientFactory {
private BasicCredentialsProvider newCredentialsProvider() {
Credentials asf = credentialsService.getAsfCredentials();
- Credentials jira = credentialsService.getJiraCredentials();
-
+
BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(new AuthScope(nexusHost, nexusPort),
new UsernamePasswordCredentials(asf.getUsername(), asf.getPassword()));
credentialsProvider.setCredentials(new AuthScope("reporter.apache.org", 443),
new UsernamePasswordCredentials(asf.getUsername(), asf.getPassword()));
credentialsProvider.setCredentials(new AuthScope(jiraHost, jiraPort),
- new UsernamePasswordCredentials(jira.getUsername(), jira.getPassword()));
+ new UsernamePasswordCredentials(asf.getUsername(), asf.getPassword()));
return credentialsProvider;
}
diff --git a/src/test/java/org/apache/sling/cli/impl/CredentialsServiceTest.java b/src/test/java/org/apache/sling/cli/impl/CredentialsServiceTest.java
index 571adba..6d241bf 100644
--- a/src/test/java/org/apache/sling/cli/impl/CredentialsServiceTest.java
+++ b/src/test/java/org/apache/sling/cli/impl/CredentialsServiceTest.java
@@ -44,9 +44,6 @@ public class CredentialsServiceTest {
assertThat(creds.getAsfCredentials().getUsername(), equalTo("asf.username.val"));
assertThat(creds.getAsfCredentials().getPassword(), equalTo("asf.password.val"));
- assertThat(creds.getJiraCredentials().getUsername(), equalTo("jira.username.val"));
- assertThat(creds.getJiraCredentials().getPassword(), equalTo("jira.password.val"));
-
} finally {
for ( String prop : VALID_PROPS ) {
System.clearProperty(prop);
diff --git a/src/test/java/org/apache/sling/cli/impl/jira/MockJira.java b/src/test/java/org/apache/sling/cli/impl/jira/MockJira.java
index 5c411e9..73ccb5b 100644
--- a/src/test/java/org/apache/sling/cli/impl/jira/MockJira.java
+++ b/src/test/java/org/apache/sling/cli/impl/jira/MockJira.java
@@ -32,8 +32,8 @@ import com.sun.net.httpserver.HttpServer;
public class MockJira extends ExternalResource {
- static final String AUTH_USER = "jira-user";
- static final String AUTH_PWD = "jira-password";
+ static final String AUTH_USER = "asf-user";
+ static final String AUTH_PWD = "asf-password";
public static void main(String[] args) throws Throwable {
diff --git a/src/test/java/org/apache/sling/cli/impl/jira/VersionClientTest.java b/src/test/java/org/apache/sling/cli/impl/jira/VersionClientTest.java
index 9c5c0cf..bdf1cda 100644
--- a/src/test/java/org/apache/sling/cli/impl/jira/VersionClientTest.java
+++ b/src/test/java/org/apache/sling/cli/impl/jira/VersionClientTest.java
@@ -41,8 +41,6 @@ public class VersionClientTest {
static {
SYSTEM_PROPS.put("asf.username", "asf-user");
SYSTEM_PROPS.put("asf.password", "asf-password");
- SYSTEM_PROPS.put("jira.username", MockJira.AUTH_USER);
- SYSTEM_PROPS.put("jira.password", MockJira.AUTH_PWD);
}
@Rule