Package reorganization: s/io.pivotal.cfapp/org.cftoolsuite.cfapp/g (#422

)

* Source spring-boot-starter-runtime-metadata from Maven Central
* Package reorganization: s/io.pivotal/org.cftoolsuite/g
* Revert bad update
* Use plugin to generate startup banner; owner updated to [email protected]
* Fix package ref in spring.factories for env processor
* Upgrade json-io

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: liberica
           java-version: ${{ matrix.java }}

.github/workflows/codeql.yml

@@ -49,7 +49,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: liberica
         java-version: 21

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: liberica
           java-version: 21

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project owner at cphillipson@pivotal.io. All
+reported by contacting the project owner at cphillipson@cftoolsuite.org. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project owner is
 obligated to maintain confidentiality with regard to the reporter of an incident.

docs/ENDPOINTS.md

@@ -593,7 +593,7 @@ Sample output
         "dropletId": "797b9bfd-0de2-48a9-b22e-90d7a61fd988",
         "organization": "observability",
         "space": "demo",
-        "springDependencies": "org.springframework.boot:spring-boot-starter-parent:3.2.2, org.springframework.cloud:spring-cloud-dependencies:2023.0.0"
+        "springDependencies": "org.springframework.boot:spring-boot-starter-parent:3.2.2, org.springframework.cloud:spring-cloud-dependencies:2023.0.1"
     }
 ]
 ```
@@ -608,7 +608,7 @@ Sample output
 ```
 {
     "org.springframework.boot:spring-boot-starter-parent:3.2.2": 10,
-    "org.springframework.cloud:spring-cloud-dependencies:2023.0.0": 7
+    "org.springframework.cloud:spring-cloud-dependencies:2023.0.1": 7
 }
 ```
 

pom.xml

@@ -3,7 +3,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>io.pivotal</groupId>
+  <groupId>org.cftoolsuite.cfapp</groupId>
   <artifactId>cf-butler</artifactId>
   <version>1.0-SNAPSHOT</version>
 
@@ -20,12 +20,13 @@
     <developer>
       <id>cphillipson</id>
       <name>Chris Phillipson</name>
-      <email>[email protected]</email>
-      <url>https://pivotal.io</url>
+      <email>[email protected]</email>
       <roles>
         <role>architect</role>
         <role>developer</role>
       </roles>
+      <organization>Cloud Foundry Tool Suite</organization>
+      <organizationUrl>https://github.com/cf-toolsuite</organizationUrl>
       <timezone>America/Seattle</timezone>
     </developer>
   </developers>
@@ -114,7 +115,7 @@
     <dependency>
       <groupId>com.cedarsoftware</groupId>
       <artifactId>json-io</artifactId>
-      <version>4.19.11</version>
+      <version>4.19.13</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -241,7 +242,7 @@
       <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dependencies</artifactId>
-        <version>2023.0.0</version>
+        <version>2023.0.1</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -437,8 +438,8 @@
         <artifactId>native-maven-plugin</artifactId>
         <configuration>
           <buildArgs>
-              <buildArg>--no-fallback</buildArg>
-              <buildArg>-H:IncludeResources=.*\.(html|txt|yml|factories|xml|ddl|properties)</buildArg>
+            <buildArg>--no-fallback</buildArg>
+            <buildArg>-H:IncludeResources=.*\.(html|txt|yml|factories|xml|ddl|properties)</buildArg>
           </buildArgs>
         </configuration>
       </plugin>
@@ -625,8 +626,8 @@
         <version>4.3</version>
         <configuration>
           <properties>
-            <owner>io.pivotal.cf-butler</owner>
-            <email>cphillipson@pivotal.io</email>
+            <owner>org.cftoolsuite.cfapp.cf-butler</owner>
+            <email>cphillipson@cftoolsuite.org</email>
           </properties>
           <licenseSets>
             <licenseSet>
@@ -684,6 +685,23 @@
           </links>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>ch.acanda.maven</groupId>
+        <artifactId>spring-banner-plugin</artifactId>
+        <version>1.6.0</version>
+        <executions>
+          <execution>
+            <id>generate-spring-banner</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <info>Commit: ${git.commit.id.abbrev}, Version: ${project.version}, Active Profiles: ${spring.profiles.active:default}</info>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -819,9 +837,9 @@
       <id>expose-runtime-metadata</id>
       <dependencies>
         <dependency>
-          <groupId>io.pivotal.app.actuator</groupId>
+          <groupId>org.cftoolsuite.actuator</groupId>
           <artifactId>spring-boot-starter-runtime-metadata</artifactId>
-          <version>0.1.2</version>
+          <version>0.2.0</version>
         </dependency>
       </dependencies>
     </profile>

src/main/java/io/pivotal/cfapp/AppInit.java → src/main/java/org/cftoolsuite/cfapp/AppInit.java

@@ -1,4 +1,4 @@
-package io.pivotal.cfapp;
+package org.cftoolsuite.cfapp;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/io/pivotal/cfapp/client/GitClient.java → src/main/java/org/cftoolsuite/cfapp/client/GitClient.java

@@ -1,4 +1,4 @@
-package io.pivotal.cfapp.client;
+package org.cftoolsuite.cfapp.client;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,6 +10,7 @@
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
+import org.cftoolsuite.cfapp.config.GitSettings;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.ObjectId;
@@ -23,7 +24,6 @@
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
-import io.pivotal.cfapp.config.GitSettings;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

src/main/java/io/pivotal/cfapp/client/OpsmanAccessTokenProvider.java → src/main/java/org/cftoolsuite/cfapp/client/OpsmanAccessTokenProvider.java

@@ -1,13 +1,13 @@
-package io.pivotal.cfapp.client;
+package org.cftoolsuite.cfapp.client;
 
+import org.cftoolsuite.cfapp.config.OpsmanSettings;
 import org.cloudfoundry.uaa.tokens.GetTokenByClientCredentialsResponse;
 import org.cloudfoundry.uaa.tokens.GetTokenByPasswordResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.web.reactive.function.client.WebClient;
 
-import io.pivotal.cfapp.config.OpsmanSettings;
 import reactor.core.publisher.Mono;
 
 @Component

src/main/java/io/pivotal/cfapp/client/OpsmanClient.java → src/main/java/org/cftoolsuite/cfapp/client/OpsmanClient.java

@@ -1,17 +1,17 @@
-package io.pivotal.cfapp.client;
+package org.cftoolsuite.cfapp.client;
 
 import java.util.List;
 
+import org.cftoolsuite.cfapp.config.OpsmanSettings;
+import org.cftoolsuite.cfapp.domain.product.DeployedProduct;
+import org.cftoolsuite.cfapp.domain.product.OmInfo;
+import org.cftoolsuite.cfapp.domain.product.StemcellAssignments;
+import org.cftoolsuite.cfapp.domain.product.StemcellAssociations;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.WebClient;
 
-import io.pivotal.cfapp.config.OpsmanSettings;
-import io.pivotal.cfapp.domain.product.DeployedProduct;
-import io.pivotal.cfapp.domain.product.OmInfo;
-import io.pivotal.cfapp.domain.product.StemcellAssignments;
-import io.pivotal.cfapp.domain.product.StemcellAssociations;
 import reactor.core.publisher.Mono;
 
 @Component

src/main/java/io/pivotal/cfapp/client/PivnetClient.java → src/main/java/org/cftoolsuite/cfapp/client/PivnetClient.java

@@ -1,15 +1,15 @@
-package io.pivotal.cfapp.client;
+package org.cftoolsuite.cfapp.client;
 
+import org.cftoolsuite.cfapp.config.PivnetSettings;
+import org.cftoolsuite.cfapp.domain.product.Products;
+import org.cftoolsuite.cfapp.domain.product.Release;
+import org.cftoolsuite.cfapp.domain.product.Releases;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.WebClient;
 
-import io.pivotal.cfapp.config.PivnetSettings;
-import io.pivotal.cfapp.domain.product.Products;
-import io.pivotal.cfapp.domain.product.Release;
-import io.pivotal.cfapp.domain.product.Releases;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

src/main/java/io/pivotal/cfapp/config/ButlerCfEnvProcessor.java → src/main/java/org/cftoolsuite/cfapp/config/ButlerCfEnvProcessor.java

@@ -1,4 +1,4 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
 import java.util.Map;
 

src/main/java/io/pivotal/cfapp/config/ButlerConfig.java → src/main/java/org/cftoolsuite/cfapp/config/ButlerConfig.java

@@ -1,4 +1,4 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
 import java.time.Duration;
 

src/main/java/io/pivotal/cfapp/config/DbmsSettings.java → src/main/java/org/cftoolsuite/cfapp/config/DbmsSettings.java

@@ -1,4 +1,4 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

src/main/java/io/pivotal/cfapp/config/GitSettings.java → src/main/java/org/cftoolsuite/cfapp/config/GitSettings.java

@@ -1,4 +1,4 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
 import java.util.Set;
 

src/main/java/io/pivotal/cfapp/config/H2ConsoleConfig.java → src/main/java/org/cftoolsuite/cfapp/config/H2ConsoleConfig.java

@@ -1,4 +1,4 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.event.ContextClosedEvent;

src/main/java/io/pivotal/cfapp/config/JacksonDeSerConfig.java → src/main/java/org/cftoolsuite/cfapp/config/JacksonDeSerConfig.java

@@ -1,15 +1,14 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
 import java.time.LocalDate;
 
+import org.cftoolsuite.cfapp.deser.RelaxedLocalDateDeserializer;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
-import io.pivotal.cfapp.deser.RelaxedLocalDateDeserializer;
-
 @Configuration
 public class JacksonDeSerConfig {
 

src/main/java/io/pivotal/cfapp/config/JavaArtifactReaderConfig.java → src/main/java/org/cftoolsuite/cfapp/config/JavaArtifactReaderConfig.java

@@ -1,18 +1,17 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
 import java.util.Map;
 import java.util.Set;
 
+import org.cftoolsuite.cfapp.util.JarSetFilterReader;
+import org.cftoolsuite.cfapp.util.JarSetFilterReaderCondition;
+import org.cftoolsuite.cfapp.util.JavaArtifactReader;
+import org.cftoolsuite.cfapp.util.MavenPomReader;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
-import io.pivotal.cfapp.util.JarSetFilterReader;
-import io.pivotal.cfapp.util.JarSetFilterReaderCondition;
-import io.pivotal.cfapp.util.JavaArtifactReader;
-import io.pivotal.cfapp.util.MavenPomReader;
-
 @Configuration
 public class JavaArtifactReaderConfig {
 

src/main/java/io/pivotal/cfapp/config/NotifierConfig.java → src/main/java/org/cftoolsuite/cfapp/config/NotifierConfig.java

@@ -1,5 +1,8 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
+import org.cftoolsuite.cfapp.notifier.EmailNotifier;
+import org.cftoolsuite.cfapp.notifier.JavaMailNotifier;
+import org.cftoolsuite.cfapp.notifier.SendGridNotifier;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration;
@@ -10,10 +13,6 @@
 
 import com.sendgrid.SendGrid;
 
-import io.pivotal.cfapp.notifier.EmailNotifier;
-import io.pivotal.cfapp.notifier.JavaMailNotifier;
-import io.pivotal.cfapp.notifier.SendGridNotifier;
-
 @Configuration
 public class NotifierConfig {
 

src/main/java/io/pivotal/cfapp/config/OpsmanSettings.java → src/main/java/org/cftoolsuite/cfapp/config/OpsmanSettings.java

@@ -1,4 +1,4 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
 import org.cloudfoundry.uaa.tokens.GrantType;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/io/pivotal/cfapp/config/PasSettings.java → src/main/java/org/cftoolsuite/cfapp/config/PasSettings.java

@@ -1,4 +1,4 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
 import java.time.Duration;
 import java.util.Collections;

src/main/java/io/pivotal/cfapp/config/PivnetSettings.java → src/main/java/org/cftoolsuite/cfapp/config/PivnetSettings.java

@@ -1,4 +1,4 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

src/main/java/io/pivotal/cfapp/config/R2dbcConfig.java → src/main/java/org/cftoolsuite/cfapp/config/R2dbcConfig.java

@@ -1,9 +1,10 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
 import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
 
+import org.cftoolsuite.cfapp.domain.CustomConverters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.r2dbc.R2dbcProperties;
 import org.springframework.context.annotation.Bean;
@@ -12,7 +13,6 @@
 import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration;
 import org.springframework.util.StringUtils;
 
-import io.pivotal.cfapp.domain.CustomConverters;
 import io.pivotal.cfenv.jdbc.CfJdbcEnv;
 import io.pivotal.cfenv.jdbc.CfJdbcService;
 import io.r2dbc.spi.ConnectionFactories;

src/main/java/io/pivotal/cfapp/config/WebClientConfig.java → src/main/java/org/cftoolsuite/cfapp/config/WebClientConfig.java

@@ -1,4 +1,4 @@
-package io.pivotal.cfapp.config;
+package org.cftoolsuite.cfapp.config;
 
 import javax.net.ssl.SSLException;