Merge pull request #1167 from microsoftgraph/dev

Merge dev to main

Author: andrueastman

.azure-pipelines/generation-pipeline.yml

@@ -434,59 +434,6 @@ stages:
             repoName: msgraph-beta-sdk-ruby
             barrelFileName: microsoft_graph_beta.rb
 
-
-- stage: stage_java_v1
-  dependsOn:
-  - stage_build_and_publish_typewriter
-  - stage_v1_metadata
-  condition: |
-    and
-    (
-      eq(dependencies.stage_build_and_publish_typewriter.result, 'Succeeded'),
-      in(dependencies.stage_v1_metadata.result, 'Succeeded', 'Skipped')
-    )
-  jobs:
-  - job: java_v1
-    steps:
-    - template: generation-templates/language-generation.yml
-      parameters:
-        language: 'Java'
-        version: ''
-        repoName: 'msgraph-sdk-java'
-        branchName: $(v1Branch)
-        cleanMetadataFile: $(cleanMetadataFileV1)
-        cleanMetadataFolder: $(cleanMetadataFolderV1)
-        languageSpecificSteps:
-        - template: generation-templates/java.yml
-          parameters:
-            repoName: msgraph-sdk-java
-
-- stage: stage_java_beta
-  dependsOn:
-  - stage_build_and_publish_typewriter
-  - stage_beta_metadata
-  condition: |
-    and
-    (
-      eq(dependencies.stage_build_and_publish_typewriter.result, 'Succeeded'),
-      in(dependencies.stage_beta_metadata.result, 'Succeeded', 'Skipped')
-    )
-  jobs:
-  - job: java_beta
-    steps:
-    - template: generation-templates/language-generation.yml
-      parameters:
-        language: 'Java'
-        version: 'Beta'
-        repoName: 'msgraph-beta-sdk-java'
-        branchName: $(betaBranch)
-        cleanMetadataFile: $(cleanMetadataFileBeta)
-        cleanMetadataFolder: $(cleanMetadataFolderBeta)
-        languageSpecificSteps:
-        - template: generation-templates/java.yml
-          parameters:
-            repoName: msgraph-beta-sdk-java
-
 - stage: stage_java_v1_kiota
   dependsOn:
   - stage_build_and_publish_kiota
@@ -505,8 +452,8 @@ stages:
         language: 'java'
         version: ''
         repoName: 'msgraph-sdk-java'
-        baseBranchName: 'feature/6.0'
-        branchName: 'kiota/$(v1Branch)'
+        baseBranchName: 'dev'
+        branchName: '$(v1Branch)'
         targetClassName: "BaseGraphServiceClient"
         targetNamespace: "com.Microsoft.Graph"
         cleanMetadataFolder: $(cleanOpenAPIFolderV1)
@@ -535,8 +482,8 @@ stages:
         language: 'java'
         version: 'beta'
         repoName: 'msgraph-beta-sdk-java'
-        baseBranchName: 'feature/6.0'
-        branchName: 'kiota/$(betaBranch)'
+        baseBranchName: 'dev'
+        branchName: '$(betaBranch)'
         targetClassName: "BaseGraphServiceClient"
         targetNamespace: "com.Microsoft.Graph.Beta"
         cleanMetadataFolder: $(cleanOpenAPIFolderBeta)