Move AzureTestWatcher into azure-core-test (#12989)

* Move azure-test-watcher into azure-core-test * Remove references to azure-test-watcher
Azure · Jul 10, 2020 · 593440d · 593440d
1 parent 46e9950
commit 593440d
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 145 deletions.
diff --git a/common/azure-test-watcher/README.md b/common/azure-test-watcher/README.md
diff --git a/common/azure-test-watcher/pom.xml b/common/azure-test-watcher/pom.xml
diff --git a/common/azure-test-watcher/src/main/java/com/azure/testing/package-info.java b/common/azure-test-watcher/src/main/java/com/azure/testing/package-info.java
diff --git a/...st-watcher/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/...st-watcher/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
@@ -49,7 +49,6 @@ com.azure:azure-storage-internal-avro;12.0.0-beta.1;12.0.0-beta.2
 com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-storage-queue;12.6.0-beta.1;12.6.0-beta.2
 com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-spring-boot-test-aad;1.0.0;1.0.0
 com.azure:azure-spring-boot-test-core;1.0.0;1.0.0
 com.azure:azure-spring-boot-test-cosmosdb;1.0.0;1.0.0

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,6 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
-    <module>common/azure-test-watcher</module>
     <module>common/perf-test-core</module>
     <module>eng/jacoco-test-coverage</module>
     <module>eng/code-quality-reports</module>

diff --git a/...a/com/azure/testing/AzureTestWatcher.java → ...com/azure/core/test/AzureTestWatcher.java b/...a/com/azure/testing/AzureTestWatcher.java → ...com/azure/core/test/AzureTestWatcher.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.testing;
+package com.azure.core.test;
 
 import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
 import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;

diff --git a/...-core-test/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/...-core-test/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -0,0 +1 @@
+com.azure.core.test.AzureTestWatcher
diff --git a/sdk/parents/azure-client-sdk-parent/pom.xml b/sdk/parents/azure-client-sdk-parent/pom.xml
@@ -731,17 +731,7 @@
           <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} -->
-          <dependencies>
-            <dependency>
-              <groupId>com.azure</groupId>
-              <artifactId>azure-test-watcher</artifactId>
-              <version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-test-watcher;dependency} -->
-            </dependency>
-          </dependencies>
           <configuration>
-            <additionalClasspathElements>
-              <additionalClasspathElement>../../../common/azure-test-watcher/target/azure-test-watcher-1.0.0-beta.1.jar</additionalClasspathElement>
-            </additionalClasspathElements>
             <runOrder>alphabetical</runOrder>
             <useSystemClassLoader>false</useSystemClassLoader>
             <systemPropertyVariables combine.children="append">