Merge pull request #4 from key-consulting/master

[JENKINS-17058] add readResolve on BapSshHostConfiguration, fix dep
jenkinsci · Dec 16, 2013 · dbc15b7 · dbc15b7
2 parents c591bae + 8667211
commit dbc15b7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>publish-over</artifactId>
-            <version>0.18-SNAPSHOT</version>
+            <version>0.17</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/src/main/java/jenkins/plugins/publish_over_ssh/BapSshHostConfiguration.java b/src/main/java/jenkins/plugins/publish_over_ssh/BapSshHostConfiguration.java
@@ -291,4 +291,9 @@ public String toString() {
         return addToToString(new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)).toString();
     }
 
+    public Object readResolve()
+    {
+        return super.readResolve();
+    }
+
 }
diff --git a/src/main/java/jenkins/plugins/publish_over_ssh/BapSshPublisherPlugin.java b/src/main/java/jenkins/plugins/publish_over_ssh/BapSshPublisherPlugin.java
@@ -78,7 +78,13 @@ public BapSshHostConfiguration getConfiguration(final String name) {
     }
 
     @Extension
-    public static class Descriptor extends BapSshPublisherPluginDescriptor { }
+    public static class Descriptor extends BapSshPublisherPluginDescriptor {
+        @Override
+        public Object readResolve()
+        {
+            return super.readResolve();
+        }
+    }
 
     /** prevent xstream noise */
     @Deprecated