Skip to content

Commit fb6b2b3

Browse files
authored
Remove ChildNameGenerator#recordLegacyName (#534)
1 parent f1cf7ba commit fb6b2b3

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
<changelist>999999-SNAPSHOT</changelist>
7070
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
7171
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
72-
<jenkins.baseline>2.479</jenkins.baseline>
73-
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
72+
<jenkins.baseline>2.504</jenkins.baseline>
73+
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
7474

7575
<hpi.compatibleSinceVersion>2.0.0</hpi.compatibleSinceVersion>
7676
<no-test-jar>false</no-test-jar>
@@ -85,6 +85,12 @@
8585
<type>pom</type>
8686
<scope>import</scope>
8787
</dependency>
88+
<!-- TODO remove when in BOM -->
89+
<dependency>
90+
<groupId>org.jenkins-ci.plugins</groupId>
91+
<artifactId>cloudbees-folder</artifactId>
92+
<version>6.1034.v4159e5986617</version>
93+
</dependency>
8894
</dependencies>
8995
</dependencyManagement>
9096
<dependencies>

src/main/java/jenkins/branch/MultiBranchProjectDescriptor.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import hudson.model.Run;
3535
import hudson.model.TopLevelItem;
3636
import hudson.model.TopLevelItemDescriptor;
37-
import java.io.IOException;
3837
import java.lang.reflect.ParameterizedType;
3938
import java.lang.reflect.Type;
4039
import java.util.ArrayList;
@@ -263,12 +262,5 @@ public String itemNameFromLegacy(@NonNull MultiBranchProject<P, R> parent, @NonN
263262
public String dirNameFromLegacy(@NonNull MultiBranchProject<P, R> parent, @NonNull String legacyDirName) {
264263
return NameMangler.apply(NameEncoder.decode(legacyDirName));
265264
}
266-
267-
// TODO remove after it is removed in cloudbees-folder
268-
public void recordLegacyName(MultiBranchProject<P, R> parent, P item, String legacyDirName) throws IOException {
269-
// no-op because we already tracked the name in Branch.getName()
270-
}
271-
272265
}
273-
274266
}

src/main/java/jenkins/branch/OrganizationFolder.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -884,12 +884,6 @@ public String itemNameFromLegacy(@NonNull OrganizationFolder parent, @NonNull St
884884
public String dirNameFromLegacy(@NonNull OrganizationFolder parent, @NonNull String legacyDirName) {
885885
return NameMangler.apply(NameEncoder.decode(legacyDirName));
886886
}
887-
888-
// TODO remove after it is removed in cloudbees-folder
889-
public void recordLegacyName(OrganizationFolder parent, MultiBranchProject<?, ?> item, String legacyDirName)
890-
throws IOException {
891-
item.addProperty(new ProjectNameProperty(legacyDirName));
892-
}
893887
}
894888

895889
/**

0 commit comments

Comments
 (0)