Skip to content

Commit

Permalink
Merge branch 'master' into dedicated-cloud-rename-page
Browse files Browse the repository at this point in the history
  • Loading branch information
car-roll committed Nov 17, 2023
2 parents e84b15c + f3d9802 commit 33e6941
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 65 deletions.
8 changes: 6 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
labels:
- "dependencies"
schedule:
interval: "weekly"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/"
labels:
- "skip-changelog"
schedule:
interval: "weekly"
interval: "monthly"
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.73</version>
<version>4.75</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -70,15 +70,15 @@
<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Low</spotbugs.threshold>
<spotless.check.skip>false</spotless.check.skip>
<junixsocket.version>2.7.0</junixsocket.version>
<junixsocket.version>2.8.2</junixsocket.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.414.x</artifactId>
<version>2401.v7a_d68f8d0b_09</version>
<version>2543.vfb_1a_5fb_9496d</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<blockquote>
<tt>sh</tt><br/>
<tt>-c</tt><br/>
<tt>wget $${JENKINS_URL}jnlpJars/agent.jar &amp;&amp; java -jar agent.jar -jnlpUrl $${JENKINS_URL}computer/$${NODE_NAME}/slave-agent.jnlp -secret $${JNLP_SECRET}</tt><br/>
<tt>wget $${JENKINS_URL}jnlpJars/agent.jar &amp;&amp; java -jar agent.jar -url $${JENKINS_URL} -secret $${JNLP_SECRET} -name $${NODE_NAME}</tt><br/>
</blockquote>
</p>
<p>
Expand Down

0 comments on commit 33e6941

Please sign in to comment.