|
15 | 15 | */
|
16 | 16 | package org.openrewrite.maven;
|
17 | 17 |
|
| 18 | +import com.fasterxml.jackson.core.JsonProcessingException; |
18 | 19 | import org.apache.maven.artifact.DependencyResolutionRequiredException;
|
19 | 20 | import org.apache.maven.execution.MavenExecutionRequest;
|
20 | 21 | import org.apache.maven.execution.MavenSession;
|
|
46 | 47 | import org.openrewrite.marker.ci.BuildEnvironment;
|
47 | 48 | import org.openrewrite.maven.cache.InMemoryMavenPomCache;
|
48 | 49 | import org.openrewrite.maven.cache.MavenPomCache;
|
| 50 | +import org.openrewrite.maven.internal.MavenXmlMapper; |
49 | 51 | import org.openrewrite.maven.internal.RawPom;
|
50 | 52 | import org.openrewrite.maven.internal.RawRepositories;
|
51 | 53 | import org.openrewrite.maven.tree.Pom;
|
@@ -731,11 +733,20 @@ public MavenSettings buildSettings() {
|
731 | 733 | servers.setServers(mer.getServers().stream().map(s -> {
|
732 | 734 | SettingsDecryptionRequest decryptionRequest = new DefaultSettingsDecryptionRequest(s);
|
733 | 735 | SettingsDecryptionResult decryptionResult = settingsDecrypter.decrypt(decryptionRequest);
|
| 736 | + MavenSettings.ServerConfiguration configuration = null; |
| 737 | + if (s.getConfiguration() != null) { |
| 738 | + try { |
| 739 | + // No need to interpolate in property placeholders like ${env.Foo}, Maven has already done this |
| 740 | + configuration = MavenXmlMapper.readMapper().readValue(s.getConfiguration().toString(), MavenSettings.ServerConfiguration.class); |
| 741 | + } catch (JsonProcessingException e) { |
| 742 | + throw new RuntimeException(e); |
| 743 | + } |
| 744 | + } |
734 | 745 | return new MavenSettings.Server(
|
735 | 746 | s.getId(),
|
736 | 747 | s.getUsername(),
|
737 | 748 | decryptionResult.getServer().getPassword(),
|
738 |
| - null |
| 749 | + configuration |
739 | 750 | );
|
740 | 751 | }).collect(toList()));
|
741 | 752 |
|
|
0 commit comments