Skip to content

Commit

Permalink
Merge pull request #90 from openshift/master
Browse files Browse the repository at this point in the history 
Sync updates from openshift/jenkins-sync-plugin
  • Loading branch information
@coreydaley
coreydaley authored Jul 7, 2023
2 parents 2051fca + b4b95d5 commit 5c2f38d
Show file tree
Hide file tree
Showing 554 changed files with 36,413 additions and 18,172 deletions.
43 changes: 22 additions & 21 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,55 +3,56 @@ module github.com/openshift/jenkins-sync-plugin
go 1.19

require (
github.com/openshift/api v0.0.0-20230201213816-61d971884921
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084
k8s.io/api v0.26.1
k8s.io/apimachinery v0.26.1
k8s.io/client-go v0.26.1
github.com/openshift/api v0.0.0-20230705144233-e28cd4dd28a8
github.com/openshift/client-go v0.0.0-20230705133330-7f808ad59404
k8s.io/api v0.27.3
k8s.io/apimachinery v0.27.3
k8s.io/client-go v1.5.2
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.26.1
k8s.io/apimachinery => k8s.io/apimachinery v0.26.1
k8s.io/client-go => k8s.io/client-go v0.26.1
k8s.io/api => k8s.io/api v0.27.3
k8s.io/apimachinery => k8s.io/apimachinery v0.27.3
k8s.io/client-go => k8s.io/client-go v0.27.3

)
101 changes: 54 additions & 47 deletions go.sum
View file

Large diffs are not rendered by default.

43 changes: 24 additions & 19 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.61</version>
<version>4.69</version>
<relativePath />
</parent>
<groupId>io.fabric8.jenkins.plugins</groupId>
Expand All @@ -22,7 +22,7 @@
<properties>
<revision>1.1.0</revision>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.387.2</jenkins.version>
<jenkins.version>2.401.1</jenkins.version>
<log.level>INFO</log.level>
</properties>

Expand Down Expand Up @@ -85,14 +85,13 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
<version>746.v05814d19c001</version>
<version>756.v891d88f2cd46</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>1244.ve463715a_f89c</version>
<version>1251.vfe552ed55f8d</version>
</dependency>
<!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
Expand All @@ -101,22 +100,22 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>5.0.0</version>
<version>5.1.0</version>
</dependency>
<dependency>
<groupId>io.jenkins.blueocean</groupId>
<artifactId>blueocean-rest</artifactId>
<version>1.27.3</version>
<version>1.27.4</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.pipeline-stage-view</groupId>
<artifactId>pipeline-rest-api</artifactId>
<version>2.32</version>
<version>2.33</version>
</dependency>
<dependency>
<groupId>org.csanchez.jenkins.plugins</groupId>
<artifactId>kubernetes</artifactId>
<version>3923.v294a_d4250b_91</version>
<version>3937.vd7b_82db_e347b_</version>
</dependency>
</dependencies>

Expand All @@ -125,8 +124,8 @@
<!-- https://mvnrepository.com/artifact/io.jenkins.tools.bom/bom-2.303.x -->
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.303.x</artifactId>
<version>1505.vcc5b_40a_15e40</version>
<artifactId>bom-2.401.x</artifactId>
<version>2220.vea_cea_f1a_35e4</version>
<type>pom</type>
</dependency>
<!-- https://mvnrepository.com/artifact/io.jenkins.plugins/snakeyaml-api -->
Expand All @@ -139,7 +138,13 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>1289.vd1c337fd5354</version>
<version>1316.vd2290d3341a_f</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.jenkins.plugins/ionicons-api -->
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>ionicons-api</artifactId>
<version>56.v1b_1c8c49374e</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -149,7 +154,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.7</version>
<version>2.16.0</version>
<configuration>
<excludes>
<exclude>org.apache.commons:commons-collections4</exclude>
Expand All @@ -159,7 +164,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.7.2.1</version>
<version>4.7.3.5</version>
<dependencies>
<!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
<dependency>
Expand All @@ -172,7 +177,7 @@
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>3.43</version>
<version>3.47</version>
<configuration>
<pluginFirstClassLoader>true</pluginFirstClassLoader>
<loggers>
Expand All @@ -187,7 +192,7 @@
<plugin>
<groupId>org.jvnet.localizer</groupId>
<artifactId>maven-localizer-plugin</artifactId>
<version>1.12</version>
<version>1.26</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand All @@ -205,7 +210,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.11</version>
<version>4.2</version>
<configuration>
<aggregate>true</aggregate>
<header>header.txt</header>
Expand Down Expand Up @@ -237,7 +242,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down Expand Up @@ -286,7 +291,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down
3 changes: 0 additions & 3 deletions vendor/github.com/go-logr/logr/.golangci.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 1 addition & 31 deletions vendor/github.com/go-logr/logr/discard.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5c2f38d

Please sign in to comment.