Merge pull request jenkinsci#239 from jglick/xstream

KostyaSha · web-flow · commit e75ef03f4a99 · 2020-10-15T22:18:31.000+03:00
Avoid com.thoughtworks.xstream.annotations
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.2</version>
+  </extension>
+</extensions>
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals
diff --git a/pom.xml b/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.2</version>
+        <version>4.10</version>
         <relativePath />
     </parent>
 
     <groupId>com.coravy.hudson.plugins.github</groupId>
     <artifactId>github</artifactId>
-    <version>	1.32.0-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
     <packaging>hpi</packaging>
 
     <name>GitHub plugin</name>
@@ -36,17 +36,20 @@
     </developers>
 
     <scm>
-        <connection>scm:git:git://github.com/jenkinsci/github-plugin.git</connection>
-        <developerConnection>scm:git:git@github.com:jenkinsci/github-plugin.git</developerConnection>
-        <url>https://github.com/jenkinsci/github-plugin</url>
-        <tag>HEAD</tag>
+        <connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
+        <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
+        <url>https://github.com/${gitHubRepo}</url>
+        <tag>${scmTag}</tag>
     </scm>
     <issueManagement>
         <system>JIRA</system>
         <url>https://issues.jenkins-ci.org/browse/JENKINS/component/15896</url>
     </issueManagement>
 
     <properties>
+        <revision>1.32.0</revision>
+        <changelist>-SNAPSHOT</changelist>
+        <gitHubRepo>jenkinsci/github-plugin</gitHubRepo>
         <jenkins.version>2.164.3</jenkins.version>
         <release.skipTests>false</release.skipTests>
         <maven.javadoc.skip>true</maven.javadoc.skip>
diff --git a/src/main/java/org/jenkinsci/plugins/github/config/GitHubPluginConfig.java b/src/main/java/org/jenkinsci/plugins/github/config/GitHubPluginConfig.java
@@ -82,6 +82,7 @@ public class GitHubPluginConfig extends GlobalConfiguration {
     private transient InstanceIdentity identity;
 
     public GitHubPluginConfig() {
+        getConfigFile().getXStream().alias("github-server-config", GitHubServerConfig.class);
         load();
     }
 
diff --git a/src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java b/src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java
@@ -7,7 +7,6 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.Util;
@@ -59,7 +58,6 @@
  * @author lanwen (Merkushev Kirill)
  * @since 1.13.0
  */
-@XStreamAlias("github-server-config")
 public class GitHubServerConfig extends AbstractDescribableImpl<GitHubServerConfig> {
     private static final Logger LOGGER = LoggerFactory.getLogger(GitHubServerConfig.class);
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-Pconsume-incrementals`
	`2`	`+-Pmight-produce-incrementals`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public class GitHubPluginConfig extends GlobalConfiguration {`
`82`	`82`	`private transient InstanceIdentity identity;`
`83`	`83`
`84`	`84`	`public GitHubPluginConfig() {`
	`85`	`+ getConfigFile().getXStream().alias("github-server-config", GitHubServerConfig.class);`
`85`	`86`	`load();`
`86`	`87`	`}`
`87`	`88`