Permalink
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also .
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
- 3 commits
- 5 files changed
- 0 comments
- 2 contributors
Commits on Aug 24, 2021
Unified
Split
Showing
with
13 additions
and 11 deletions.
- +2 −2 plugin-management-cli/pom.xml
- +2 −2 plugin-management-library/pom.xml
- +3 −1 plugin-management-library/src/main/java/io/jenkins/tools/pluginmanager/impl/PluginManager.java
- +3 −3 plugin-management-library/src/test/java/io/jenkins/tools/pluginmanager/impl/PluginManagerTest.java
- +3 −3 pom.xml
| @@ -3,13 +3,13 @@ | ||
| <parent> | ||
| <groupId>io.jenkins.plugin-management</groupId> | ||
| <artifactId>plugin-management-parent-pom</artifactId> | ||
| <version>2.10.1</version> | ||
| <version>2.10.2</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <artifactId>plugin-management-cli</artifactId> | ||
| <version>2.10.1</version> | ||
| <version>2.10.2</version> | ||
| <packaging>jar</packaging> | ||
|
|
||
| <dependencies> | ||
| @@ -5,12 +5,12 @@ | ||
| <parent> | ||
| <groupId>io.jenkins.plugin-management</groupId> | ||
| <artifactId>plugin-management-parent-pom</artifactId> | ||
| <version>2.10.1</version> | ||
| <version>2.10.2</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <artifactId>plugin-management-library</artifactId> | ||
| <version>2.10.1</version> | ||
| <version>2.10.2</version> | ||
| <packaging>jar</packaging> | ||
|
|
||
| <dependencies> | ||
| @@ -923,7 +923,9 @@ public VersionNumber getLatestPluginVersion(Plugin dependendantPlugin, String pl | ||
| String[] dependencies = dependencyString.split(","); | ||
|
|
||
| for (String dependency : dependencies) { | ||
| String[] pluginInfo = dependency.split(":"); | ||
| String[] pluginInfo = dependency | ||
| .replace(";resolution:=optional", "") | ||
| .split(":"); | ||
| String pluginName = pluginInfo[0]; | ||
| String pluginVersion = pluginInfo[1]; | ||
| Plugin dependentPlugin = new Plugin(pluginName, pluginVersion, null, null); | ||
| @@ -791,11 +791,11 @@ public void resolveDependenciesFromManifestDownload() { | ||
| new Plugin("credentials", "2.1.14", null, null), | ||
| new Plugin("git-client", "2.7.7", null, null), | ||
| new Plugin("mailer", "1.18", null, null), | ||
| new Plugin("parameterized-trigger", "2.33;resolution", null, null).setOptional(true), | ||
| new Plugin("promoted-builds", "2.27;resolution", null, null).setOptional(true), | ||
| new Plugin("parameterized-trigger", "2.33", null, null).setOptional(true), | ||
| new Plugin("promoted-builds", "2.27", null, null).setOptional(true), | ||
| new Plugin("scm-api", "2.6.3", null, null), | ||
| new Plugin("ssh-credentials", "1.13", null, null), | ||
| new Plugin("token-macro", "1.12.1;resolution", null, null).setOptional(true)); | ||
| new Plugin("token-macro", "1.12.1", null, null).setOptional(true)); | ||
| assertThat(testPlugin.getVersion()).hasToString("1.0.0"); | ||
| } | ||
|
|
||
| @@ -9,7 +9,7 @@ | ||
| </parent> | ||
|
|
||
| <properties> | ||
| <revision>2.10.1</revision> | ||
| <revision>2.10.2</revision> | ||
| <changelist>-SNAPSHOT</changelist> | ||
| <java.level>8</java.level> | ||
| <!-- Version of Maven Components --> | ||
| @@ -20,7 +20,7 @@ | ||
|
|
||
| <groupId>io.jenkins.plugin-management</groupId> | ||
| <artifactId>plugin-management-parent-pom</artifactId> | ||
| <version>2.10.1</version> | ||
| <version>2.10.2</version> | ||
| <packaging>pom</packaging> | ||
| <url>https://github.com/jenkinsci/plugin-installation-manager-tool</url> | ||
|
|
||
| @@ -33,7 +33,7 @@ | ||
| <connection>scm:git:ssh://git@github.com/jenkinsci/plugin-installation-manager-tool.git</connection> | ||
| <developerConnection>scm:git:ssh://git@github.com/jenkinsci/plugin-installation-manager-tool.git</developerConnection> | ||
| <url>https://github.com/jenkinsci/plugin-installation-manager-tool</url> | ||
| <tag>2.10.1</tag> | ||
| <tag>2.10.2</tag> | ||
| </scm> | ||
|
|
||
| <licenses> | ||