Merge pull request #19 from blubin/develop

Develop -> Master
blubin · May 29, 2020 · ebe63de · ebe63de
2 parents 00d4b6f + 640db5f
commit ebe63de
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>edu.harvard.eecs</groupId>
     <artifactId>jopt</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <packaging>jar</packaging>
 
     <name>Java Optimization</name>
@@ -110,7 +110,7 @@
         <connection>scm:git:git://github.com/blubin/JOpt.git</connection>
         <developerConnection>scm:git:git@github.com/blubin/JOpt.git</developerConnection>
         <url>https://github.com/blubin/JOpt.git/tree/master/</url>
-        <tag>v1.3.4</tag>
+        <tag>v1.3.5</tag>
     </scm>
 
     <dependencies>
@@ -137,7 +137,7 @@
         <dependency>
             <groupId>cplex</groupId>
             <artifactId>cplex</artifactId>
-            <version>12.9</version>
+            <version>12.10</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
@@ -189,6 +189,9 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <version>3.0.0-M1</version>
+                        <configuration>
+                            <source>1.8</source>
+                        </configuration>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>