Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix class not found exception without Subversion plugin #24

Merged
merged 2 commits into from
Apr 7, 2021
Merged

Fix class not found exception without Subversion plugin #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
760ee3a
Remove Subversion related class from interface
pfeuffer Mar 31, 2021
aa1b365
Add missing optional for svn browser extension
sdorra Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/cloudogu/scmmanager/scm/ScmManagerSvnRepositoryBrowser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public URL getChangeSetLink(SubversionChangeLogSet.LogEntry changeSet) throws IO
return new URL(builder.changeset(getRevision(changeSet)));
}

@Extension
@Extension(optional = true)
public static class DescriptorImpl extends Descriptor<RepositoryBrowser<?>> {
@Override
public String getDisplayName() {
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/cloudogu/scmmanager/scm/ScmManagerSvnSourceBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

import com.google.common.base.Strings;
import edu.umd.cs.findbugs.annotations.NonNull;
import jenkins.scm.api.SCMSource;
import jenkins.scm.api.trait.SCMSourceBuilder;

public class ScmManagerSvnSourceBuilder extends SCMSourceBuilder<ScmManagerSvnSourceBuilder, ScmManagerSvnSource> {
public class ScmManagerSvnSourceBuilder extends SCMSourceBuilder<ScmManagerSvnSourceBuilder, SCMSource> {

private final String serverUrl;
private final String repository;
Expand All @@ -15,7 +16,7 @@ public class ScmManagerSvnSourceBuilder extends SCMSourceBuilder<ScmManagerSvnSo
private String excludes;

public ScmManagerSvnSourceBuilder(String projectName, String serverUrl, String repository, String credentialsId) {
super(ScmManagerSvnSource.class, projectName);
super(SCMSource.class, projectName);
this.serverUrl = serverUrl;
this.repository = repository;
this.credentialsId = credentialsId;
Expand All @@ -38,7 +39,7 @@ public ScmManagerSvnSourceBuilder withExcludes(String excludes) {

@NonNull
@Override
public ScmManagerSvnSource build() {
public SCMSource build() {
ScmManagerSvnSource source = new ScmManagerSvnSource(id, serverUrl, repository, credentialsId);
if (!Strings.isNullOrEmpty(includes)) {
source.setIncludes(includes);
Expand Down