-
Notifications
You must be signed in to change notification settings - Fork 125
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Download Maven extensions instead of bundling them (#476)
* Download Maven extensions instead of bundling them * Set extension versions properly in test * Fix Gradle Enterprise extension selection * Fix acceptance tests * Revert back the maven version for test * Revert README change for a separate pull request
- Loading branch information
Showing
28 changed files
with
238 additions
and
219 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026 | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip | ||
| distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip | ||
| networkTimeout=10000 | ||
| validateDistributionUrl=true | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 37 additions & 42 deletions
79
src/main/java/hudson/plugins/gradle/injection/MavenExtension.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,41 @@ | ||
| package hudson.plugins.gradle.injection; | ||
|
|
||
| public enum MavenExtension { | ||
| DEVELOCITY("develocity-maven-extension", ExtensionsVersions.DEVELOCITY_EXTENSION_VERSION, new MavenCoordinates("com.gradle", "develocity-maven-extension")), | ||
| GRADLE_ENTERPRISE("gradle-enterprise-maven-extension", "1.20.1", new MavenCoordinates("com.gradle", "gradle-enterprise-maven-extension"), false), | ||
| CCUD("common-custom-user-data-maven-extension", ExtensionsVersions.CCUD_EXTENSION_VERSION, new MavenCoordinates("com.gradle", "common-custom-user-data-maven-extension")), | ||
| CONFIGURATION("configuration-maven-extension", "1.0.0", new MavenCoordinates("com.gradle", "configuration-maven-extension")); | ||
|
|
||
| private static final String JAR_EXTENSION = ".jar"; | ||
|
|
||
| private final String name; | ||
| private final String version; | ||
|
|
||
| private final MavenCoordinates coordinates; | ||
|
|
||
| private final boolean injectable; | ||
|
|
||
| MavenExtension(String name, String version, MavenCoordinates coordinates) { | ||
| this.name = name; | ||
| this.version = version; | ||
| this.coordinates = coordinates; | ||
| this.injectable = true; | ||
| } | ||
| MavenExtension(String name, String version, MavenCoordinates coordinates, boolean injectable) { | ||
| this.name = name; | ||
| this.version = version; | ||
| this.coordinates = coordinates; | ||
| this.injectable = injectable; | ||
| } | ||
|
|
||
| public String getTargetJarName() { | ||
| return name + JAR_EXTENSION; | ||
| } | ||
|
|
||
| public String getEmbeddedJarName() { | ||
| return name + "-" + version + JAR_EXTENSION; | ||
| } | ||
|
|
||
| public MavenCoordinates getCoordinates() { | ||
| return coordinates; | ||
| } | ||
|
|
||
| public boolean isInjectable() { | ||
| return injectable; | ||
| } | ||
| DEVELOCITY("develocity-maven-extension", new MavenCoordinates("com.gradle", "develocity-maven-extension")), | ||
| GRADLE_ENTERPRISE("gradle-enterprise-maven-extension", new MavenCoordinates("com.gradle", "gradle-enterprise-maven-extension")), | ||
| CCUD("common-custom-user-data-maven-extension", new MavenCoordinates("com.gradle", "common-custom-user-data-maven-extension")), | ||
| CONFIGURATION("configuration-maven-extension", new MavenCoordinates("com.gradle", "configuration-maven-extension")); | ||
|
|
||
| private static final String JAR_EXTENSION = ".jar"; | ||
| private static final String LAST_GRADLE_ENTERPRISE_VERSION = "1.20.1"; | ||
|
|
||
| private final MavenCoordinates coordinates; | ||
|
|
||
| private final String name; | ||
|
|
||
| MavenExtension(String name, MavenCoordinates coordinates) { | ||
| this.name = name; | ||
| this.coordinates = coordinates; | ||
| } | ||
|
|
||
| public String getTargetJarName() { | ||
| return name + JAR_EXTENSION; | ||
| } | ||
|
|
||
| // Only used for CONFIGURATION extension as the embedded JAR contains the version | ||
| public String getEmbeddedJarName() { | ||
| return name + "-1.0.0" + JAR_EXTENSION; | ||
| } | ||
|
|
||
| public MavenCoordinates getCoordinates() { | ||
| return coordinates; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public static boolean isDevelocityExtensionVersion(String version) { | ||
| return version.compareTo(LAST_GRADLE_ENTERPRISE_VERSION) > 0; | ||
| } | ||
| } |
Oops, something went wrong.