Skip to content

Commit 27a1254

Browse files
authored
Generate metadata file independent of Maven version (#44)
1 parent cbde8d4 commit 27a1254

File tree

11 files changed

+4
-81
lines changed

11 files changed

+4
-81
lines changed

src/main/java/org/gradlex/maven/gmm/GradleModuleMetadataMojo.java

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.gradlex.maven.gmm;
1818

19-
import org.apache.maven.Maven;
2019
import org.apache.maven.model.Dependency;
2120
import org.apache.maven.plugin.AbstractMojo;
2221
import org.apache.maven.plugin.MojoExecutionException;
@@ -30,10 +29,8 @@
3029
import java.io.File;
3130
import java.io.FileWriter;
3231
import java.io.IOException;
33-
import java.io.InputStream;
3432
import java.nio.file.Files;
3533
import java.util.List;
36-
import java.util.Properties;
3734

3835
/**
3936
* Goal that generates Gradle Module Metadata.
@@ -83,7 +80,7 @@ public void execute() throws MojoExecutionException {
8380

8481
try (FileWriter fileWriter = new FileWriter(moduleFile)) {
8582
GradleModuleMetadataWriter.generateTo(
86-
project, getMavenVersion(),
83+
project,
8784
platformDependencies,
8885
capabilities,
8986
removedDependencies,
@@ -109,21 +106,4 @@ private void addMarkerToPomIfNotPresent() {
109106
throw new RuntimeException(e);
110107
}
111108
}
112-
113-
private static String getMavenVersion() throws MojoExecutionException {
114-
try (InputStream resource = Maven.class.getClassLoader().getResourceAsStream("org/apache/maven/messages/build.properties")) {
115-
if (resource == null) {
116-
throw new MojoExecutionException("Unable to determine Maven version.");
117-
}
118-
Properties properties = new Properties();
119-
properties.load(resource);
120-
String version = properties.getProperty("version");
121-
if (version == null) {
122-
throw new MojoExecutionException("Unable to determine Maven version.");
123-
}
124-
return version;
125-
} catch (IOException e) {
126-
throw new MojoExecutionException("Unable to determine Maven version.", e);
127-
}
128-
}
129109
}

src/main/java/org/gradlex/maven/gmm/GradleModuleMetadataWriter.java

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ private enum Variant {
5454
}
5555
}
5656

57-
public static void generateTo(MavenProject project, String mavenVersion,
57+
public static void generateTo(MavenProject project,
5858
List<Dependency> platformDependencies, List<Capability> capabilities,
5959
List<Dependency> removedDependencies,
6060
List<Dependency> compileOnlyApiDependencies,
6161
Writer writer) throws IOException {
6262
JsonWriter jsonWriter = new JsonWriter(writer);
6363
jsonWriter.setHtmlSafe(false);
6464
jsonWriter.setIndent(" ");
65-
writeComponentWithVariants(project, mavenVersion, platformDependencies, capabilities, removedDependencies, compileOnlyApiDependencies, jsonWriter);
65+
writeComponentWithVariants(project, platformDependencies, capabilities, removedDependencies, compileOnlyApiDependencies, jsonWriter);
6666
jsonWriter.flush();
6767
writer.append('\n');
6868
}
@@ -89,7 +89,7 @@ private static Map<String, String> variantAttributes(Variant variant) {
8989
return attributes;
9090
}
9191

92-
private static void writeComponentWithVariants(MavenProject project, String mavenVersion,
92+
private static void writeComponentWithVariants(MavenProject project,
9393
List<Dependency> platformDependencies,
9494
List<Capability> capabilities,
9595
List<Dependency> removedDependencies,
@@ -98,7 +98,6 @@ private static void writeComponentWithVariants(MavenProject project, String mave
9898
jsonWriter.beginObject();
9999
writeFormat(jsonWriter);
100100
writeIdentity(project, jsonWriter);
101-
writeCreator(mavenVersion, jsonWriter);
102101
writeVariants(project, platformDependencies, capabilities, removedDependencies, compileOnlyApiDependencies, jsonWriter);
103102
jsonWriter.endObject();
104103
}
@@ -132,17 +131,6 @@ private static void writeVariants(MavenProject project,
132131
jsonWriter.endArray();
133132
}
134133

135-
private static void writeCreator(String mavenVersion, JsonWriter jsonWriter) throws IOException {
136-
jsonWriter.name("createdBy");
137-
jsonWriter.beginObject();
138-
jsonWriter.name("maven");
139-
jsonWriter.beginObject();
140-
jsonWriter.name("version");
141-
jsonWriter.value(mavenVersion);
142-
jsonWriter.endObject();
143-
jsonWriter.endObject();
144-
}
145-
146134
private static void writeFormat(JsonWriter jsonWriter) throws IOException {
147135
jsonWriter.name("formatVersion");
148136
jsonWriter.value(FORMAT_VERSION);

src/test/resources/capabilities/expected-module.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
"org.gradle.status": "release"
99
}
1010
},
11-
"createdBy": {
12-
"maven": {
13-
"version": "3.9.10"
14-
}
15-
},
1611
"variants": [
1712
{
1813
"name": "apiElements",

src/test/resources/combine-with-shade-plugin/expected-module.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
"org.gradle.status": "release"
99
}
1010
},
11-
"createdBy": {
12-
"maven": {
13-
"version": "3.9.10"
14-
}
15-
},
1611
"variants": [
1712
{
1813
"name": "apiElements",

src/test/resources/combined-features/expected-module.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
"org.gradle.status": "release"
99
}
1010
},
11-
"createdBy": {
12-
"maven": {
13-
"version": "3.9.10"
14-
}
15-
},
1611
"variants": [
1712
{
1813
"name": "apiElements",

src/test/resources/compile-only-api-dependencies/expected-module.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
"org.gradle.status": "release"
99
}
1010
},
11-
"createdBy": {
12-
"maven": {
13-
"version": "3.9.10"
14-
}
15-
},
1611
"variants": [
1712
{
1813
"name": "apiElements",

src/test/resources/optional-dependencies/expected-module.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
"org.gradle.status": "release"
99
}
1010
},
11-
"createdBy": {
12-
"maven": {
13-
"version": "3.9.10"
14-
}
15-
},
1611
"variants": [
1712
{
1813
"name": "apiElements",

src/test/resources/parent-dependencies/expected-module.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
"org.gradle.status": "release"
99
}
1010
},
11-
"createdBy": {
12-
"maven": {
13-
"version": "3.9.10"
14-
}
15-
},
1611
"variants": [
1712
{
1813
"name": "apiElements",

src/test/resources/platform-dependencies/expected-module.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
"org.gradle.status": "release"
99
}
1010
},
11-
"createdBy": {
12-
"maven": {
13-
"version": "3.9.10"
14-
}
15-
},
1611
"variants": [
1712
{
1813
"name": "apiElements",

src/test/resources/snapshot-status-attribute/expected-module.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
"org.gradle.status": "integration"
99
}
1010
},
11-
"createdBy": {
12-
"maven": {
13-
"version": "3.9.10"
14-
}
15-
},
1611
"variants": [
1712
{
1813
"name": "apiElements",

0 commit comments

Comments
 (0)