Skip to content

Commit 60e87d0

Browse files
committed
Fix bugs related to version
1 parent 82f428d commit 60e87d0

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

alpha-core/src/test/java/com/techsenger/alpha/core/impl/component/ConfigXmlReaderTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.techsenger.alpha.core.api.component.ComponentConfigInfo;
2020
import com.techsenger.alpha.core.api.module.ModuleConfig;
21+
import com.techsenger.toolkit.core.version.Version;
2122
import java.io.File;
2223
import java.io.IOException;
2324
import java.net.URISyntaxException;
@@ -116,7 +117,7 @@ public void read_nestedIfChooseConditionsForSolarisSystemProperty_success()
116117
private void assertModule(ModuleConfig module, int index, String classifier) {
117118
assertThat(module.getGroupId()).isEqualTo("group" + index);
118119
assertThat(module.getArtifactId()).isEqualTo("artifact" + index);
119-
assertThat(module.getVersion()).isEqualTo(index + ".0.0");
120+
assertThat(module.getVersion()).isEqualTo(Version.of(index + ".0.0"));
120121
assertThat(module.getClassifier()).isEqualTo(classifier);
121122
}
122123
}

alpha-repo/alpha-repo-core/src/main/java/com/techsenger/alpha/repo/core/MavenRepoProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.techsenger.reposium.core.DefaultArtifactDescriptor;
2727
import com.techsenger.reposium.core.MavenRepo;
2828
import com.techsenger.toolkit.core.SingletonFactory;
29+
import com.techsenger.toolkit.core.version.Version;
2930
import java.io.IOException;
3031
import java.util.List;
3132
import java.util.Map;
@@ -108,7 +109,7 @@ private ArtifactDescriptor artifactToDescriptor(ModuleArtifact artifactor) {
108109
return new DefaultArtifactDescriptor(
109110
artifactor.getGroupId(),
110111
artifactor.getArtifactId(),
111-
artifactor.getVersion(),
112+
artifactor.getVersion().toString(),
112113
artifactor.getClassifier(),
113114
artifactor.getType().toString().toLowerCase());
114115
}
@@ -117,7 +118,7 @@ private ModuleArtifact descriptorToArtifact(ArtifactDescriptor descriptor) {
117118
return new DefaultModuleArtifact(
118119
descriptor.getGroupId(),
119120
descriptor.getArtifactId(),
120-
descriptor.getVersion(),
121+
Version.of(descriptor.getVersion()),
121122
descriptor.getClassifier(),
122123
ModuleType.valueOf(descriptor.getType().toUpperCase()));
123124
}

0 commit comments

Comments
 (0)