[ethomson#45] Bump libgit2 version to v0.28.2, and support jdk upto 11

shijinglu · Aug 14, 2019 · d7235bb · d7235bb
1 parent 62f4ddb
commit d7235bb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.idea/
 .classpath
 .project
 .settings/

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: java
 
 jdk:
- - oraclejdk7
+ - oraclejdk8
 
 script: scripts/build.sh
 

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,11 @@
     <name>org.libgit2.jagged</name>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <jdk.version>1.8</jdk.version>
+      <maven.compiler.source>${jdk.version}</maven.compiler.source>
+      <maven.compiler.target>${jdk.version}</maven.compiler.target>
+
     </properties>
 
     <dependencies>
@@ -26,36 +30,29 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>3.7.0</version>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                  <source>${jdk.version}</source>
                 </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <archive>
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                </configuration>
+                <version>3.1.0</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.15</version>
+                <version>3.0.0-M3</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>3.1.1</version>
                 <configuration>
-                    <aggregate>true</aggregate>
                     <show>public</show>
                     <nohelp>true</nohelp>
                     <header>Jagged ${project.version}</header>

diff --git a/src/main/native/libgit2 b/src/main/native/libgit2
diff --git a/src/test/java/org/libgit2/jagged/VersionTest.java b/src/test/java/org/libgit2/jagged/VersionTest.java
@@ -22,7 +22,7 @@ public void testGetLibGit2Version()
         Version libGit2Version = Version.getLibGit2Version();
 
         Assert.assertEquals(0, libGit2Version.getMajor());
-        Assert.assertEquals(25, libGit2Version.getMinor());
-        Assert.assertEquals(1, libGit2Version.getRevision());
+        Assert.assertEquals(28, libGit2Version.getMinor());
+        Assert.assertEquals(2, libGit2Version.getRevision());
     }
 }