Merge pull request #143 from maxmind/greg/3.1.0

Release 3.1.0

Author: ugexe

CHANGELOG.md

@@ -1,8 +1,9 @@
 CHANGELOG
 =========
 
-3.1.0
+3.1.0 (2023-12-05)
 ------------------
+
 * Reader supports iterating over the whole database or within a network.
 
 3.0.0 (2022-12-12)

README.md

@@ -16,7 +16,7 @@ To do this, add the dependency to your pom.xml:
     <dependency>
         <groupId>com.maxmind.db</groupId>
         <artifactId>maxmind-db</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
     </dependency>
 ```
 
@@ -29,7 +29,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile 'com.maxmind.db:maxmind-db:3.0.0'
+    compile 'com.maxmind.db:maxmind-db:3.1.0'
 }
 ```
 

dev-bin/release.sh

@@ -130,5 +130,3 @@ git push
 git push --tags
 
 gh release create --target "$(git branch --show-current)" -t "$version" -n "$notes" "$tag"
-
-echo "Remember to do the release on https://oss.sonatype.org/!"

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.maxmind.db</groupId>
     <artifactId>maxmind-db</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>MaxMind DB Reader</name>
     <description>Reader for MaxMind DB</description>
@@ -23,7 +23,8 @@
         <url>https://github.com/maxmind/MaxMind-DB-Reader-java</url>
         <connection>scm:git:git://github.com:maxmind/MaxMind-DB-Reader-java.git</connection>
         <developerConnection>scm:git:[email protected]:maxmind/MaxMind-DB-Reader-java.git</developerConnection>
-    </scm>
+      <tag>HEAD</tag>
+  </scm>
     <issueManagement>
         <url>https://github.com/maxmind/MaxMind-DB-Reader-java/issues</url>
         <system>GitHub</system>
@@ -121,7 +122,7 @@
                         <id>attach-sources</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>jar</goal>
+                            <goal>jar-no-fork</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -160,6 +161,33 @@
                     <serviceName>travis-ci</serviceName>
                 </configuration>
             </plugin>
+            <plugin>
+                <!--
+                    We need this for updating the submodule during release. Maven SCM
+                    doesn't support this itself apparently. See
+                    https://github.com/apache/maven-scm/pull/179
+                -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <!--
+                    We are using 3.0.0 as 3.1.1 fails due to this issue:
+                    https://github.com/mojohaus/exec-maven-plugin/issues/373
+                -->
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <id>invoke build</id>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>git</executable>
+                    <commandlineArgs>submodule update --init --recursive</commandlineArgs>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
@@ -200,6 +228,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.11.0</version>
                         <configuration>
                             <release>11</release>
                         </configuration>