jlengrand/jreleaser
1
0
Fork 0
mirror of https://github.com/jlengrand/jreleaser.git synced 2026-03-10 08:31:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using element name to set Distribution name. Fixes #228

Browse Source
This commit is contained in:
jruaux
2021-06-23 16:31:08 -07:00
committed by Andres Almiray
parent a38a2caec5
commit 7520ffb295
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/Jreleaser.java
View File

@@ -17,9 +17,8 @@
*/
package org.jreleaser.maven.plugin;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* @author Andres Almiray
@@ -36,7 +35,7 @@ public class Jreleaser {
private final Checksum checksum = new Checksum();
private final Signing signing = new Signing();
private final Files files = new Files();
private final List<Distribution> distributions = new ArrayList<>();
private final Map<String, Distribution> distributions = new LinkedHashMap<>();
public Environment getEnvironment() {
return environment;
@@ -118,12 +117,12 @@ public class Jreleaser {
this.files.setAll(files);
}
public List<Distribution> getDistributions() {
public Map<String, Distribution> getDistributions() {
return distributions;
}
public void setDistributions(Collection<Distribution> distributions) {
public void setDistributions(Map<String, Distribution> distributions) {
this.distributions.clear();
this.distributions.addAll(distributions);
this.distributions.putAll(distributions);
}
}

7
plugins/jreleaser-maven-plugin/src/main/java/org/jreleaser/maven/plugin/internal/JReleaserModelConverter.java
View File

@@ -629,10 +629,11 @@ public final class JReleaserModelConverter {
return s;
}
private static Map<String, org.jreleaser.model.Distribution> convertDistributions(List<Distribution> distributions) {
private static Map<String, org.jreleaser.model.Distribution> convertDistributions(Map<String, Distribution> distributions) {
Map<String, org.jreleaser.model.Distribution> ds = new LinkedHashMap<>();
for (Distribution distribution : distributions) {
ds.put(distribution.getName(), convertDistribution(distribution));
for (Map.Entry<String,Distribution> e : distributions.entrySet()) {
e.getValue().setName(e.getKey());
ds.put(e.getKey(), convertDistribution(e.getValue()));
}
return ds;
}