From 478d75fec7aa6f1b77965dda5e6f4a5f88062ab8 Mon Sep 17 00:00:00 2001
From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com>
Date: Mon, 9 Dec 2019 13:00:08 -0800
Subject: [PATCH 1/2] Removed Queue Cryptography references since the module is
 unused

---
 eng/jacoco-test-coverage/pom.xml      | 5 -----
 eng/spotbugs-aggregate-report/pom.xml | 6 ------
 eng/versioning/version_client.txt     | 1 -
 pom.client.xml                        | 5 -----
 sdk/storage/ci.yml                    | 3 ---
 sdk/storage/pom.service.xml           | 1 -
 6 files changed, 21 deletions(-)

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index 7e786e7824be..10eeb49f1126 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -142,11 +142,6 @@
       <artifactId>azure-storage-queue</artifactId>
       <version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
     </dependency>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-storage-queue-cryptography</artifactId>
-      <version>12.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-storage-queue-cryptography;current} -->
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml
index f0edbcb1d396..d9460fc279a0 100644
--- a/eng/spotbugs-aggregate-report/pom.xml
+++ b/eng/spotbugs-aggregate-report/pom.xml
@@ -73,7 +73,6 @@
                 <source>..\..\sdk\storage\azure-storage-file-datalake\src\samples\java\com</source>
                 <source>..\..\sdk\storage\azure-storage-queue\src\main\java\com</source>
                 <source>..\..\sdk\storage\azure-storage-queue\src\samples\java\com</source>
-                <source>..\..\sdk\storage\azure-storage-queue-cryptography\src\main\java\com</source>
               </sources>
             </configuration>
           </execution>
@@ -250,11 +249,6 @@
           <artifactId>azure-storage-queue</artifactId>
           <version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
         </dependency>
-        <dependency>
-          <groupId>com.azure</groupId>
-          <artifactId>azure-storage-queue-cryptography</artifactId>
-          <version>12.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-storage-queue-cryptography;current} -->
-        </dependency>
         <!-- Added this dependency to include necessary annotations used by reactor core.
         Without this dependency, javadoc throws a warning as it cannot find enum When.MAYBE
         which is used in @Nullable annotation in reactor core classes -->
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index d886ce8886ba..3a44dc9e4486 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -27,4 +27,3 @@ com.azure:azure-storage-common;12.1.0;12.2.0-beta.1
 com.azure:azure-storage-file-share;12.0.0;12.1.0-beta.1
 com.azure:azure-storage-file-datalake;12.0.0-beta.7;12.0.0-beta.8
 com.azure:azure-storage-queue;12.1.0;12.2.0-beta.1
-com.azure:azure-storage-queue-cryptography;12.0.0-beta.6;12.0.0-beta.7
diff --git a/pom.client.xml b/pom.client.xml
index 565aec13a851..9e616478cd79 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -469,10 +469,6 @@
                 <title>Azure Storage - Queues</title>
                 <packages>com.azure.storage.queue*</packages>
               </group>
-              <group>
-                <title>Azure Storage Queues - Cryptography</title>
-                <packages>com.azure.storage.queue.cryptography*</packages>
-              </group>
               <group>
                 <title>Azure Telemetry</title>
                 <title>Azure Telemetry - OpenCensus</title>
@@ -1207,6 +1203,5 @@
     <module>sdk/storage/azure-storage-file-share</module>
     <module>sdk/storage/azure-storage-file-datalake</module>
     <module>sdk/storage/azure-storage-queue</module>
-    <module>sdk/storage/azure-storage-queue-cryptography</module>
   </modules>
 </project>
diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml
index 4f6746b870ee..bbaacdd55152 100644
--- a/sdk/storage/ci.yml
+++ b/sdk/storage/ci.yml
@@ -63,6 +63,3 @@ stages:
         - name: azure-storage-queue
           safeName: azurestoragequeue
           stagingProfileId: 88192f04117501
-        # - name: azure-storage-queue-cryptography
-        #   safeName: azurestoragequeuecryptography
-        #   stagingProfileId: 88192f04117501
diff --git a/sdk/storage/pom.service.xml b/sdk/storage/pom.service.xml
index 5046a2e08097..96b5ed8a399d 100644
--- a/sdk/storage/pom.service.xml
+++ b/sdk/storage/pom.service.xml
@@ -23,6 +23,5 @@
     <module>azure-storage-file-share</module>
     <module>azure-storage-file-datalake</module>
     <module>azure-storage-queue</module>
-    <module>azure-storage-queue-cryptography</module>
   </modules>
 </project>

From ded8577c7b3c7eb3dc81e461e9b07f9adaa4b030 Mon Sep 17 00:00:00 2001
From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com>
Date: Mon, 9 Dec 2019 13:11:29 -0800
Subject: [PATCH 2/2] Delete Queue Cryptography POM file

---
 .../azure-storage-queue-cryptography/pom.xml  | 213 ------------------
 1 file changed, 213 deletions(-)
 delete mode 100644 sdk/storage/azure-storage-queue-cryptography/pom.xml

diff --git a/sdk/storage/azure-storage-queue-cryptography/pom.xml b/sdk/storage/azure-storage-queue-cryptography/pom.xml
deleted file mode 100644
index 99b0fa07161d..000000000000
--- a/sdk/storage/azure-storage-queue-cryptography/pom.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>com.azure</groupId>
-    <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../../pom.client.xml</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.azure</groupId>
-  <artifactId>azure-storage-queue-cryptography</artifactId>
-  <version>12.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-storage-queue-cryptography;current} -->
-
-  <name>Microsoft Azure client library for Queue Storage cryptography</name>
-  <description>This module contains client library for Microsoft Azure Queue Storage cryptography.</description>
-  <url>https://github.com/Azure/azure-sdk-for-java</url>
-
-  <distributionManagement>
-    <site>
-      <id>azure-java-build-docs</id>
-      <url>${site.url}/site/${project.artifactId}</url>
-    </site>
-  </distributionManagement>
-
-  <scm>
-    <url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
-    <connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
-    <tag>HEAD</tag>
-  </scm>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-storage-queue</artifactId>
-      <version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
-    </dependency>
-<!--    <dependency>-->
-<!--      <groupId>com.azure</groupId>-->
-<!--      <artifactId>azure-core-test</artifactId>-->
-<!--      <version>1.1.0-beta.1</version>--> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
-<!--      <scope>test</scope>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>com.azure</groupId>-->
-<!--      <artifactId>azure-core-http-netty</artifactId>-->
-<!--      <version>1.1.0</version>--> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
-<!--      <scope>test</scope>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.slf4j</groupId>-->
-<!--      <artifactId>slf4j-simple</artifactId>-->
-<!--      <version>1.7.25</version>--> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
-<!--      <scope>test</scope>-->
-<!--    </dependency>-->
-<!--    &lt;!&ndash; https://mvnrepository.com/artifact/org.spockframework/spock-core &ndash;&gt;-->
-<!--    <dependency>-->
-<!--      <groupId>org.spockframework</groupId>-->
-<!--      <artifactId>spock-core</artifactId>-->
-<!--      <version>1.3-groovy-2.5</version>--> <!-- {x-version-update;org.spockframework:spock-core;external_dependency} -->
-<!--      <scope>test</scope>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>io.projectreactor</groupId>-->
-<!--      <artifactId>reactor-test</artifactId>-->
-<!--      <version>3.3.0.RELEASE</version>--> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
-<!--      <scope>test</scope>-->
-<!--    </dependency>-->
-  </dependencies>
-
-  <profiles>
-    <profile>
-      <id>java8</id>
-      <activation>
-        <jdk>[1.8,9)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.8.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
-            <configuration>
-              <source>1.8</source>
-              <target>1.8</target>
-              <showWarnings>true</showWarnings>
-              <failOnWarning>true</failOnWarning>
-              <compilerArgs>
-                <arg>-Xlint:all</arg>
-                <arg>-Xlint:-serial</arg>
-                <arg>-Xlint:-deprecation</arg>
-                <arg>-Xlint:-processing</arg>
-              </compilerArgs>
-              <excludes>
-                <exclude>module-info.java</exclude>
-              </excludes>
-            </configuration>
-
-            <executions>
-              <execution>
-                <id>test-compile</id>
-                <phase>process-test-sources</phase>
-                <goals>
-                  <goal>testCompile</goal>
-                </goals>
-                <configuration>
-                  <compilerId>groovy-eclipse-compiler</compilerId>
-                </configuration>
-              </execution>
-              <execution>
-                <id>default-testCompile</id>
-                <phase>process-test-sources</phase>
-                <goals>
-                  <goal>testCompile</goal>
-                </goals>
-                <configuration>
-                  <compilerId>groovy-eclipse-compiler</compilerId>
-                </configuration>
-              </execution>
-            </executions>
-            <dependencies>
-              <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-eclipse-compiler</artifactId>
-                <version>3.4.0-01</version> <!-- {x-version-update;org.codehaus.groovy:groovy-eclipse-compiler;external_dependency} -->
-              </dependency>
-              <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-eclipse-batch</artifactId>
-                <version>2.5.8-01</version> <!-- {x-version-update;org.codehaus.groovy:groovy-eclipse-batch;external_dependency} -->
-              </dependency>
-            </dependencies>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>java9plus</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <!-- Skip maven compiler and use gmavenplus plugin instead -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.8.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
-            <configuration>
-              <source>9</source>
-              <target>9</target>
-            </configuration>
-            <executions>
-              <execution>
-                <id>test-compile</id>
-                <phase>process-test-sources</phase>
-                <goals>
-                  <goal>testCompile</goal>
-                </goals>
-                <configuration>
-                  <compilerId>groovy-eclipse-compiler</compilerId>
-                  <release>8</release>
-                </configuration>
-              </execution>
-              <execution>
-                <id>default-testCompile</id>
-                <phase>process-test-sources</phase>
-                <goals>
-                  <goal>testCompile</goal>
-                </goals>
-                <configuration>
-                  <compilerId>groovy-eclipse-compiler</compilerId>
-                  <release>8</release>
-                </configuration>
-              </execution>
-            </executions>
-            <dependencies>
-              <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-eclipse-compiler</artifactId>
-                <version>3.4.0-01</version> <!-- {x-version-update;org.codehaus.groovy:groovy-eclipse-compiler;external_dependency} -->
-              </dependency>
-              <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-eclipse-batch</artifactId>
-                <version>2.5.8-01</version> <!-- {x-version-update;org.codehaus.groovy:groovy-eclipse-batch;external_dependency} -->
-              </dependency>
-            </dependencies>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
-            <configuration>
-              <argLine>
-              </argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>