Update apps generator plugin dependencies #593

onobc · 2024-12-10T04:21:30Z

This commit updates all library and plugin dependencies in the spring-cloud-dataflow-apps-plugin modules to the latest versions.

Additionally:

performs a general cleanup of build and README files.
updates to maven 3.9.9

Resolves #498

This commit updates all library and plugin dependencies in the `spring-cloud-dataflow-apps-plugin` modules to the latest versions. Additionally: - performs a general cleanup of build and README files. - updates to maven 3.9.9 Resolves spring-cloud#498

onobc · 2024-12-10T04:22:22Z

spring-cloud-dataflow-apps-plugin/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,20 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one


Updated the wrapper and maven to 3.9.9

onobc · 2024-12-10T04:23:20Z

spring-cloud-dataflow-apps-plugin/pom.xml

@@ -3,41 +3,44 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-dataflow-apps-plugin-parent</artifactId>
-	<version>1.0.15-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>


Bumping up minor version to indicate the dependency updates

onobc · 2024-12-10T04:24:51Z

...va/org/springframework/cloud/dataflow/app/plugin/ConfigurationMetadataDocumentationMojo.java

@@ -418,14 +418,14 @@ public Manifest getManifest() {
 		}

 		@Override
-		public List<Archive> getNestedArchives(EntryFilter ignored) throws IOException {
+		public Iterator<Archive> getNestedArchives(EntryFilter ignored, EntryFilter ignored2) throws IOException {


API change in Maven

onobc · 2024-12-10T04:26:06Z

...rator-plugin/src/main/java/org/springframework/cloud/dataflow/app/plugin/MavenXmlWriter.java

 			String result = writer.toString();
-			return result.substring(result.indexOf('\n') + 1); // remove first line (e.g. remove the <?xml ... ?>)
+			// Strip the namespace info


Latest version of MXSerializer handles generated xml a bit different. This impl has been improved to look for the actual tag, not the 1st newline character for parsing.

onobc · 2024-12-10T04:26:24Z

...rator-plugin/src/main/java/org/springframework/cloud/dataflow/app/plugin/MavenXmlWriter.java

@@ -168,6 +173,9 @@ public static <T> void invokeMavenXppWriteMethod(T modelElementToWrite, String w
 	public static String indent(String input, int indentation) {
 		String indentPrefix = "\n" + IntStream.range(0, indentation).mapToObj(i -> " ").collect(Collectors.joining());
 		String indentedInput = input.replace("\n", indentPrefix);
-		return indentedInput.substring(0, indentedInput.lastIndexOf(indentPrefix)); // remove the last empty line.
+		if (input.endsWith(indentPrefix)) {


Similar to comment above, more lenient processing.

onobc · 2024-12-10T04:28:04Z

...ator-plugin/src/test/java/org/springframework/cloud/dataflow/app/plugin/MojoHarnessTest.java

+	void httpSourceAppsGeneration() throws Exception {
+		File pomRoot = new File("src/test/resources/unit/http-source-apps");
+		MavenProject project = readMavenProject(pomRoot);
+		SpringCloudStreamAppGeneratorMojo myMojo = (SpringCloudStreamAppGeneratorMojo) super.lookupConfiguredMojo(project, "generate-app");


There is no Junit5 replacement for the Mojo Junit5 rule. HOWEVER, the AbstractMojoTestCase has what we need but we have to jump through some hoops in readMavenProject to get an actual project object to then pass into super.lookupConfiguredMojo.

onobc · 2024-12-10T04:31:13Z

spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-docs-plugin/pom.xml

-			<version>3.15.0</version>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-dataflow-configuration-metadata</artifactId>
+			<version>2.11.5</version>


This is way less than ideal. However, it was previously hardcoded to 2.7.0 so just updated to 2.11.5 for now. Need to figure out how to detangle this bidrectional dependency (apps plugin needs SCDF and SCDF needs apps plugin).

artembilan

Cannot tell that I understood too much from the change, but mostly it is really OK.
Just a couple nit-picks from me.

Thanks

artembilan · 2024-12-10T16:50:33Z

...plugin/spring-cloud-dataflow-apps-generator-plugin/src/main/resources/template/AppTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2019-2024 the original author or authors.


Looks like these couple classes updates are bogus.
What do I miss?
Why would one update just a copyright year?

Typically I would not just update the copyright like this but I was basically brining this repo up-to-date for everything I could find that was outdated. I figured I would catch up the copyrights as well.

artembilan · 2024-12-10T16:53:07Z

spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-metadata-plugin/README.adoc

-        <version>2.0.0.BUILD-SNAPSHOT</version>
-
+        <artifactId>spring-cloud-dataflow-apps-metadata-plugin</artifactId>
+        <version>1.0.0</version>


Is it really expected to have 1.0.0 here as a version, but not the mentioned above 1.1.0-SNAPSHOT?

Good catch. Will update

artembilan · 2024-12-10T16:53:40Z

...gin/src/main/java/org/springframework/cloud/dataflow/app/plugin/MetadataAggregationMojo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 2017-2024 the original author or authors.


DITTO - bogus.

See #593 (comment)

artembilan · 2024-12-10T16:54:01Z

...ps-metadata-plugin/src/test/java/org/springframework/cloud/dataflow/completion/Expresso.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 the original author or authors.
+ * Copyright 2018-2024 the original author or authors.


And again 😄

See #593 (comment)

- Use `1.1.0-SNAPSHOT` as version in metadata plugin README.adoc to be consistent w/ other examples

artembilan · 2024-12-10T19:00:18Z

I have no idea what is that CI build failure:

[Info] Cleaning build info...
[Info] Cleaned build info spring-cloud-dataflow-apps-plugin-main-snapshot/22.
[Info] Running Mvn...
[Info] The build-info-extractor jar is not cached locally. Downloading it now...
 You can set the repository from which this jar is downloaded. Read more about it at https://www.jfrog.com/confluence/display/CLI/CLI+for+JFrog+Artifactory#CLIforJFrogArtifactory-DownloadingtheMavenandGradleExtractorJARs
[Info] Downloading build-info-extractor from https://oss.jfrog.org/artifactory/oss-release-local/org/jfrog/buildinfo/build-info-extractor-maven3/2.25.0/build-info-extractor-maven3-2.25.0-uber.jar
Error:  Server ID 'repo.spring.io' does not exist.
Error: Process completed with exit code 1.

onobc · 2024-12-10T21:11:35Z

I have no idea what is that CI build failure:

[Info] Cleaning build info...
[Info] Cleaned build info spring-cloud-dataflow-apps-plugin-main-snapshot/22.
[Info] Running Mvn...
[Info] The build-info-extractor jar is not cached locally. Downloading it now...
 You can set the repository from which this jar is downloaded. Read more about it at https://www.jfrog.com/confluence/display/CLI/CLI+for+JFrog+Artifactory#CLIforJFrogArtifactory-DownloadingtheMavenandGradleExtractorJARs
[Info] Downloading build-info-extractor from https://oss.jfrog.org/artifactory/oss-release-local/org/jfrog/buildinfo/build-info-extractor-maven3/2.25.0/build-info-extractor-maven3-2.25.0-uber.jar
Error:  Server ID 'repo.spring.io' does not exist.
Error: Process completed with exit code 1.

Digging in..

onobc · 2024-12-10T21:34:03Z

@artembilan this 5cce183#diff-56d907718f7f9fbb26e09bddd3723c4ba7782bf2eaf3b8f22781f2a66df9701bR43 fixed it

Something has changed on Artifactory where the server id used to generate the token was "repo.spring.io" but is now different per group of projects (e.g. it is now github-spring-cloud for most Spring Cloud projects).

onobc added the dependencies Pull requests that update a dependency file label Dec 10, 2024

onobc requested review from corneil and artembilan December 10, 2024 04:21

onobc commented Dec 10, 2024

View reviewed changes

artembilan requested changes Dec 10, 2024

View reviewed changes

Address code review comments:

efe25ab

- Use `1.1.0-SNAPSHOT` as version in metadata plugin README.adoc to be consistent w/ other examples

onobc requested a review from artembilan December 10, 2024 17:59

artembilan merged commit 4376848 into spring-cloud:main Dec 10, 2024
2 checks passed

artembilan mentioned this pull request Dec 10, 2024

Bump commons-io:commons-io from 2.12.0 to 2.14.0 in /spring-cloud-dataflow-apps-plugin/spring-cloud-dataflow-apps-generator-plugin #556

Closed

onobc deleted the GH-498-update-apps-plugin-deps branch December 10, 2024 21:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update apps generator plugin dependencies #593

Update apps generator plugin dependencies #593

onobc commented Dec 10, 2024

onobc Dec 10, 2024

onobc Dec 10, 2024

onobc Dec 10, 2024

onobc Dec 10, 2024

onobc Dec 10, 2024

onobc Dec 10, 2024

onobc Dec 10, 2024

artembilan left a comment

artembilan Dec 10, 2024

onobc Dec 10, 2024

artembilan Dec 10, 2024

onobc Dec 10, 2024

artembilan Dec 10, 2024

onobc Dec 10, 2024

artembilan Dec 10, 2024

onobc Dec 10, 2024

artembilan commented Dec 10, 2024

onobc commented Dec 10, 2024

onobc commented Dec 10, 2024

Update apps generator plugin dependencies #593

Update apps generator plugin dependencies #593

Conversation

onobc commented Dec 10, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

artembilan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

artembilan commented Dec 10, 2024

onobc commented Dec 10, 2024

onobc commented Dec 10, 2024