feat: enable incrementals (#51)

* feat: enable incrementals * feat: enable incrementals * feat: enable incrementals * Update .mvn/extensions.xml * feat: enable incrementals * feat: enable incrementals * test: disable SFTPClientTest * test: disable SFTPClientTest * test: disable RoundtripTest * test: enable tests again
jenkinsci · Oct 4, 2020 · 9423fcb · 9423fcb
1 parent 350a4da
commit 9423fcb
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 29 deletions.
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/Jenkinsfile b/Jenkinsfile
@@ -18,11 +18,14 @@ pipeline {
                             "-Dmaven.repo.local=$m2repo",
                             '-Dmaven.test.failure.ignore',
                             "-Dfindbugs.failOnError=false",
+                            "-Dset.changelist",
                             "clean install",
                             "findbugs:findbugs"
                     ]
 
                     infra.runMaven(mavenOptions, jdk)
+                    infra.prepareToPublishIncrementals()
+                    infra.maybePublishIncrementals()
                 }
              }
              post {
@@ -37,4 +40,4 @@ pipeline {
              }
         }
     }
-}
+}
diff --git a/pom.xml b/pom.xml
@@ -2,17 +2,24 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+      <groupId>org.jenkins-ci</groupId>
+      <artifactId>jenkins</artifactId>
+      <version>1.57</version>
+      <relativePath />
+  </parent>
+
   <groupId>org.jenkins-ci</groupId>
   <artifactId>trilead-ssh2</artifactId>
-  <version>build-217-jenkins-25-SNAPSHOT</version>
+  <version>${revision}${changelist}</version>
 
   <name>Ganymed SSH2 for Java</name>
   <description>Ganymed SSH2 for Java is a library which implements the SSH-2 protocol in pure Java</description>
   <url>http://svn.svnkit.com/repos/3rdparty/com.trilead.ssh2/tags/1.0.0-build217/trilead-ssh2/</url>
   <licenses>
     <license>
       <name>BSD style license</name>
-      <url>http://www.ganymed.ethz.ch/ssh2/LICENSE.txt</url>        
+      <url>http://www.ganymed.ethz.ch/ssh2/LICENSE.txt</url>
     </license>
   </licenses>
 
@@ -30,31 +37,13 @@
   </developers>
 
   <scm>
-    <connection>scm:git:git://github.com/jenkinsci/trilead-ssh2.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/jenkinsci/trilead-ssh2.git</developerConnection>
-    <url>https://github.com/jenkinsci/trilead-ssh2</url>
-    <tag>HEAD</tag>
+    <connection>scm:git:git://github.com/${githubRepo}.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/${githubRepo}.git</developerConnection>
+    <url>https://github.com/${githubRepo}</url>
+    <tag>${scmTag}</tag>
   </scm>
-  <distributionManagement>
-    <repository>
-      <id>maven.jenkins-ci.org</id>
-      <url>https://repo.jenkins-ci.org/releases/</url>
-    </repository>
-    <snapshotRepository>
-      <id>maven.jenkins-ci.org</id>
-      <url>https://repo.jenkins-ci.org/snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-  <repositories>
-    <repository>
-      <id>repo.jenkins-ci.org</id>
-      <url>https://repo.jenkins-ci.org/public/</url>
-    </repository>
-  </repositories>
 
   <dependencies>
-
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
@@ -101,15 +90,30 @@
     </testResources>
     <plugins>
       <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.5</version>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <executions>
+              <execution>
+                  <id>display-info</id>
+                  <configuration>
+                      <rules>
+                          <enforceBytecodeVersion>
+                              <excludes combine.children="append">
+                                  <exclude>org.connectbot.jbcrypt</exclude>
+                              </excludes>
+                          </enforceBytecodeVersion>
+                      </rules>
+                  </configuration>
+              </execution>
+          </executions>
       </plugin>
     </plugins>
   </build>
 
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <revision>build-217-jenkins-25</revision>
+    <changelist>-SNAPSHOT</changelist>
+    <gitHubRepo>jenkinsci/trilead-ssh2</gitHubRepo>
+    <java.level>8</java.level>
   </properties>
 
 </project>
diff --git a/test/com/trilead/ssh2/SFTPClientTest.java b/test/com/trilead/ssh2/SFTPClientTest.java
@@ -9,6 +9,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.junit.Ignore;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 

diff --git a/test/com/trilead/ssh2/channel/RoundtripTest.java b/test/com/trilead/ssh2/channel/RoundtripTest.java
@@ -17,6 +17,7 @@
 /**
  * @author Kohsuke Kawaguchi
  */
+
 public class RoundtripTest {
     @Rule
     public ConnectionRule con = new ConnectionRule();