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

Revert "Merge branch 'master' of github.com:jenkinsci/datadog-plugin" #403

Merged
merged 1 commit into from
Mar 19, 2024
Merged

Revert "Merge branch 'master' of github.com:jenkinsci/datadog-plugin" #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
def comonVersion = "2.356"
def recentLTS = "2.346.1"
def configurations = [
[ platform: "linux", jdk: "11", jenkins: null ],
[ platform: "linux", jdk: "8", jenkins: null ],
// windows
[ platform: "windows", jdk: "11", jenkins: comonVersion ],
[ platform: "windows", jdk: "8", jenkins: comonVersion ],
// java 11
[ platform: "linux", jdk: "11", jenkins: comonVersion ],
// windows
[ platform: "windows", jdk: "11", jenkins: recentLTS ],
[ platform: "windows", jdk: "8", jenkins: recentLTS ],
// java 11
[ platform: "linux", jdk: "11", jenkins: recentLTS ],
]
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.78</version> <!-- or whatever the newest version available is -->
<version>4.42</version> <!-- or whatever the newest version available is -->
<!--Check https://mvnrepository.com/artifact/org.jenkins-ci.plugins/plugin?repo=jenkins-releases-->
<relativePath />
</parent>
Expand All @@ -19,7 +19,7 @@
<packaging>hpi</packaging>

<properties>
<jenkins.version>2.361.4</jenkins.version>
<jenkins.version>2.346.1</jenkins.version>
<hpi.compatibleSinceVersion>1.0.0</hpi.compatibleSinceVersion>
<dd-trace-java.version>0.71.0</dd-trace-java.version>
<!-- byte-buddy is needed until we bump to java 11: https://stackoverflow.com/questions/69929229/mockito-shipped-within-spring-boot-fails-to-attach-to-jvm-openjdk-11/72912290#72912290 -->
Expand Down Expand Up @@ -68,8 +68,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.361.x</artifactId>
<version>1750.v0071fa_4c4a_e3</version>
<artifactId>bom-2.346.x</artifactId>
<version>1478.v81d3dc4f9a_43</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
Loading