Cherry picking commits from release-preview-2 branch and updating par…

…ent ref in storage pom (#4260) * Update preview version (#4209) * Update preview version for core and bump parent version * Update parent pom version * Update parent version for sdk template * Use plugin to update version * Add version to azure-core * If body is empty then return publisher emitting response instead of propagating empty publisher (#4208) * Update version of appconfig to 1.0.0-preview.1 (#4237) * Update version of appconfig to 1.0.0-preview.1 * Update report versions for app configuration. * Update EventHub core dependency version to preview 2 (#4221) * Updating storage parent pom to use azure-client-sdk-parent 1.1.0
Azure · Jul 3, 2019 · 8f4ddd3 · 8f4ddd3
1 parent 666c18e
commit 8f4ddd3
Show file tree

Hide file tree

Showing 25 changed files with 46 additions and 50 deletions.
diff --git a/appconfiguration/client/pom.xml b/appconfiguration/client/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../../pom.client.xml</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>
   <artifactId>azure-data-appconfiguration</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.0-preview.1</version>
 
   <name>Microsoft Azure client library for Application Configuration</name>
   <description>This package contains the Microsoft Azure Application Configuration client library.</description>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.0.0-preview.1</version>
+      <version>1.0.0-preview.2</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
-      <version>1.0.0-preview.1</version>
+      <version>1.0.0-preview.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/core/azure-core-amqp/pom.xml b/core/azure-core-amqp/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-core-parent</artifactId>
-    <version>1.0.0-preview.1</version>
+    <version>1.0.0-preview.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>
   <artifactId>azure-core-amqp</artifactId>
-  <version>1.0.0-preview.1</version>
+  <version>1.0.0-preview.2</version>
   <packaging>jar</packaging>
 
   <name>Microsoft Azure Java Core AMQP Library</name>
@@ -39,7 +39,6 @@
     <url>https://github.com/Azure/azure-sdk-for-java</url>
     <connection>scm:git:https://github.com/Azure/azure-sdk-for-java.git</connection>
     <developerConnection>scm:git:https://github.com/Azure/azure-sdk-for-java.git</developerConnection>
-    <tag>v1.0.0-preview.1</tag>
   </scm>
 
   <properties>
@@ -58,7 +57,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.0.0-preview.1</version>
+      <version>1.0.0-preview.2</version>
     </dependency>
 
     <dependency>

diff --git a/core/azure-core-management/pom.xml b/core/azure-core-management/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-core-parent</artifactId>
-    <version>1.0.0-preview.1</version>
+    <version>1.0.0-preview.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>
   <artifactId>azure-core-management</artifactId>
-  <version>1.0.0-preview.1</version>
+  <version>1.0.0-preview.2</version>
   <packaging>jar</packaging>
 
   <name>Microsoft Azure Management Java Core Library</name>
@@ -39,7 +39,6 @@
     <url>https://github.com/Azure/azure-sdk-for-java</url>
     <connection>scm:git:https://github.com/Azure/azure-sdk-for-java.git</connection>
     <developerConnection>scm:git:https://github.com/Azure/azure-sdk-for-java.git</developerConnection>
-    <tag>v1.0.0-preview.1</tag>
   </scm>
 
   <properties>
@@ -58,7 +57,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.0.0-preview.1</version>
+      <version>1.0.0-preview.2</version>
     </dependency>
 
     <dependency>
@@ -70,7 +69,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
-      <version>1.0.0-preview.1</version>
+      <version>1.0.0-preview.2</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/core/azure-core-test/pom.xml b/core/azure-core-test/pom.xml
@@ -6,14 +6,14 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-core-parent</artifactId>
-    <version>1.0.0-preview.1</version>
+    <version>1.0.0-preview.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>
   <artifactId>azure-core-test</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.0-preview.1</version>
+  <version>1.0.0-preview.2</version>
 
   <name>Microsoft Azure Java Core Test Library</name>
   <description>This package contains core test types for Azure Java clients.</description>
@@ -30,14 +30,13 @@
     <url>https://github.com/Azure/azure-sdk-for-java</url>
     <connection>scm:git:https://github.com/Azure/azure-sdk-for-java.git</connection>
     <developerConnection>scm:git:https://github.com/Azure/azure-sdk-for-java.git</developerConnection>
-    <tag>v1.0.0-preview.1</tag>
   </scm>
 
   <dependencies>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.0.0-preview.1</version>
+      <version>1.0.0-preview.2</version>
     </dependency>
 
     <dependency>

diff --git a/core/azure-core/pom.xml b/core/azure-core/pom.xml
@@ -7,13 +7,14 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-core-parent</artifactId>
-    <version>1.0.0-preview.1</version>
+    <version>1.0.0-preview.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>
   <artifactId>azure-core</artifactId>
   <packaging>jar</packaging>
+  <version>1.0.0-preview.2</version>
 
   <name>Microsoft Azure Java Core Library</name>
   <description>This package contains core types for Azure Java clients.</description>
@@ -38,7 +39,6 @@
     <url>https://github.com/Azure/azure-sdk-for-java</url>
     <connection>scm:git:https://github.com/Azure/azure-sdk-for-java.git</connection>
     <developerConnection>scm:git:https://github.com/Azure/azure-sdk-for-java.git</developerConnection>
-    <tag>v1.0.0-preview.1</tag>
   </scm>
 
   <properties>

diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java b/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java
@@ -145,7 +145,7 @@ private Function<HttpResponse, Mono<HttpResponse>> logResponseDelegate(final Cli
                         logger.asInfo().log("Response body:\n{}", bodyStr);
                         logger.asInfo().log("<-- END HTTP");
                         return bufferedResponse;
-                    });
+                    }).switchIfEmpty(Mono.defer(() -> Mono.just(bufferedResponse)));
                 } else {
                     logger.asInfo().log("(body content not logged)");
                     logger.asInfo().log("<-- END HTTP");

diff --git a/core/pom.xml b/core/pom.xml
@@ -9,13 +9,13 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../pom.client.xml</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>
   <artifactId>azure-core-parent</artifactId>
-  <version>1.0.0-preview.1</version>
+  <version>1.0.0-preview.2</version>
   <packaging>pom</packaging>
 
   <name>Microsoft Azure Core Libraries for Java</name>
@@ -34,7 +34,6 @@
     <url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
     <connection>scm:git:https://github.com/Azure/azure-sdk-for-java.git</connection>
     <developerConnection>scm:git:https://github.com/Azure/azure-sdk-for-java.git</developerConnection>
-    <tag>v1.0.0-preview.1</tag>
   </scm>
 
   <properties>

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../../pom.client.xml</relativePath>
   </parent>
 
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-data-appconfiguration</artifactId>
-      <version>${version}</version>
+      <version>1.0.0-preview.1</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>azure-client-sdk-parent</artifactId>
     <groupId>com.azure</groupId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../../pom.client.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -19,7 +19,7 @@
     <azure-keyvault.version>1.2.0</azure-keyvault.version>
     <azure-servicebus.version>2.0.0</azure-servicebus.version>
     <azure-storage-blob.version>10.5.0</azure-storage-blob.version>
-    <azure-data-appconfiguration.version>1.0.0-SNAPSHOT</azure-data-appconfiguration.version>
+    <azure-data-appconfiguration.version>1.0.0-preview.1</azure-data-appconfiguration.version>
     <azure-messaging-eventhubs.version>5.0.0-preview.1</azure-messaging-eventhubs.version>
   </properties>
   <distributionManagement>

diff --git a/eventhubs/client/pom.xml b/eventhubs/client/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../../pom.client.xml</relativePath>
   </parent>
 
@@ -38,12 +38,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.0.0-preview.1</version>
+      <version>1.0.0-preview.2</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-amqp</artifactId>
-      <version>1.0.0-preview.1</version>
+      <version>1.0.0-preview.2</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
-      <version>1.0.0-preview.1</version>
+      <version>1.0.0-preview.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/eventhubs/data-plane/pom.xml b/eventhubs/data-plane/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../../pom.data.xml</relativePath>
   </parent>
 

diff --git a/identity/client/pom.xml b/identity/client/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../../pom.client.xml</relativePath>
   </parent>
 

diff --git a/keyvault/client/pom.xml b/keyvault/client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../../pom.client.xml</relativePath>
   </parent>
 

diff --git a/keyvault/data-plane/pom.xml b/keyvault/data-plane/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../../pom.data.xml</relativePath>
   </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -6,7 +6,7 @@
   <groupId>com.azure</groupId>
   <artifactId>azure-sdk-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
 
   <name>Microsoft Azure SDK for Java Parent</name>
   <description>Parent POM for Microsoft Azure SDK for Java</description>

diff --git a/pom.client.xml b/pom.client.xml
@@ -6,7 +6,7 @@
   <groupId>com.azure</groupId>
   <artifactId>azure-client-sdk-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
 
   <name>Microsoft Azure SDK for Java - Client Libraries</name>
   <description>Parent POM for Microsoft Azure SDK for Java</description>
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>./parent/pom.xml</relativePath>
   </parent>
 

diff --git a/pom.data.xml b/pom.data.xml
@@ -6,7 +6,7 @@
   <groupId>com.azure</groupId>
   <artifactId>azure-data-sdk-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
 
   <name>Microsoft Azure SDK for Java - Data Plane Libraries</name>
   <description>Parent POM for Microsoft Azure SDK for Java</description>
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>./parent/pom.xml</relativePath>
   </parent>
 

diff --git a/pom.management.xml b/pom.management.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>./parent/pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>./parent/pom.xml</relativePath>
   </parent>
 

diff --git a/sdk/batch/microsoft-azure-batch/pom.xml b/sdk/batch/microsoft-azure-batch/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../../../pom.data.xml</relativePath>
   </parent>
 

diff --git a/sdk/servicebus/pom.xml b/sdk/servicebus/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../../pom.data.xml</relativePath>
   </parent>
 

diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <relativePath>../../../pom.client.xml</relativePath>
   </parent>