Skip to content
Permalink
Browse files
Forgot to include AuthorizationMatrixProperty/config.jelly here.
Also requiring icon-shim 2.0.3 to force the user to pick up jenkinsci/icon-shim-plugin#2 and avoid JENKINS-33095.
  • Loading branch information
jglick committed Feb 25, 2016
1 parent 610963e commit 4e43378df03b0843cba30eb86add712151ba69f3
Showing with 35 additions and 1 deletion.
  1. +6 −1 pom.xml
  2. +29 −0 ...resources/com/cloudbees/hudson/plugins/folder/properties/AuthorizationMatrixProperty/config.jelly
@@ -30,9 +30,14 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>cloudbees-folder</artifactId>
<version>5.2</version>
<version>5.2.2</version>
<optional>true</optional>
</dependency>
<dependency> <!-- TODO JENKINS-33095 workaround -->
<groupId>org.jenkins-ci.plugins.icon-shim</groupId>
<artifactId>icon-shim</artifactId>
<version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
@@ -0,0 +1,29 @@
<!--
The MIT License
Copyright 2013 CloudBees.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:optionalBlock name="useProjectSecurity" title="${%Enable project-based security}" checked="${instance!=null}">
<st:include page="/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly" />
</f:optionalBlock>
</j:jelly>

0 comments on commit 4e43378

Please sign in to comment.