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

Jump to bottom

JENKINS-64502 Fix plugin on Jenkins >=2.264 #159

Merged
merged 1 commit into from
Dec 23, 2020
Merged

JENKINS-64502 Fix plugin on Jenkins >=2.264 #159

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: 2 additions & 4 deletions pom.xml
View file
Open in desktop
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.7</version>
<version>4.15</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -117,7 +117,6 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-auth</artifactId>
<version>2.6.4</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -144,7 +143,6 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>token-macro</artifactId>
<version>2.12</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -154,7 +152,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.263.x</artifactId>
<version>19</version>
<version>20</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/hudson/plugins/parameterizedtrigger/BooleanParameters/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<f:entry title="" field="configs">
<f:repeatable field="configs" noAddButton="true" minimum="1">
<j:set var="instance" value="${instance.descriptor!=descriptor?null:instance}"/><!-- work around until 1.382 -->
<table width="100%">
<div>
<st:include class="${descriptor.clazz}" page="config.jelly" />
<f:entry>
<div align="right">
<input type="button" value="${%Add parameter...}" class="repeatable-add show-if-last" />
<input type="button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
</div>
</f:entry>
</table>
</div>
</f:repeatable>
</f:entry>
</j:jelly>
4 changes: 2 additions & 2 deletions src/main/resources/hudson/plugins/parameterizedtrigger/BuildTrigger/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<f:repeatable field="configs" noAddButton="true" minimum="1">
<j:set var="instance" value="${instance.descriptor!=descriptor?null:instance}"/><!-- work around until 1.382 -->
<j:set var="configFor" value="publisher" /> <!-- used for views of AbstractBuildParameters to determine called for builder or publisher -->
<table width="100%">
<div>
<st:include class="${descriptor.clazz}" page="config.jelly" />

<f:entry>
Expand All @@ -13,7 +13,7 @@
<input type="button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
</div>
</f:entry>
</table>
</div>
</f:repeatable>
</f:entry>
</j:jelly>
4 changes: 2 additions & 2 deletions src/main/resources/hudson/plugins/parameterizedtrigger/TriggerBuilder/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<f:repeatable field="configs" noAddButton="true" minimum="1">
<j:set var="instance" value="${instance.descriptor!=descriptor?null:instance}"/><!-- work around until 1.382 -->
<j:set var="configFor" value="builder" /> <!-- used for views of AbstractBuildParameters to determine called for builder or publisher -->
<table width="100%">
<div>
<st:include class="${descriptor.clazz}" page="config.jelly" />

<f:entry>
Expand All @@ -13,7 +13,7 @@
<input type="button" value="${%Delete}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
</div>
</f:entry>
</table>
</div>
</f:repeatable>
</f:entry>
</j:jelly>