Skip to content

Commit 60e323e

Browse files
alzimmermsftalzimmermsft
authored
Fix log capturing in Storage live tests (#39030)
1 parent d292829 commit 60e323e

File tree

11 files changed

+0
-204
lines changed

11 files changed

+0
-204
lines changed

‎sdk/storage/azure-storage-blob-batch/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
</scm>
3434

3535
<properties>
36-
<src.dir>src/main/java</src.dir>
37-
<test.dir>src/test/java</test.dir>
3836
<AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
3937
<!-- 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. -->
4038
<javaModulesSurefireArgLine>
@@ -117,12 +115,6 @@
117115
<version>3.2.7</version> <!-- {x-version-update;cglib:cglib-nodep;external_dependency} -->
118116
<scope>test</scope>
119117
</dependency>
120-
<dependency>
121-
<groupId>org.slf4j</groupId>
122-
<artifactId>slf4j-simple</artifactId>
123-
<version>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
124-
<scope>test</scope>
125-
</dependency>
126118
<dependency>
127119
<groupId>com.azure</groupId>
128120
<artifactId>azure-core-http-okhttp</artifactId>
@@ -132,14 +124,6 @@
132124
</dependencies>
133125

134126
<build>
135-
<sourceDirectory>src/main/java</sourceDirectory>
136-
<testSourceDirectory>src/test/java</testSourceDirectory>
137-
<testResources>
138-
<testResource>
139-
<directory>${basedir}/src/test/resources</directory>
140-
</testResource>
141-
</testResources>
142-
143127
<plugins>
144128
<plugin>
145129
<groupId>org.apache.maven.plugins</groupId>

‎sdk/storage/azure-storage-blob-changefeed/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
</scm>
3434

3535
<properties>
36-
<src.dir>src/main/java</src.dir>
37-
<test.dir>src/test/java</test.dir>
3836
<AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
3937
<!-- 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. -->
4038
<javaModulesSurefireArgLine>
@@ -132,12 +130,6 @@
132130
<version>1.14.8</version> <!-- {x-version-update;testdep_net.bytebuddy:byte-buddy-agent;external_dependency} -->
133131
<scope>test</scope>
134132
</dependency>
135-
<dependency>
136-
<groupId>org.slf4j</groupId>
137-
<artifactId>slf4j-simple</artifactId>
138-
<version>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
139-
<scope>test</scope>
140-
</dependency>
141133
<dependency>
142134
<groupId>com.azure</groupId>
143135
<artifactId>azure-core-http-okhttp</artifactId>
@@ -165,14 +157,6 @@
165157
</dependencies>
166158

167159
<build>
168-
<sourceDirectory>src/main/java</sourceDirectory>
169-
<testSourceDirectory>src/test/java</testSourceDirectory>
170-
<testResources>
171-
<testResource>
172-
<directory>${basedir}/src/test/resources</directory>
173-
</testResource>
174-
</testResources>
175-
176160
<plugins>
177161
<plugin>
178162
<groupId>org.apache.maven.plugins</groupId>

‎sdk/storage/azure-storage-blob-cryptography/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,6 @@
146146
<version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
147147
<scope>test</scope>
148148
</dependency>
149-
<dependency>
150-
<groupId>org.slf4j</groupId>
151-
<artifactId>slf4j-simple</artifactId>
152-
<version>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
153-
<scope>test</scope>
154-
</dependency>
155149
<dependency>
156150
<groupId>com.azure</groupId>
157151
<artifactId>azure-core-http-okhttp</artifactId>

‎sdk/storage/azure-storage-blob-nio/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
</scm>
3333

3434
<properties>
35-
<src.dir>src/main/java</src.dir>
36-
<test.dir>src/test/java</test.dir>
3735
<AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
3836
<!-- 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. -->
3937
<javaModulesSurefireArgLine>
@@ -111,12 +109,6 @@
111109
<version>3.2.7</version> <!-- {x-version-update;cglib:cglib-nodep;external_dependency} -->
112110
<scope>test</scope>
113111
</dependency>
114-
<dependency>
115-
<groupId>org.slf4j</groupId>
116-
<artifactId>slf4j-simple</artifactId>
117-
<version>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
118-
<scope>test</scope>
119-
</dependency>
120112
<dependency>
121113
<groupId>com.azure</groupId>
122114
<artifactId>azure-core-http-okhttp</artifactId>
@@ -146,14 +138,6 @@
146138
</dependencies>
147139

148140
<build>
149-
<sourceDirectory>src/main/java</sourceDirectory>
150-
<testSourceDirectory>src/test/java</testSourceDirectory>
151-
<testResources>
152-
<testResource>
153-
<directory>${basedir}/src/test/resources</directory>
154-
</testResource>
155-
</testResources>
156-
157141
<plugins>
158142
<plugin>
159143
<groupId>org.apache.maven.plugins</groupId>

‎sdk/storage/azure-storage-blob/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
</scm>
3434

3535
<properties>
36-
<src.dir>src/main/java</src.dir>
37-
<test.dir>src/test/java</test.dir>
3836
<AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
3937
<surefireXmx>8g</surefireXmx>
4038
<!-- 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. -->
@@ -174,12 +172,6 @@
174172
<version>1.14.8</version> <!-- {x-version-update;testdep_net.bytebuddy:byte-buddy-agent;external_dependency} -->
175173
<scope>test</scope>
176174
</dependency>
177-
<dependency>
178-
<groupId>org.slf4j</groupId>
179-
<artifactId>slf4j-simple</artifactId>
180-
<version>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
181-
<scope>test</scope>
182-
</dependency>
183175
<dependency>
184176
<groupId>com.azure</groupId>
185177
<artifactId>azure-core-http-okhttp</artifactId>
@@ -189,14 +181,6 @@
189181
</dependencies>
190182

191183
<build>
192-
<sourceDirectory>src/main/java</sourceDirectory>
193-
<testSourceDirectory>src/test/java</testSourceDirectory>
194-
<testResources>
195-
<testResource>
196-
<directory>${basedir}/src/test/resources</directory>
197-
</testResource>
198-
</testResources>
199-
200184
<plugins>
201185
<plugin>
202186
<groupId>org.apache.maven.plugins</groupId>

‎sdk/storage/azure-storage-common/pom.xml‎

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -107,31 +107,12 @@
107107
<version>3.4.34</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
108108
<scope>test</scope>
109109
</dependency>
110-
<dependency>
111-
<groupId>org.slf4j</groupId>
112-
<artifactId>slf4j-simple</artifactId>
113-
<version>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
114-
<scope>test</scope>
115-
</dependency>
116110
<dependency>
117111
<groupId>com.azure</groupId>
118112
<artifactId>azure-core-http-okhttp</artifactId>
119113
<version>1.11.18</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
120114
<scope>test</scope>
121115
</dependency>
122-
<dependency>
123-
<groupId>org.spockframework</groupId>
124-
<artifactId>spock-core</artifactId>
125-
<version>2.4-M1-groovy-4.0</version> <!-- {x-version-update;org.spockframework:spock-core;external_dependency} -->
126-
<scope>test</scope>
127-
</dependency>
128-
<!--The Groovy version that Spock Core brings in (4.0.6) does not support Java 21, so we need to override it with a version that does.-->
129-
<dependency>
130-
<groupId>org.apache.groovy</groupId>
131-
<artifactId>groovy</artifactId>
132-
<version>4.0.15</version> <!-- {x-version-update;org.apache.groovy:groovy;external_dependency} -->
133-
<scope>test</scope>
134-
</dependency>
135116
</dependencies>
136117

137118
<build>
@@ -201,77 +182,6 @@
201182
</rules>
202183
</configuration>
203184
</plugin>
204-
205-
<plugin>
206-
<groupId>org.codehaus.gmavenplus</groupId>
207-
<artifactId>gmavenplus-plugin</artifactId>
208-
<version>3.0.2</version> <!-- {x-version-update;org.codehaus.gmavenplus:gmavenplus-plugin;external_dependency} -->
209-
<executions>
210-
<execution>
211-
<goals>
212-
<goal>addTestSources</goal>
213-
<goal>generateTestStubs</goal>
214-
<goal>compileTests</goal>
215-
<goal>removeTestStubs</goal>
216-
</goals>
217-
<phase>test-compile</phase>
218-
</execution>
219-
</executions>
220-
<configuration>
221-
<skipTests>${skipTestCompile}</skipTests>
222-
<testSources>
223-
<testSource>
224-
<directory>${project.basedir}/src/test</directory>
225-
<includes>
226-
<include>**/*.groovy</include>
227-
</includes>
228-
</testSource>
229-
<testSource>
230-
<directory>${project.basedir}/src/test-shared</directory>
231-
<includes>
232-
<include>**/*.groovy</include>
233-
</includes>
234-
</testSource>
235-
</testSources>
236-
</configuration>
237-
</plugin>
238185
</plugins>
239186
</build>
240-
241-
<profiles>
242-
<profile>
243-
<id>java9plus</id>
244-
<activation>
245-
<jdk>[9,)</jdk>
246-
</activation>
247-
<dependencies>
248-
249-
</dependencies>
250-
<build>
251-
<plugins>
252-
<plugin>
253-
<groupId>org.apache.maven.plugins</groupId>
254-
<artifactId>maven-compiler-plugin</artifactId>
255-
<version>3.12.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
256-
<executions>
257-
<execution>
258-
<id>default-testCompile</id>
259-
<phase>process-test-sources</phase>
260-
<goals>
261-
<goal>testCompile</goal>
262-
</goals>
263-
<configuration>
264-
<failOnWarning>false</failOnWarning>
265-
<compilerArgs>
266-
<compilerArg>--add-reads</compilerArg>
267-
<compilerArg>com.azure.storage.common=java.desktop</compilerArg>
268-
</compilerArgs>
269-
</configuration>
270-
</execution>
271-
</executions>
272-
</plugin>
273-
</plugins>
274-
</build>
275-
</profile>
276-
</profiles>
277187
</project>

‎sdk/storage/azure-storage-file-datalake/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
</scm>
3434

3535
<properties>
36-
<src.dir>src/main/java</src.dir>
37-
<test.dir>src/test/java</test.dir>
3836
<AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>../azure-storage-common/ci.system.properties</AZURE_TEST_SYSTEM_PLAYBACK_PROPERTIES_FILE>
3937
<surefireXmx>4096m</surefireXmx>
4038
<!-- 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. -->
@@ -134,12 +132,6 @@
134132
<version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
135133
<scope>test</scope>
136134
</dependency>
137-
<dependency>
138-
<groupId>org.slf4j</groupId>
139-
<artifactId>slf4j-simple</artifactId>
140-
<version>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
141-
<scope>test</scope>
142-
</dependency>
143135
<dependency>
144136
<groupId>com.azure</groupId>
145137
<artifactId>azure-core-http-okhttp</artifactId>

‎sdk/storage/azure-storage-file-share/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,6 @@
137137
<version>12.26.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
138138
<scope>test</scope>
139139
</dependency>
140-
<dependency>
141-
<groupId>org.slf4j</groupId>
142-
<artifactId>slf4j-simple</artifactId>
143-
<version>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
144-
<scope>test</scope>
145-
</dependency>
146140
<dependency>
147141
<groupId>com.azure</groupId>
148142
<artifactId>azure-core-http-okhttp</artifactId>

‎sdk/storage/azure-storage-internal-avro/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,6 @@
100100
<type>test-jar</type>
101101
<scope>test</scope>
102102
</dependency>
103-
<dependency>
104-
<groupId>org.slf4j</groupId>
105-
<artifactId>slf4j-simple</artifactId>
106-
<version>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
107-
<scope>test</scope>
108-
</dependency>
109103
</dependencies>
110104

111105
<build>

‎sdk/storage/azure-storage-queue/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,6 @@
116116
<version>1.11.2</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
117117
<scope>test</scope>
118118
</dependency>
119-
<dependency>
120-
<groupId>org.slf4j</groupId>
121-
<artifactId>slf4j-simple</artifactId>
122-
<version>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
123-
<scope>test</scope>
124-
</dependency>
125119
<dependency>
126120
<groupId>com.azure</groupId>
127121
<artifactId>azure-core-http-okhttp</artifactId>

0 commit comments

Comments
 (0)