Skip to content

Commit 8f7ce77

Browse files
committed
PLUGINAPI-182 Create a shared module for the Version class
1 parent 066b7fd commit 8f7ce77

File tree

14 files changed

+502
-567
lines changed

14 files changed

+502
-567
lines changed

manifest/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ description = 'Sonar Plugin API - Manifest'
33
dependencies {
44
compileOnly libs.jsr305
55

6+
api project(':shared')
67
implementation libs.commons.lang3
78

89
testImplementation libs.junit5

manifest/src/main/java/org/sonar/plugin/api/manifest/PluginManifest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import javax.annotation.Nullable;
3636
import org.apache.commons.lang3.StringUtils;
3737
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
38+
import org.sonar.api.utils.Version;
3839

3940
/**
4041
* This class loads Sonar plugin metadata from JAR manifest.

manifest/src/main/java/org/sonar/plugin/api/manifest/RequiredPlugin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import java.util.regex.Pattern;
2323
import org.apache.commons.lang3.StringUtils;
24+
import org.sonar.api.utils.Version;
2425

2526
public class RequiredPlugin {
2627

manifest/src/main/java/org/sonar/plugin/api/manifest/Version.java

Lines changed: 0 additions & 149 deletions
This file was deleted.

manifest/src/test/java/org/sonar/plugin/api/manifest/PluginManifestTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.jar.Attributes;
2929
import java.util.jar.Manifest;
3030
import org.junit.jupiter.api.Test;
31+
import org.sonar.api.utils.Version;
3132

3233
import static org.assertj.core.api.Assertions.assertThat;
3334
import static org.assertj.core.api.Assertions.assertThatThrownBy;

manifest/src/test/java/org/sonar/plugin/api/manifest/RequiredPluginTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class RequiredPluginTest {
3030
void test_RequiredPlugin() {
3131
var plugin = RequiredPlugin.parse("java:1.1");
3232
assertThat(plugin.getKey()).isEqualTo("java");
33-
assertThat(plugin.getMinimalVersion().getName()).isEqualTo("1.1");
33+
assertThat(plugin.getMinimalVersion().toString()).isEqualTo("1.1");
3434

3535
assertThrows(IllegalArgumentException.class, () -> RequiredPlugin.parse("java"));
3636
}

0 commit comments

Comments
 (0)