#329 compilable Boot Integration output

applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java

@@ -45,8 +45,8 @@ void migrateSimpleApplication() {
 
         applyRecipe("boot-2.7-3.0-dependency-version-update");
 
+        buildProject();
         verifyParentPomVersion();
-        verifyMicrometerPackageUpdate();
         verifyYamlConfigurationUpdate();
         verifyPropertyConfigurationUpdate();
         verifyConstructorBindingRemoval();
@@ -55,6 +55,10 @@ void migrateSimpleApplication() {
         verifyEhCacheVersionIsUpgraded();
     }
 
+    private void buildProject() {
+        executeMavenGoals(getTestDir(), "clean", "verify");
+    }
+
     private void verifyEhCacheVersionIsUpgraded() {
         String pomContent = loadFile(Path.of("pom.xml"));
 
@@ -143,19 +147,6 @@ private void verifyConstructorBindingRemoval() {
                 "\n");
     }
 
-    private void verifyMicrometerPackageUpdate() {
-        String micrometerClass = loadFile(Path.of("src/main/java/org/springboot/example/upgrade/MicrometerConfig.java"));
-        assertThat(micrometerClass).isEqualTo(
-                "package org.springboot.example.upgrade;\n" +
-                "\n" +
-                "import io.micrometer.binder.MeterBinder;\n" +
-                "\n" +
-                "public class MicroMeterConfig {\n" +
-                "\n" +
-                "    private MeterBinder k;\n" +
-                "}\n");
-    }
-
     private void verifyYamlConfigurationUpdate() {
         String micrometerClass = loadFile(Path.of("src/main/resources/application.yaml"));
         assertThat(micrometerClass).isEqualTo(

applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/pom.xml

@@ -22,10 +22,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
@@ -85,7 +81,12 @@
             </snapshots>
         </repository>
     </repositories>
-
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestone</id>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
     <build>
         <plugins>
             <plugin>

components/sbm-core/src/main/java/org/springframework/sbm/build/api/BuildFile.java

@@ -144,5 +144,8 @@ public interface BuildFile extends ProjectResource {
 
     void addRepository(RepositoryDefinition repository);
 
+    void addPluginRepository(RepositoryDefinition repository);
+
     List<RepositoryDefinition> getRepositories();
+    List<RepositoryDefinition> getPluginRepositories();
 }

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

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.sbm.build.migration.actions;
+
+import lombok.Setter;
+import org.springframework.sbm.build.api.RepositoryDefinition;
+import org.springframework.sbm.engine.context.ProjectContext;
+import org.springframework.sbm.engine.recipe.AbstractAction;
+
+/**
+ * Adds Repository to pom.xml
+ */
+@Setter
+public abstract class AddGenericRepositoryAction extends AbstractAction {
+
+    private String id;
+    private String url;
+    private String name;
+    private String layout;
+    private Boolean snapshotsEnabled;
+    private String snapshotsChecksumPolicy;
+    private String snapShotsUpdatePolicy;
+    private Boolean releasesEnabled;
+    private String releasesChecksumPolicy;
+    private String releasesUpdatePolicy;
+
+    protected abstract void addRepository(ProjectContext context, RepositoryDefinition repositoryDefinition);
+
+    @Override
+    public void apply(ProjectContext context) {
+        RepositoryDefinition.RepositoryDefinitionBuilder builder = RepositoryDefinition.builder();
+
+        builder.id(id)
+                .name(name)
+                .url(url);
+
+        if (snapshotsEnabled != null) {
+            builder.snapshotsEnabled(snapshotsEnabled);
+        }
+        if (snapShotsUpdatePolicy != null) {
+            builder.snapShotsUpdatePolicy(snapShotsUpdatePolicy);
+        }
+        if (snapshotsChecksumPolicy != null) {
+            builder.snapshotsChecksumPolicy(snapshotsChecksumPolicy);
+        }
+
+        if (releasesEnabled != null) {
+            builder.releasesEnabled(releasesEnabled);
+        }
+        if (releasesUpdatePolicy != null) {
+            builder.releasesUpdatePolicy(releasesUpdatePolicy);
+        }
+        if (releasesChecksumPolicy != null) {
+            builder.releasesChecksumPolicy(releasesChecksumPolicy);
+        }
+        if (layout != null) {
+            builder.layout(layout);
+        }
+
+        RepositoryDefinition repository = builder.build();
+        addRepository(context, repository);
+    }
+}
+

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.sbm.build.migration.actions;
+
+import lombok.Setter;
+import org.springframework.sbm.build.api.RepositoryDefinition;
+import org.springframework.sbm.engine.context.ProjectContext;
+import org.springframework.sbm.engine.recipe.AbstractAction;
+
+@Setter
+public class AddPluginRepositoryAction extends AddGenericRepositoryAction {
+
+    @Override
+    protected void addRepository(ProjectContext context, RepositoryDefinition repositoryDefinition) {
+        context.getApplicationModules().getRootModule().getBuildFile().addPluginRepository(repositoryDefinition);
+    }
+}

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

@@ -24,52 +24,9 @@
  * Adds Repository to pom.xml
  */
 @Setter
-public class AddRepositoryAction extends AbstractAction {
-
-    private String id;
-    private String url;
-    private String name;
-    private String layout;
-    private Boolean snapshotsEnabled;
-    private String snapshotsChecksumPolicy;
-    private String snapShotsUpdatePolicy;
-    private Boolean releasesEnabled;
-    private String releasesChecksumPolicy;
-    private String releasesUpdatePolicy;
-
-
+public class AddRepositoryAction extends AddGenericRepositoryAction {
     @Override
-    public void apply(ProjectContext context) {
-        RepositoryDefinition.RepositoryDefinitionBuilder builder = RepositoryDefinition.builder();
-
-        builder.id(id)
-                .name(name)
-                .url(url);
-
-        if (snapshotsEnabled != null) {
-            builder.snapshotsEnabled(snapshotsEnabled);
-        }
-        if (snapShotsUpdatePolicy != null) {
-            builder.snapShotsUpdatePolicy(snapShotsUpdatePolicy);
-        }
-        if (snapshotsChecksumPolicy != null) {
-            builder.snapshotsChecksumPolicy(snapshotsChecksumPolicy);
-        }
-
-        if (releasesEnabled != null) {
-            builder.releasesEnabled(releasesEnabled);
-        }
-        if (releasesUpdatePolicy != null) {
-            builder.releasesUpdatePolicy(releasesUpdatePolicy);
-        }
-        if (releasesChecksumPolicy != null) {
-            builder.releasesChecksumPolicy(releasesChecksumPolicy);
-        }
-        if (layout != null) {
-            builder.layout(layout);
-        }
-
-        RepositoryDefinition repository = builder.build();
-        context.getApplicationModules().getRootModule().getBuildFile().addRepository(repository);
+    protected void addRepository(ProjectContext context, RepositoryDefinition repositoryDefinition) {
+        context.getApplicationModules().getRootModule().getBuildFile().addRepository(repositoryDefinition);
     }
 }

components/sbm-core/src/main/java/org/springframework/sbm/build/migration/conditions/NoPluginRepositoryExistsCondition.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.sbm.build.migration.conditions;
+
+import lombok.Setter;
+import org.springframework.sbm.build.api.RepositoryDefinition;
+import org.springframework.sbm.engine.context.ProjectContext;
+import org.springframework.sbm.engine.recipe.Condition;
+
+@Setter
+public class NoPluginRepositoryExistsCondition implements Condition {
+    private String url;
+
+    @Override
+    public String getDescription() {
+        return "Check that no Plugin Repository definition with same id or url exists";
+    }
+
+    @Override
+    public boolean evaluate(ProjectContext context) {
+        // if name is set and repo
+
+        return !context.getBuildFile()
+                .getPluginRepositories().stream()
+                .anyMatch(this::urlsAreEqual);
+    }
+
+    private boolean urlsAreEqual(RepositoryDefinition r) {
+        return r.getUrl() != null && r.getUrl().equals(url);
+    }
+}

components/sbm-core/src/main/java/org/springframework/sbm/build/migration/conditions/NoRepositoryExistsCondition.java

@@ -22,14 +22,8 @@
 
 @Setter
 public class NoRepositoryExistsCondition implements Condition {
-
-    private String id;
     private String url;
 
-    private Boolean snapshotsEnabled = true;
-
-    private Boolean releasesEnabled = true;
-
     @Override
     public String getDescription() {
         return "Check that no Repository definition with same id or url exists";

components/sbm-core/src/test/java/org/springframework/sbm/build/migration/actions/AddPluginRepositoryActionTest.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.sbm.build.migration.actions;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.sbm.engine.context.ProjectContext;
+import org.springframework.sbm.project.resource.TestProjectContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class AddPluginRepositoryActionTest {
+
+    String pomWithoutRepositories =
+            """
+            <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>some.group.id</groupId>
+                <artifactId>with-artifact</artifactId>
+                <packaging>jar</packaging>
+                <version>100.23.01-SNAPSHOT</version>
+            </project>
+            """;
+
+    @Test
+    void shouldAddPluginRepositoryWhenThereIsNoPluginRepository() {
+
+        ProjectContext context = TestProjectContext.buildProjectContext()
+                .withMavenRootBuildFileSource(pomWithoutRepositories)
+                .build();
+
+        AddPluginRepositoryAction sut = new AddPluginRepositoryAction();
+        sut.setId("repo-id");
+        sut.setName("thename");
+        sut.setUrl("https://some.url");
+        sut.apply(context);
+
+        assertThat(context.getBuildFile().print()).isEqualTo(
+                """
+                        <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+                            <modelVersion>4.0.0</modelVersion>
+                            <groupId>some.group.id</groupId>
+                            <artifactId>with-artifact</artifactId>
+                            <packaging>jar</packaging>
+                            <version>100.23.01-SNAPSHOT</version>
+                            <pluginRepositories>
+                                <pluginRepository>
+                                    <id>repo-id</id>
+                                    <name>thename</name>
+                                    <url>https://some.url</url>
+                                </pluginRepository>
+                            </pluginRepositories>
+                        </project>
+                        """
+        );
+    }
+}