Merge pull request #205 from splunk/master

ashah-splunk · web-flow · commit 296893487a81 · 2023-01-06T18:18:32.000+05:30
Release 1.9.3 sync
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Splunk Enterprise SDK for Java Changelog
 
+## Version 1.9.3
+
+### Minor Changes
+* Re-fetch logic for instancetype and version fields if not set within Service instance to avoid NPE (GitHub PR [#202](https://github.com/splunk/splunk-sdk-java/pull/202))
+* Check for local IP as alternative to _localhost_ within HostnameVerifier, addressing issue with certain local workflows
+
 ## Version 1.9.2
 
 ### New Features and APIs
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![Java SDK Test](https://github.com/splunk/splunk-sdk-java/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/splunk/splunk-sdk-java/actions/workflows/test.yml)
 # The Splunk Software Development Kit for Java
 
-#### Version 1.9.2
+#### Version 1.9.3
 
 The Splunk Software Development Kit (SDK) for Java contains library code and
 examples designed to enable developers to build applications using Splunk.
@@ -75,7 +75,7 @@ To add the Splunk SDK for Java `.JAR` file as a dependency:
   <dependency>
     <groupId>com.splunk</groupId>
     <artifactId>splunk</artifactId>
-    <version>1.9.2</version>
+    <version>1.9.3</version>
   </dependency>
 </dependencies>
 ```
diff --git a/deploy b/deploy
@@ -2,7 +2,7 @@
 
 declare -r scriptDirectory="$(dirname $(readlink -e $0))"
 declare -r scriptName="$(basename $0)"
-declare -r version="1.9.2"
+declare -r version="1.9.3"
 
 if [[ $# -ne 1 ]]; then
     echo 1>&2 "Usage: ${scriptName} {local|staging||production}"
diff --git a/deploy.md b/deploy.md
@@ -9,8 +9,8 @@ deploy \<repository-name>
 
 ##DESCRIPTION
 
-Deploy transmits **target/splunk-1.9.2.jar**, **target/splunk-1.9.2-javadoc.jar**, and
-**target/splunk-1.9.2-sources.jar** to the **local**, **staging**, or **production**
+Deploy transmits **target/splunk-1.9.3.jar**, **target/splunk-1.9.3-javadoc.jar**, and
+**target/splunk-1.9.3-sources.jar** to the **local**, **staging**, or **production**
 maven repository. Repository names are mapped to locations as follows.
 
 | repository-name | location                                                       |
@@ -21,18 +21,18 @@ maven repository. Repository names are mapped to locations as follows.
 
 After deployment you should find this tree structure at the location of your repository
 
-    com/splunk/splunk/1.9.2/
-    ├── splunk-1.9.2-javadoc.jar
-    ├── splunk-1.9.2-javadoc.jar.md5
-    ├── splunk-1.9.2-javadoc.jar.sha1
-    ├── splunk-1.9.2-sources.jar
-    ├── splunk-1.9.2-sources.jar.md5
-    ├── splunk-1.9.2-sources.jar.sha1
-    ├── splunk-1.9.2.jar
-    ├── splunk-1.9.2.jar.md5
-    ├── splunk-1.9.2.jar.sha1
-    ├── splunk-1.9.2.pom
-    ├── splunk-1.9.2.pom.md5
-    └── splunk-1.9.2.pom.sha1
+    com/splunk/splunk/1.9.3/
+    ├── splunk-1.9.3-javadoc.jar
+    ├── splunk-1.9.3-javadoc.jar.md5
+    ├── splunk-1.9.3-javadoc.jar.sha1
+    ├── splunk-1.9.3-sources.jar
+    ├── splunk-1.9.3-sources.jar.md5
+    ├── splunk-1.9.3-sources.jar.sha1
+    ├── splunk-1.9.3.jar
+    ├── splunk-1.9.3.jar.md5
+    ├── splunk-1.9.3.jar.sha1
+    ├── splunk-1.9.3.pom
+    ├── splunk-1.9.3.pom.md5
+    └── splunk-1.9.3.pom.sha1
 
 Verify this structure prior to release.
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.splunk</groupId>
             <artifactId>splunk</artifactId>
-            <version>1.9.2</version>
+            <version>1.9.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <version.number>1.9.2</version.number>
+        <version.number>1.9.3</version.number>
         <maven.resources.overwrite>true</maven.resources.overwrite>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>
diff --git a/splunk/pom.xml b/splunk/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>splunk</artifactId>
-    <version>1.9.2</version>
+    <version>1.9.3</version>
     <parent>
         <artifactId>splunk-sdk-java</artifactId>
         <groupId>com.splunk</groupId>
diff --git a/splunk/src/main/java/com/splunk/HttpService.java b/splunk/src/main/java/com/splunk/HttpService.java
@@ -90,7 +90,7 @@ public boolean verify(String s, SSLSession sslSession) {
     private String prefix = null;
 
     static Map<String, String> defaultHeader = new HashMap<String, String>() {{
-        put("User-Agent", "splunk-sdk-java/1.9.2");
+        put("User-Agent", "splunk-sdk-java/1.9.3");
         put("Accept", "*/*");
     }};
     
