Skip to content

chore: bump Jenkins Core to 2.401.3 #779

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

Closed
kuisathaverat wants to merge 3 commits into from
Closed

chore: bump Jenkins Core to 2.401.3 #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
422149f
chore: bump Jenkins Core to 2.401.3
kuisathaverat Dec 19, 2023
056ffea
fix: update okhttp references
kuisathaverat Dec 19, 2023
56da90e
Merge branch 'master' into chore/bump_core_1
kuisathaverat Dec 20, 2023
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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<properties>
<revision>2.19.1</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.387.3</jenkins.version>
<jenkins.version>2.401.3</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<opentelemetry.version>1.33.0</opentelemetry.version>
<!--
Expand All @@ -44,8 +44,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.387.x</artifactId>
<version>2102.v854b_fec19c92</version>
<artifactId>bom-2.401.x</artifactId>
<version>2661.vb_b_60650f6d97</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
9 changes: 5 additions & 4 deletions src/test/java/io/jenkins/plugins/opentelemetry/remotespan/RemoteSpanDisabledTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package io.jenkins.plugins.opentelemetry.remotespan;

import com.github.rutledgepaulv.prune.Tree;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.RequestBody;
import hudson.ExtensionList;
import hudson.model.FreeStyleProject;
import hudson.model.Result;
Expand All @@ -16,6 +13,10 @@
import io.jenkins.plugins.opentelemetry.OpenTelemetrySdkProvider;
import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
import jenkins.model.GlobalConfiguration;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;

import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.junit.Test;
Expand Down Expand Up @@ -60,7 +61,7 @@ public void testRemoteSpanDisabledByDefault() throws Exception {

//We trigger the build by Jenkins remote api
OkHttpClient client = new OkHttpClient();
RequestBody reqbody = RequestBody.create(null, new byte[0]);
RequestBody reqbody = RequestBody.create(new byte[0]);
String traceParentHeader = "00-" + PARENT_TRACE_ID + "-" + PARENT_SPAN_ID + "-01";

Request request = new Request.Builder()
Expand Down
9 changes: 5 additions & 4 deletions src/test/java/io/jenkins/plugins/opentelemetry/remotespan/RemoteSpanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package io.jenkins.plugins.opentelemetry.remotespan;

import com.github.rutledgepaulv.prune.Tree;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.RequestBody;
import hudson.ExtensionList;
import hudson.model.FreeStyleProject;
import hudson.model.Result;
Expand All @@ -16,6 +13,10 @@
import io.jenkins.plugins.opentelemetry.OpenTelemetrySdkProvider;
import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
import jenkins.model.GlobalConfiguration;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;

import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.junit.Before;
Expand Down Expand Up @@ -77,7 +78,7 @@ public void testRemoteTriggerParentChildTrace() throws Exception {

//We trigger the build by Jenkins remote api
OkHttpClient client = new OkHttpClient();
RequestBody reqbody = RequestBody.create(null, new byte[0]);
RequestBody reqbody = RequestBody.create(new byte[0]);
String traceParentHeader = "00-" + PARENT_TRACE_ID + "-" + PARENT_SPAN_ID + "-01";

Request request = new Request.Builder()
Expand Down