Skip to content

Commit 25bd0c6

Browse files
authored
Resolve From Source Compilation Failure Caused by Spark Modules (Azure#26628)
Resolve From Source Compilation Failure Caused by Spark Modules
1 parent 2442288 commit 25bd0c6

File tree

16 files changed

+800
-1340
lines changed

16 files changed

+800
-1340
lines changed

eng/.docsettings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ known_presence_issues:
4444
- ['sdk/cognitiveservices/ms-azure-cs-videosearch', '#2847']
4545
- ['sdk/cognitiveservices/ms-azure-cs-visualsearch', '#2847']
4646
- ['sdk/cognitiveservices/ms-azure-cs-websearch', '#2847']
47-
- ['sdk/cosmos/azure-cosmos-spark_3_2-12', '#2847']
4847
- ['sdk/eventhubs/microsoft-azure-eventhubs-extensions', '#2847']
4948
- ['sdk/keyvault/microsoft-azure-keyvault', '#2847']
5049
- ['sdk/keyvault/microsoft-azure-keyvault-core', '#2847']
@@ -111,6 +110,7 @@ known_content_issues:
111110
- ['sdk/cosmos/azure-cosmos-examples/README.md', '#3113']
112111
- ['sdk/cosmos/azure-cosmos/README.md', '#3113']
113112
- ['sdk/cosmos/azure-cosmos-encryption/README.md', '#3113']
113+
- ['sdk/cosmos/azure-cosmos-spark_3_2-12/README.md', '#3113']
114114
- ['sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md', '#3113']
115115
- ['sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md', '#3113']
116116
- ['sdk/cosmos/azure-cosmos-spark_3_2-12/dev/README.md', '#3113']

eng/pipelines/scripts/generate_overview_from_readme.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ def generate_overview(readme_file, version, overview_file_path):
3434
print('{} does not exist'.format(readme_file))
3535

3636
if overview_file_path:
37+
if not os.path.exists(overview_file_path):
38+
os.makedirs(overview_file_path)
3739
html_overview_file = overview_file_path + 'readme_overview.html'
3840
else:
3941
html_overview_file = str(readme_file).lower().replace('readme.md', 'readme_overview.html')

eng/pipelines/templates/jobs/ci.tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ parameters:
1919
default: []
2020
- name: BuildOptions
2121
type: string
22-
default: '$(DefaultOptions) -T 2C -DskipTests -Dgpg.skip -DtrimStackTrace=false -Dmaven.javadoc.skip=true -Dcodesnippet.skip=true -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -Djacoco.skip=true'
22+
default: '$(DefaultOptions) -T 2C --quiet -DskipTests -Dgpg.skip -DtrimStackTrace=false -Dmaven.javadoc.skip=true -Dcodesnippet.skip=true -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -Djacoco.skip=true'
2323
- name: TestOptions
2424
type: string
2525
default: '$(DefaultTestOptions) -Dparallel-test-playback -DAZURE_TEST_DEBUG=$(IsDebug)'

eng/pipelines/templates/jobs/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
inputs:
152152
mavenPomFile: pom.xml
153153
goals: 'deploy'
154-
options: '$(DefaultOptions) -T 1C -DskipTests -Dgenerate-overview -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -pl $(ProjectList) -am -DaltDeploymentRepository=id::default::file://$(System.DefaultWorkingDirectory)/build' # We include template-module so we ensure it always builds in CI
154+
options: '$(DefaultOptions) -T 1C --quiet -DskipTests -Dgenerate-overview -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -pl $(ProjectList) -am -DaltDeploymentRepository=id::default::file://$(System.DefaultWorkingDirectory)/build' # We include template-module so we ensure it always builds in CI
155155
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
156156
javaHomeOption: 'JDKVersion'
157157
jdkVersionOption: $(JavaBuildVersion)
@@ -300,7 +300,7 @@ jobs:
300300
inputs:
301301
mavenPomFile: pom.xml
302302
goals: 'install'
303-
options: '$(DefaultOptions) -T 2C -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcodesnippet.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am'
303+
options: '$(DefaultOptions) -T 2C --quiet -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcodesnippet.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am'
304304
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
305305
javaHomeOption: 'JDKVersion'
306306
jdkVersionOption: $(JavaBuildVersion)

eng/pipelines/templates/stages/cosmos-emulator-matrix.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"AdditionalArgs": "-DargLine=\"-DACCOUNT_HOST=https://localhost:8081/\""
3030
},
3131
"Spark Integration Tests targeting Cosmos Emulator'": {
32-
"ProfileFlag": "-PsparkE2E",
32+
"ProfileFlag": "-Dspark-e2e",
3333
"PROTOCOLS": "[\"Tcp\"]",
3434
"DESIRED_CONSISTENCIES": "[\"Session\"]",
3535
"AdditionalArgs": "-DargLine=\"-DACCOUNT_HOST=https://localhost:8081/ -Dhadoop.home.dir=D:/Hadoop\""

eng/scripts/generate_from_source_pom.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ def add_dependent(self, dependent: str):
4646

4747
# azure-client-sdk-parent, azure-perf-test-parent, spring-boot-starter-parent, and azure-spring-boot-test-parent are
4848
# valid parent POMs for Track 2 libraries.
49-
valid_parents = ['com.azure:azure-client-sdk-parent', 'com.azure:azure-perf-test-parent', 'org.springframework.boot:spring-boot-starter-parent', 'com.azure.spring:azure-spring-boot-test-parent']
49+
valid_parents = ['com.azure:azure-client-sdk-parent', 'com.azure:azure-perf-test-parent', 'org.springframework.boot:spring-boot-starter-parent', 'com.azure.spring:azure-spring-boot-test-parent', 'com.azure.cosmos.spark:azure-cosmos-spark_3_2-12']
5050

5151
# List of parent POMs that should be retained as projects to create a full from source POM.
52-
parent_pom_identifiers = ['com.azure:azure-sdk-parent', 'com.azure:azure-client-sdk-parent', 'com.azure:azure-perf-test-parent', 'com.azure.spring:azure-spring-boot-test-parent']
52+
parent_pom_identifiers = ['com.azure:azure-sdk-parent', 'com.azure:azure-client-sdk-parent', 'com.azure:azure-perf-test-parent', 'com.azure.spring:azure-spring-boot-test-parent', 'com.azure.cosmos.spark:azure-cosmos-spark_3_2-12']
5353

5454
# From this file get to the root path of the repo.
5555
root_path = os.path.normpath(os.path.abspath(__file__) + '/../../../')
@@ -109,7 +109,7 @@ def create_from_source_pom(project_list: str, set_pipeline_variable: str, set_sk
109109
add_source_projects(source_projects, dependent_modules, projects)
110110
add_source_projects(source_projects, dependency_modules, projects)
111111

112-
modules = list(set(sorted([p.module_path for p in source_projects])))
112+
modules = sorted(list(set([p.module_path for p in source_projects])))
113113
with open(file=client_from_source_pom_path, mode='w') as fromSourcePom:
114114
fromSourcePom.write(pom_file_start)
115115

eng/versioning/external_dependencies.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,8 @@ cosmos_org.scalatest:scalatest-maven-plugin;2.0.2
332332
cosmos_net.alchim31.maven:scala-maven-plugin;4.5.4
333333
cosmos_org.scalastyle:scalastyle-maven-plugin;1.0.0
334334
cosmos_org.apache.maven.plugins:maven-shade-plugin;1.2.7
335+
cosmos_org.codehaus.mojo:flatten-maven-plugin;1.2.7
336+
cosmos_com.coderplus.maven.plugins:copy-rename-maven-plugin;1.0.1
335337

336338
# sdk\core\azure-core-serializer-avro-jackson\pom.xml
337339
# This dependency is needed since Jackson Avro uses an older dependency on Apache Avro which is another library.

eng/versioning/version_client.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.19;1.0.0-beta.20
8181
com.azure:azure-cosmos;4.25.0;4.26.0-beta.1
8282
com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1
8383
com.azure:azure-cosmos-dotnet-benchmark;4.0.1-beta.1;4.0.1-beta.1
84+
com.azure.cosmos.spark:azure-cosmos-spark_3_2-12;1.0.0-beta.1;1.0.0-beta.1
8485
com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12;4.6.0-beta.1;4.6.0-beta.1
8586
com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12;4.6.0-beta.1;4.6.0-beta.1
8687
com.azure:azure-cosmos-encryption;1.0.0-beta.9;1.0.0-beta.10

sdk/communication/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.azure</groupId>
3333
<artifactId>azure-communication-chat</artifactId>
34-
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-communication-chat;current} -->
34+
<version>1.1.3</version> <!-- {x-version-update;com.azure:azure-communication-chat;current} -->
3535
</dependency>
3636
<dependency>
3737
<groupId>com.azure</groupId>

0 commit comments

Comments
 (0)