aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-core
diff options
context:
space:
mode:
Diffstat (limited to 'sonar-core')
-rw-r--r--sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java1
-rw-r--r--sonar-core/src/main/java/org/sonar/core/config/SvnProperties.java40
-rw-r--r--sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java2
-rw-r--r--sonar-core/src/test/java/org/sonar/core/config/SvnPropertiesTest.java31
4 files changed, 1 insertions, 73 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
index d3b20eab0f6..8200a483905 100644
--- a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
+++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
@@ -59,7 +59,6 @@ public class CorePropertyDefinitions {
defs.addAll(PurgeProperties.all());
defs.addAll(EmailSettings.definitions());
defs.addAll(ScannerProperties.all());
- defs.addAll(SvnProperties.all());
defs.addAll(asList(
PropertyDefinition.builder(CoreProperties.MODULE_LEVEL_ARCHIVED_SETTINGS)
diff --git a/sonar-core/src/main/java/org/sonar/core/config/SvnProperties.java b/sonar-core/src/main/java/org/sonar/core/config/SvnProperties.java
index 88dc3bc5e78..1c282cc846d 100644
--- a/sonar-core/src/main/java/org/sonar/core/config/SvnProperties.java
+++ b/sonar-core/src/main/java/org/sonar/core/config/SvnProperties.java
@@ -37,44 +37,4 @@ public class SvnProperties {
private SvnProperties() {
//private only
}
-
- public static List<PropertyDefinition> all() {
- return Arrays.asList(
- PropertyDefinition.builder(USER_PROP_KEY)
- .name("Username")
- .description("Username to be used for SVN server or SVN+SSH authentication")
- .type(PropertyType.STRING)
- .onQualifiers(Qualifiers.PROJECT)
- .category(CoreProperties.CATEGORY_SCM)
- .subCategory(CATEGORY_SVN)
- .index(0)
- .build(),
- PropertyDefinition.builder(PASSWORD_PROP_KEY)
- .name("Password")
- .description("Password to be used for SVN server or SVN+SSH authentication")
- .type(PropertyType.PASSWORD)
- .onQualifiers(Qualifiers.PROJECT)
- .category(CoreProperties.CATEGORY_SCM)
- .subCategory(CATEGORY_SVN)
- .index(1)
- .build(),
- PropertyDefinition.builder(PRIVATE_KEY_PATH_PROP_KEY)
- .name("Path to private key file")
- .description("Can be used instead of password for SVN+SSH authentication")
- .type(PropertyType.STRING)
- .onQualifiers(Qualifiers.PROJECT)
- .category(CoreProperties.CATEGORY_SCM)
- .subCategory(CATEGORY_SVN)
- .index(2)
- .build(),
- PropertyDefinition.builder(PASSPHRASE_PROP_KEY)
- .name("Passphrase")
- .description("Optional passphrase of your private key file")
- .type(PropertyType.PASSWORD)
- .onQualifiers(Qualifiers.PROJECT)
- .category(CoreProperties.CATEGORY_SCM)
- .subCategory(CATEGORY_SVN)
- .index(3)
- .build());
- }
}
diff --git a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
index b098ef95616..b0b7cb1307e 100644
--- a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
@@ -30,7 +30,7 @@ public class CorePropertyDefinitionsTest {
@Test
public void all() {
List<PropertyDefinition> defs = CorePropertyDefinitions.all();
- assertThat(defs).hasSize(57);
+ assertThat(defs).hasSize(53);
}
@Test
diff --git a/sonar-core/src/test/java/org/sonar/core/config/SvnPropertiesTest.java b/sonar-core/src/test/java/org/sonar/core/config/SvnPropertiesTest.java
deleted file mode 100644
index 183b37947ac..00000000000
--- a/sonar-core/src/test/java/org/sonar/core/config/SvnPropertiesTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2021 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.core.config;
-
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class SvnPropertiesTest {
- @Test
- public void creates_properties() {
- assertThat(SvnProperties.all()).isNotEmpty();
- }
-}