Ownership 1.0: Update dependencies and require Jenkins 2.60.3

pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.5</version>
+        <version>3.18</version>
     </parent>
 
     <groupId>com.synopsys.jenkinsci</groupId>
@@ -23,11 +23,11 @@
     </licenses>	
 
     <properties>
-        <jenkins.version>1.651.3</jenkins.version>
-        <java.level>7</java.level>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <workflow.version>1.14</workflow.version>
+        <jenkins.version>2.60.3</jenkins.version>
+        <java.level>8</java.level>
         <findbugs.effort>Max</findbugs.effort>
+        <!-- Uses restricted Security Inspector API -->
+        <useBeta>true</useBeta>
     </properties>
 
     <developers>
@@ -64,13 +64,13 @@
         <dependency>
             <groupId>com.synopsys.arc.jenkinsci.plugins</groupId>
             <artifactId>job-restrictions</artifactId>
-            <version>0.1</version>
+            <version>0.8</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>script-security</artifactId>
-            <version>1.20</version>
+            <version>1.42</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -88,24 +88,24 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>security-inspector</artifactId>
-            <version>0.4</version>
+            <version>0.5-20181007.200044-1</version>
             <optional>true</optional>
         </dependency>
         <!--Plugins decoupled from the core. Would be great to make these deps optional.-->
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>matrix-project</artifactId>
-            <version>1.6</version>
+            <version>1.13</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>matrix-auth</artifactId>
-            <version>1.7</version>
+            <version>2.2</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>mailer</artifactId>
-            <version>1.13</version>
+            <version>1.18</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -115,27 +115,27 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-cps</artifactId>
-            <version>${workflow.version}</version>
+            <version>2.53</version>
         </dependency>
 
         <!-- Test framework -->
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-step-api</artifactId>
-            <version>${workflow.version}</version>
+            <version>2.15</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-job</artifactId>
-            <version>${workflow.version}</version>
+            <version>2.21</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-basic-steps</artifactId>
-            <version>${workflow.version}</version>
+            <version>2.7</version>
             <scope>test</scope>
         </dependency>
         <dependency> <!--Implicitly required by folders-->
@@ -144,6 +144,12 @@
             <version>2.1.13</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.jenkins</groupId>
+            <artifactId>configuration-as-code</artifactId>
+            <version>1.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <repositories> 

src/main/java/com/synopsys/arc/jenkins/plugins/ownership/OwnershipPluginConfiguration.java

@@ -25,6 +25,7 @@
 package com.synopsys.arc.jenkins.plugins.ownership;
 
 import com.synopsys.arc.jenkins.plugins.ownership.extensions.ItemOwnershipPolicy;
+import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.ownership.util.mail.MailOptions;
 import hudson.Extension;
 import hudson.model.Describable;
@@ -59,14 +60,14 @@ public class OwnershipPluginConfiguration
 
     @Deprecated
     public OwnershipPluginConfiguration(@Nonnull ItemOwnershipPolicy itemOwnershipPolicy, 
-            @Nonnull MailOptions mailOptions, EnvSetupOptions globalEnvSetupOptions, 
+            @CheckForNull MailOptions mailOptions, EnvSetupOptions globalEnvSetupOptions,
             @Nonnull DisplayOptions displayOptions) {
         this(itemOwnershipPolicy, mailOptions, globalEnvSetupOptions, displayOptions, InheritanceOptions.DEFAULT);
     }
 
     @DataBoundConstructor
     public OwnershipPluginConfiguration(@Nonnull ItemOwnershipPolicy itemOwnershipPolicy, 
-            @Nonnull MailOptions mailOptions, EnvSetupOptions globalEnvSetupOptions, 
+            @CheckForNull MailOptions mailOptions, EnvSetupOptions globalEnvSetupOptions,
             @Nonnull DisplayOptions displayOptions, @Nonnull InheritanceOptions inheritanceOptions) {
         this.itemOwnershipPolicy = itemOwnershipPolicy;
         this.mailOptions = mailOptions;
@@ -123,7 +124,8 @@ public Descriptor<OwnershipPluginConfiguration> getDescriptor() {
 
     @Extension
     public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
-
+
+    @Symbol("ownershipConfig")
     public static class DescriptorImpl extends Descriptor<OwnershipPluginConfiguration> {
 
         @Override

src/main/java/com/synopsys/arc/jenkins/plugins/ownership/jobs/JobOwnerJobProperty.java

@@ -35,6 +35,7 @@
 import com.synopsys.arc.jenkins.plugins.ownership.util.userFilters.IUserFilter;
 import net.sf.json.JSONObject;
 
+import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
 
@@ -140,6 +141,7 @@ public JobProperty<?> reconfigure(StaplerRequest req, JSONObject form) throws De
     }   
 
     @Extension
+    @Symbol("ownership")
     public static class DescriptorImpl extends JobPropertyDescriptor {
         @Override
         public String getDisplayName() {

src/main/java/com/synopsys/arc/jenkins/plugins/ownership/nodes/OwnerNodeProperty.java

@@ -40,8 +40,11 @@
 import java.lang.reflect.Method;
 import java.util.List;
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
+import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.Ancestor;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
@@ -54,15 +57,17 @@
 public class OwnerNodeProperty extends NodeProperty<Node> 
     implements IOwnershipItem<NodeProperty> {
 
+    @Nonnull
     private OwnershipDescription ownership;
+    @CheckForNull
     private String nodeName; 
 
     @DataBoundConstructor
-    public OwnerNodeProperty(NodeOwnerWrapper slaveOwnership) {
-        this(null, (slaveOwnership != null) ? slaveOwnership.getDescription() : null);
+    public OwnerNodeProperty(@CheckForNull NodeOwnerWrapper nodeOwnership) {
+        this(null, (nodeOwnership != null) ? nodeOwnership.getDescription() : null);
     }
 
-    public OwnerNodeProperty(Node node, OwnershipDescription ownership) {
+    public OwnerNodeProperty(@CheckForNull Node node, @CheckForNull OwnershipDescription ownership) {
          setNode(node);
          //FIXME: remove hack with owner
          this.nodeName = (node != null) ? node.getNodeName() : null;
@@ -112,7 +117,8 @@ public OwnershipLayoutFormatter<Node> getLayoutFormatter() {
     }  
 
     @Extension
-    public static class DescriptorImpl extends NodePropertyDescriptor {       
+    @Symbol("ownership")
+    public static class DescriptorImpl extends NodePropertyDescriptor {
         /**
          * Gets Node, which is being configured by StaplerRequest
          * @remarks Workaround for

src/main/java/com/synopsys/arc/jenkins/plugins/ownership/security/authorizeproject/OwnershipAuthorizeProjectStrategy.java

@@ -34,6 +34,7 @@
 import jenkins.model.Jenkins;
 import org.acegisecurity.Authentication;
 import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.authorizeproject.AuthorizeProjectStrategy;
 import org.jenkinsci.plugins.authorizeproject.AuthorizeProjectStrategyDescriptor;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -69,6 +70,7 @@ public Authentication authenticate(Job<?, ?> job, Queue.Item item) {
     }
 
     @Extension(optional = true)
+    @Symbol("ownershipBased")
     public static class DescriptorImpl extends AuthorizeProjectStrategyDescriptor {
 
         @Override

src/main/java/com/synopsys/arc/jenkins/plugins/ownership/security/itemspecific/ItemSpecificSecurity.java

@@ -36,6 +36,7 @@
 import javax.annotation.Nonnull;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
+import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
 
@@ -82,6 +83,7 @@ public ItemSpecificSecurity clone() {
     public static final ItemSpecificDescriptor DESCRIPTOR = new ItemSpecificDescriptor();
 
     @Extension
+    @Symbol("itemSpecific")
     public static class ItemSpecificDescriptor extends Descriptor<ItemSpecificSecurity> {
         @Override
         public String getDisplayName() {

src/main/java/com/synopsys/arc/jenkins/plugins/ownership/security/jobrestrictions/OwnersListJobRestriction.java

@@ -38,6 +38,8 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
+
+import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
@@ -50,6 +52,7 @@
 public class OwnersListJobRestriction extends JobRestriction {
 
     private static final JobOwnerHelper helper = new JobOwnerHelper();
+
     private final List<UserSelector> usersList;
     private final boolean acceptsCoOwners;
     transient private Set<String> usersMap = null;
@@ -142,6 +145,7 @@ private boolean canTake(OwnershipDescription descr) {
 
 
     @Extension(optional = true)
+    @Symbol("ownership")
     public static class DescriptorImpl extends JobRestrictionDescriptor {
         @Override
         public String getDisplayName() {

src/main/java/com/synopsys/arc/jenkins/plugins/ownership/util/ui/UserSelector.java

@@ -32,6 +32,7 @@
 import java.io.Serializable;
 import javax.annotation.CheckForNull;
 
+import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -81,6 +82,8 @@ public int hashCode() {
 
     @Extension
     public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
+
+    @Symbol("user")
     public static class DescriptorImpl extends Descriptor<UserSelector> {
 
         @Override

src/main/java/com/synopsys/arc/jenkins/plugins/ownership/wrappers/OwnershipBuildWrapper.java

@@ -34,6 +34,8 @@
 import hudson.tasks.BuildWrapperDescriptor;
 import java.io.IOException;
 import javax.annotation.Nonnull;
+
+import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.ownership.util.environment.EnvSetupOptions;
 import org.kohsuke.stapler.DataBoundConstructor;
 
@@ -90,6 +92,7 @@ public boolean isInjectNodeOwnership() {
     @Extension
     public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
 
+    @Symbol("injectOwnershipEnvVars")
     public static final class DescriptorImpl extends BuildWrapperDescriptor {
 
         public DescriptorImpl() {

src/main/java/com/synopsys/arc/jenkins/plugins/ownership/wrappers/OwnershipTokenMacro.java

@@ -32,6 +32,8 @@
 import hudson.model.Node;
 import hudson.model.TaskListener;
 import java.io.IOException;
+
+import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.tokenmacro.DataBoundTokenMacro;
 import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException;
 
@@ -44,6 +46,7 @@
  * @since 0.4
  */
 @Extension(optional = true)
+@Symbol("ownership")
 public class OwnershipTokenMacro extends DataBoundTokenMacro {
     public static final String MACRO_NAME="OWNERSHIP";
 

src/main/java/org/jenkinsci/plugins/ownership/config/DisplayOptions.java

@@ -30,6 +30,7 @@
 import hudson.model.Describable;
 import hudson.model.Descriptor;
 
+import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.ownership.model.runs.RunOwnershipAction;
 import org.kohsuke.stapler.DataBoundConstructor;
 
@@ -75,7 +76,8 @@ public boolean isHideOwnershipIfNoData() {
     public DescriptorImpl getDescriptor() {
         return DESCRIPTOR;
     }
-
+
+    @Symbol("ownershipVisualization")
     public static class DescriptorImpl extends Descriptor<DisplayOptions> {
 
         @Override

src/main/java/org/jenkinsci/plugins/ownership/config/InheritanceOptions.java

@@ -31,6 +31,7 @@
 import hudson.model.Describable;
 import hudson.model.Descriptor;
 import hudson.model.ItemGroup;
+import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.ownership.model.folders.FolderOwnershipHelper;
 import org.kohsuke.stapler.DataBoundConstructor;
 
@@ -70,7 +71,8 @@ public boolean isBlockInheritanceFromItemGroups() {
     public DescriptorImpl getDescriptor() {
         return DESCRIPTOR;
     }
-
+
+    @Symbol("ownershipInheritance")
     public static class DescriptorImpl extends Descriptor<InheritanceOptions> {
 
         @Override

src/main/java/org/jenkinsci/plugins/ownership/config/PreserveOwnershipPolicy.java

@@ -7,6 +7,7 @@
 import com.synopsys.arc.jenkins.plugins.ownership.util.AbstractOwnershipHelper;
 import hudson.Extension;
 import hudson.model.Item;
+import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.ownership.model.OwnershipHelperLocator;
 import org.kohsuke.stapler.DataBoundConstructor;
 
@@ -33,6 +34,7 @@ public OwnershipDescription onCreated(@Nonnull Item item) {
     }
 
     @Extension
+    @Symbol("preserveOwnership")
     public static class DescriptorImpl extends ItemOwnershipPolicyDescriptor {
         @Override
         public String getDisplayName() {

src/main/java/org/jenkinsci/plugins/ownership/integrations/securityinspector/PermissionsForOwnerReportBuilder.java

@@ -44,7 +44,6 @@
 import org.acegisecurity.context.SecurityContext;
 import org.acegisecurity.context.SecurityContextHolder;
 import org.acegisecurity.userdetails.UsernameNotFoundException;
-import org.jenkinsci.plugins.securityinspector.Messages;
 import static org.jenkinsci.plugins.securityinspector.SecurityInspectorAction.getSessionId;
 import org.jenkinsci.plugins.securityinspector.UserContext;
 import org.jenkinsci.plugins.securityinspector.UserContextCache;

src/main/java/org/jenkinsci/plugins/ownership/model/folders/FolderOwnershipProperty.java

@@ -35,6 +35,7 @@
 import java.io.IOException;
 import javax.annotation.CheckForNull;
 import net.sf.json.JSONObject;
+import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.StaplerRequest;
 
 /**
@@ -85,6 +86,7 @@ public AbstractFolderProperty<?> reconfigure(StaplerRequest req, JSONObject form
     }
 
     @Extension(optional = true)
+    @Symbol("ownership")
     public static class DescriptorImpl extends AbstractFolderPropertyDescriptor {
 
         @Override

src/main/resources/org/jenkinsci/plugins/ownership/integrations/securityinspector/Messages.properties

@@ -0,0 +1 @@
+JobReport.RowColumnHeader=Items