diff --git a/pom.xml b/pom.xml index 50a383b..1ccf2e8 100644 --- a/pom.xml +++ b/pom.xml @@ -28,11 +28,11 @@ org.jenkins-ci.plugins plugin - 2.11 + 2.33 gogs-branch-source - 0.1-SNAPSHOT + 0.3-SNAPSHOT hpi Gogs Branch Source Plugin @@ -45,7 +45,7 @@ - 1.642.1 + 2.46.2 @@ -59,12 +59,12 @@ org.jenkins-ci.plugins cloudbees-folder - 5.17 + 6.1.2 org.jenkins-ci.plugins branch-api - 2.0.2 + 2.0.11 @@ -76,12 +76,12 @@ org.jenkins-ci.plugins scm-api - 2.0.2 + 2.2.1 org.jenkins-ci.plugins git - 3.0.4 + 3.5.1 org.apache.httpcomponents @@ -89,6 +89,11 @@ + + org.jenkins-ci.plugins + structs + 1.10 + org.codehaus.jackson jackson-jaxrs @@ -97,23 +102,43 @@ org.jenkins-ci.plugins.workflow workflow-multibranch - 2.12 + 2.16 + + + org.jenkins-ci.plugins.workflow + workflow-support + 2.14 - org.mockito - mockito-core - 1.10.19 - test + org.jenkins-ci.plugins.workflow + workflow-scm-step + 2.5 - org.hamcrest - hamcrest-core - 1.3 - test + org.jenkins-ci.plugins + mailer + 1.20 + + + org.mockito + mockito-core + 1.10.19 + test + + + org.hamcrest + hamcrest-core + 1.3 + test + + + org.jenkins-ci.plugins + junit + 1.3 - + repo.jenkins-ci.org http://repo.jenkins-ci.org/public/ @@ -126,4 +151,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/cloudbees/jenkins/plugins/gogs/GogsSCMNavigator.java b/src/main/java/com/cloudbees/jenkins/plugins/gogs/GogsSCMNavigator.java index 0b52f92..88cd58e 100644 --- a/src/main/java/com/cloudbees/jenkins/plugins/gogs/GogsSCMNavigator.java +++ b/src/main/java/com/cloudbees/jenkins/plugins/gogs/GogsSCMNavigator.java @@ -191,7 +191,7 @@ public void visitSources(SCMSourceObserver observer) throws IOException, Interru } } - private void add(TaskListener listener, SCMSourceObserver observer, GogsRepository repo) throws InterruptedException { + private void add(TaskListener listener, SCMSourceObserver observer, GogsRepository repo) throws InterruptedException, IOException { String name = repo.getRepositoryName(); if (!Pattern.compile(pattern).matcher(name).matches()) { listener.getLogger().format("Ignoring %s%n", name); diff --git a/src/main/java/com/cloudbees/jenkins/plugins/gogs/GogsSCMSource.java b/src/main/java/com/cloudbees/jenkins/plugins/gogs/GogsSCMSource.java index 14c06ed..ec63cf2 100644 --- a/src/main/java/com/cloudbees/jenkins/plugins/gogs/GogsSCMSource.java +++ b/src/main/java/com/cloudbees/jenkins/plugins/gogs/GogsSCMSource.java @@ -264,9 +264,7 @@ public GogsApi buildGogsClient() { } @Override - protected void retrieve(SCMHeadObserver observer, final TaskListener listener) throws IOException, - InterruptedException { - + protected void retrieve(SCMSourceCriteria criteria, @NonNull SCMHeadObserver observer, SCMHeadEvent event, @NonNull TaskListener listener) throws IOException, InterruptedException { StandardUsernamePasswordCredentials scanCredentials = getScanCredentials(); if (scanCredentials == null) { listener.getLogger().format("Connecting to %s with no credentials, anonymous access%n", gogsServerUrl == null ? "https://gogs.org" : gogsServerUrl);