Skip to content

Commit 275b211

Browse files
authored
880 adhere to m2settings securityxml and m2settingsxml (#986)
Add support for `~/.m2/settings.xml` and `~/.m2/settings-security.xml`. - `Maven SettingsInitializer` reads the settings with decrypted credentials and adds them to the `ExecutionContext` Maven when build files get parsed. - `PrivateArtifactRepositoryTest` tests the behavior e2e. - Add Maven-related Autoconfiguration and move some beans there - `MavenExecutionRequest` now has the path to `settings.xml` - Polishing
1 parent d9c9bdb commit 275b211

File tree

63 files changed

+1248
-529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1248
-529
lines changed

.github/workflows/build-sbm-revamp.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ jobs:
2222
working-directory: sbm-support-rewrite
2323
run: mvn --batch-mode clean install
2424

25-
- name: clean install skipTests
26-
run: mvn clean install -DskipTests
27-
2825
- name: clean
2926
run: mvn clean
3027

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ out/
2020
pom.xml.versionsBackup
2121
**/src/generated/java/META-INF
2222
**.java-version
23-
.rewrite-cache
23+
.rewrite-cache

components/recipe-test-support/src/main/java/org/springframework/sbm/test/RecipeTestSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import org.springframework.sbm.boot.autoconfigure.ScopeConfiguration;
1919
import org.springframework.sbm.build.impl.MavenBuildFileRefactoringFactory;
20-
import org.springframework.sbm.build.impl.MavenSettingsInitializer;
20+
import org.springframework.sbm.parsers.maven.MavenSettingsInitializer;
2121
import org.springframework.sbm.build.impl.RewriteMavenParser;
2222
import org.springframework.sbm.engine.context.ProjectContextHolder;
2323
import org.springframework.sbm.engine.context.RewriteJavaSearchActionDeserializer;

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/MavenSettingsInitializer.java

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

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/OpenRewriteMavenBuildFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.springframework.sbm.build.migration.visitor.AddOrUpdateDependencyManagement;
4141
import org.springframework.sbm.java.impl.ClasspathRegistry;
4242
import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
43-
import org.springframework.sbm.parsers.RewriteMavenArtifactDownloader;
43+
import org.springframework.sbm.parsers.maven.RewriteMavenArtifactDownloader;
4444
import org.springframework.sbm.support.openrewrite.GenericOpenRewriteRecipe;
4545
import org.springframework.util.Assert;
4646

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/RewriteMavenParser.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@
2121
import org.openrewrite.SourceFile;
2222
import org.openrewrite.internal.lang.Nullable;
2323
import org.openrewrite.maven.MavenParser;
24-
import org.openrewrite.xml.XmlParser;
25-
import org.openrewrite.xml.tree.Xml;
24+
import org.springframework.sbm.parsers.maven.MavenSettingsInitializer;
2625
import org.springframework.stereotype.Component;
2726

2827
import java.nio.file.Path;
29-
import java.util.List;
3028
import java.util.stream.Stream;
3129

3230
/**
@@ -76,7 +74,7 @@ public Stream<SourceFile> parse(String... sources) {
7674

7775
@Override
7876
public Stream<SourceFile> parse(ExecutionContext ctx, String... sources) {
79-
mavenSettingsInitializer.initializeMavenSettings(ctx);
77+
mavenSettingsInitializer.initializeMavenSettings();
8078
return parser.parse(ctx, sources);
8179
}
8280

@@ -90,7 +88,7 @@ public Stream<SourceFile> parseInputs(Iterable<Input> sources, @Nullable Path re
9088
if (relativeTo != null) {
9189
initMavenParser(ctx, relativeTo);
9290
} else {
93-
mavenSettingsInitializer.initializeMavenSettings(ctx);
91+
mavenSettingsInitializer.initializeMavenSettings();
9492
}
9593
return parser.parseInputs(sources, relativeTo, ctx);
9694
}

components/sbm-core/src/main/java/org/springframework/sbm/build/migration/actions/AddMinimalPomXml.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.sbm.build.impl.RewriteMavenParser;
2929
import org.springframework.sbm.engine.context.ProjectContext;
3030
import org.springframework.sbm.engine.recipe.AbstractAction;
31-
import org.springframework.sbm.parsers.RewriteMavenArtifactDownloader;
31+
import org.springframework.sbm.parsers.maven.RewriteMavenArtifactDownloader;
3232

3333
import java.io.ByteArrayInputStream;
3434
import java.io.StringWriter;

components/sbm-core/src/main/java/org/springframework/sbm/build/resource/BuildFileResourceWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.springframework.sbm.build.impl.MavenBuildFileRefactoring;
2525
import org.springframework.sbm.build.impl.MavenBuildFileRefactoringFactory;
2626
import org.springframework.sbm.build.impl.OpenRewriteMavenBuildFile;
27-
import org.springframework.sbm.parsers.RewriteMavenArtifactDownloader;
27+
import org.springframework.sbm.parsers.maven.RewriteMavenArtifactDownloader;
2828
import org.springframework.sbm.project.resource.ProjectResourceWrapper;
2929
import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
3030
import org.springframework.stereotype.Component;

components/sbm-core/src/main/java/org/springframework/sbm/java/impl/ClasspathRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.openrewrite.maven.tree.Scope;
2222
import org.springframework.sbm.build.api.BuildFile;
2323
import org.springframework.sbm.build.impl.OpenRewriteMavenBuildFile;
24-
import org.springframework.sbm.parsers.RewriteMavenArtifactDownloader;
24+
import org.springframework.sbm.parsers.maven.RewriteMavenArtifactDownloader;
2525
import org.springframework.sbm.project.parser.DependencyHelper;
2626

2727
import java.nio.file.Path;

0 commit comments

Comments
 (0)