Update Storage POMs to Use New Surefire Argline Pattern (#24132)

Update Storage POMs to Use New Surefire Argline Pattern
Azure · Sep 15, 2021 · fe98736 · fe98736
1 parent 72f99c8
commit fe98736
Show file tree

Hide file tree

Showing 9 changed files with 151 additions and 320 deletions.
diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml
@@ -224,16 +224,6 @@
               </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>
-              <systemPropertyVariables>
-                <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -243,6 +233,21 @@
       <activation>
         <jdk>[9,)</jdk>
       </activation>
+      <properties>
+        <!-- Configures the Java 9+ run to perform the required module exports, opens, and reads that are necessary for testing but shouldn't be part of the module-info. -->
+        <javaModulesSurefireArgLine>
+          --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
+          --add-exports com.azure.core/com.azure.core.implementation.serializer.jackson=ALL-UNNAMED
+          --add-exports com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
+          --add-opens com.azure.storage.blob/com.azure.storage.blob.implementation=ALL-UNNAMED
+          --add-opens com.azure.storage.blob.batch/com.azure.storage.blob.batch=ALL-UNNAMED
+          --add-reads com.azure.core=ALL-UNNAMED
+          --add-reads com.azure.core.test=ALL-UNNAMED
+          --add-reads com.azure.core.amqp=ALL-UNNAMED
+          --add-reads com.azure.storage.common=ALL-UNNAMED
+          --add-reads com.azure.storage.blob=ALL-UNNAMED
+        </javaModulesSurefireArgLine>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -293,29 +298,6 @@
               </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>
-                --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
-                --add-exports com.azure.core/com.azure.core.implementation.serializer.jackson=ALL-UNNAMED
-                --add-exports com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
-                --add-opens com.azure.storage.blob/com.azure.storage.blob.implementation=ALL-UNNAMED
-                --add-opens com.azure.storage.blob.batch/com.azure.storage.blob.batch=ALL-UNNAMED
-                --add-reads com.azure.core=ALL-UNNAMED
-                --add-reads com.azure.core.test=ALL-UNNAMED
-                --add-reads com.azure.core.amqp=ALL-UNNAMED
-                --add-reads com.azure.storage.common=ALL-UNNAMED
-                --add-reads com.azure.storage.blob=ALL-UNNAMED
-              </argLine>
-              <systemPropertyVariables>
-                <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/sdk/storage/azure-storage-blob-changefeed/pom.xml b/sdk/storage/azure-storage-blob-changefeed/pom.xml
@@ -230,16 +230,6 @@
               </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>
-              <systemPropertyVariables>
-                <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -249,6 +239,27 @@
       <activation>
         <jdk>[9,)</jdk>
       </activation>
+      <properties>
+        <!-- Configures the Java 9+ run to perform the required module exports, opens, and reads that are necessary for testing but shouldn't be part of the module-info. -->
+        <javaModulesSurefireArgLine>
+          --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
+          --add-exports com.azure.core/com.azure.core.implementation.serializer.jackson=ALL-UNNAMED
+          --add-exports com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
+          --add-opens com.azure.storage.common/com.azure.storage.common.implementation=ALL-UNNAMED
+          --add-opens com.azure.storage.internal.avro/com.azure.storage.internal.avro.implementation=ALL-UNNAMED
+          --add-opens com.azure.storage.blob/com.azure.storage.blob=ALL-UNNAMED
+          --add-opens com.azure.storage.blob/com.azure.storage.blob.specialized=ALL-UNNAMED
+          --add-opens com.azure.storage.blob.changefeed/com.azure.storage.blob.changefeed=ALL-UNNAMED
+          --add-opens com.azure.storage.blob.changefeed/com.azure.storage.blob.changefeed.implementation.models=ALL-UNNAMED
+          --add-opens com.azure.storage.blob.changefeed/com.azure.storage.blob.changefeed.implementation.util=ALL-UNNAMED
+          --add-reads com.azure.core=ALL-UNNAMED
+          --add-reads com.azure.core.test=ALL-UNNAMED
+          --add-reads com.azure.core.amqp=ALL-UNNAMED
+          --add-reads com.azure.storage.common=ALL-UNNAMED
+          --add-reads com.azure.storage.blob=ALL-UNNAMED
+          --add-reads com.azure.storage.internal.avro=ALL-UNNAMED
+        </javaModulesSurefireArgLine>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -299,35 +310,6 @@
               </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>
-                --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
-                --add-exports com.azure.core/com.azure.core.implementation.serializer.jackson=ALL-UNNAMED
-                --add-exports com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
-                --add-opens com.azure.storage.common/com.azure.storage.common.implementation=ALL-UNNAMED
-                --add-opens com.azure.storage.internal.avro/com.azure.storage.internal.avro.implementation=ALL-UNNAMED
-                --add-opens com.azure.storage.blob/com.azure.storage.blob=ALL-UNNAMED
-                --add-opens com.azure.storage.blob/com.azure.storage.blob.specialized=ALL-UNNAMED
-                --add-opens com.azure.storage.blob.changefeed/com.azure.storage.blob.changefeed=ALL-UNNAMED
-                --add-opens com.azure.storage.blob.changefeed/com.azure.storage.blob.changefeed.implementation.models=ALL-UNNAMED
-                --add-opens com.azure.storage.blob.changefeed/com.azure.storage.blob.changefeed.implementation.util=ALL-UNNAMED
-                --add-reads com.azure.core=ALL-UNNAMED
-                --add-reads com.azure.core.test=ALL-UNNAMED
-                --add-reads com.azure.core.amqp=ALL-UNNAMED
-                --add-reads com.azure.storage.common=ALL-UNNAMED
-                --add-reads com.azure.storage.blob=ALL-UNNAMED
-                --add-reads com.azure.storage.internal.avro=ALL-UNNAMED
-              </argLine>
-              <systemPropertyVariables>
-                <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/sdk/storage/azure-storage-blob-cryptography/pom.xml b/sdk/storage/azure-storage-blob-cryptography/pom.xml
@@ -218,16 +218,6 @@
               </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>
-              <systemPropertyVariables>
-                <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -237,6 +227,18 @@
       <activation>
         <jdk>[9,)</jdk>
       </activation>
+      <properties>
+        <!-- Configures the Java 9+ run to perform the required module exports, opens, and reads that are necessary for testing but shouldn't be part of the module-info. -->
+        <javaModulesSurefireArgLine>
+          --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
+          --add-opens com.azure.storage.common/com.azure.storage.common.implementation=ALL-UNNAMED
+          --add-opens com.azure.storage.blob/com.azure.storage.blob.specialized=ALL-UNNAMED
+          --add-opens com.azure.storage.blob.cryptography/com.azure.storage.blob.specialized.cryptography=ALL-UNNAMED
+          --add-reads com.azure.core=ALL-UNNAMED
+          --add-reads com.azure.storage.common=ALL-UNNAMED
+          --add-reads com.azure.storage.blob=ALL-UNNAMED
+        </javaModulesSurefireArgLine>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -287,26 +289,6 @@
               </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>
-                --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
-                --add-opens com.azure.storage.common/com.azure.storage.common.implementation=ALL-UNNAMED
-                --add-opens com.azure.storage.blob/com.azure.storage.blob.specialized=ALL-UNNAMED
-                --add-opens com.azure.storage.blob.cryptography/com.azure.storage.blob.specialized.cryptography=ALL-UNNAMED
-                --add-reads com.azure.core=ALL-UNNAMED
-                --add-reads com.azure.storage.common=ALL-UNNAMED
-                --add-reads com.azure.storage.blob=ALL-UNNAMED
-              </argLine>
-              <systemPropertyVariables>
-                <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/sdk/storage/azure-storage-blob-nio/pom.xml b/sdk/storage/azure-storage-blob-nio/pom.xml
@@ -201,16 +201,6 @@
               </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>
-              <systemPropertyVariables>
-                <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -220,6 +210,21 @@
       <activation>
         <jdk>[9,)</jdk>
       </activation>
+      <properties>
+        <!-- Configures the Java 9+ run to perform the required module exports, opens, and reads that are necessary for testing but shouldn't be part of the module-info. -->
+        <javaModulesSurefireArgLine>
+          --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
+          --add-exports com.azure.core/com.azure.core.implementation.serializer.jackson=ALL-UNNAMED
+          --add-exports com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
+          --add-opens com.azure.storage.common/com.azure.storage.common.implementation=ALL-UNNAMED
+          --add-opens com.azure.storage.blob.nio/com.azure.storage.blob.nio=ALL-UNNAMED
+          --add-reads com.azure.core=ALL-UNNAMED
+          --add-reads com.azure.core.test=ALL-UNNAMED
+          --add-reads com.azure.core.amqp=ALL-UNNAMED
+          --add-reads com.azure.storage.common=ALL-UNNAMED
+          --add-reads com.azure.storage.blob=ALL-UNNAMED
+        </javaModulesSurefireArgLine>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -270,29 +275,6 @@
               </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>
-                --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
-                --add-exports com.azure.core/com.azure.core.implementation.serializer.jackson=ALL-UNNAMED
-                --add-exports com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
-                --add-opens com.azure.storage.common/com.azure.storage.common.implementation=ALL-UNNAMED
-                --add-opens com.azure.storage.blob.nio/com.azure.storage.blob.nio=ALL-UNNAMED
-                --add-reads com.azure.core=ALL-UNNAMED
-                --add-reads com.azure.core.test=ALL-UNNAMED
-                --add-reads com.azure.core.amqp=ALL-UNNAMED
-                --add-reads com.azure.storage.common=ALL-UNNAMED
-                --add-reads com.azure.storage.blob=ALL-UNNAMED
-              </argLine>
-              <systemPropertyVariables>
-                <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml
@@ -36,6 +36,7 @@
     <src.dir>src/main/java</src.dir>
     <test.dir>src/test/java</test.dir>
     <AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
+    <surefireXmx>6g</surefireXmx>
   </properties>
 
   <pluginRepositories>
@@ -228,19 +229,6 @@
               </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>
-                -Xmx6g
-              </argLine>
-              <systemPropertyVariables>
-                <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -250,6 +238,26 @@
       <activation>
         <jdk>[9,)</jdk>
       </activation>
+      <properties>
+        <!-- Configures the Java 9+ run to perform the required module exports, opens, and reads that are necessary for testing but shouldn't be part of the module-info. -->
+        <javaModulesSurefireArgLine>
+          --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
+          --add-exports com.azure.core/com.azure.core.implementation.serializer.jackson=ALL-UNNAMED
+          --add-exports com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
+          --add-opens com.azure.storage.common/com.azure.storage.common.implementation=ALL-UNNAMED
+          --add-opens com.azure.storage.common/com.azure.storage.common.sas=ALL-UNNAMED
+          --add-opens com.azure.storage.blob/com.azure.storage.blob=ALL-UNNAMED
+          --add-opens com.azure.storage.blob/com.azure.storage.blob.implementation=ALL-UNNAMED
+          --add-opens com.azure.storage.blob/com.azure.storage.blob.implementation.util=ALL-UNNAMED
+          --add-opens com.azure.storage.blob/com.azure.storage.blob.specialized=ALL-UNNAMED
+          --add-opens com.azure.storage.blob/com.azure.storage.blob.changefeed=ALL-UNNAMED
+          --add-reads com.azure.core=ALL-UNNAMED
+          --add-reads com.azure.core.test=ALL-UNNAMED
+          --add-reads com.azure.core.amqp=ALL-UNNAMED
+          --add-reads com.azure.storage.common=ALL-UNNAMED
+          --add-reads com.azure.storage.internal.avro=ALL-UNNAMED
+        </javaModulesSurefireArgLine>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -300,35 +308,6 @@
               </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>
-                -Xmx6g
-                --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
-                --add-exports com.azure.core/com.azure.core.implementation.serializer.jackson=ALL-UNNAMED
-                --add-exports com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
-                --add-opens com.azure.storage.common/com.azure.storage.common.implementation=ALL-UNNAMED
-                --add-opens com.azure.storage.common/com.azure.storage.common.sas=ALL-UNNAMED
-                --add-opens com.azure.storage.blob/com.azure.storage.blob=ALL-UNNAMED
-                --add-opens com.azure.storage.blob/com.azure.storage.blob.implementation=ALL-UNNAMED
-                --add-opens com.azure.storage.blob/com.azure.storage.blob.implementation.util=ALL-UNNAMED
-                --add-opens com.azure.storage.blob/com.azure.storage.blob.specialized=ALL-UNNAMED
-                --add-opens com.azure.storage.blob/com.azure.storage.blob.changefeed=ALL-UNNAMED
-                --add-reads com.azure.core=ALL-UNNAMED
-                --add-reads com.azure.core.test=ALL-UNNAMED
-                --add-reads com.azure.core.amqp=ALL-UNNAMED
-                --add-reads com.azure.storage.common=ALL-UNNAMED
-                --add-reads com.azure.storage.internal.avro=ALL-UNNAMED
-              </argLine>
-              <systemPropertyVariables>
-                <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>