From 81fac40c711ab19f223ed265fbc9a1ddfd4dc875 Mon Sep 17 00:00:00 2001
From: praveenkuttappan <prmarott@microsoft.com>
Date: Tue, 30 Mar 2021 11:06:12 -0700
Subject: [PATCH 1/9] Add API status check

---
 eng/common/scripts/Prepare-Release.ps1 | 58 +++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/eng/common/scripts/Prepare-Release.ps1 b/eng/common/scripts/Prepare-Release.ps1
index 2c7b6152204..3751ee1ecf2 100644
--- a/eng/common/scripts/Prepare-Release.ps1
+++ b/eng/common/scripts/Prepare-Release.ps1
@@ -64,6 +64,55 @@ function Get-ReleaseDay($baseDate)
   return $baseDate;
 }
 
+function Check-ApiReviewStatus($packageName, $language)
+{
+  # Get API view URL and API Key to check status
+  Login-AzAccount
+  $url = Get-AzKeyvaultSecret -VaultName "AzureSDKPrepRelease-KV" -Name APIURL -AsPlainText
+  $apiKey = Get-AzKeyvaultSecret -VaultName "AzureSDKPrepRelease-KV" -Name APIKEY -AsPlainText
+
+  $lang = $language
+  # Update language name to match those in API cosmos DB. Cosmos SQL is case sensitive and handling this within the query makes it slow.
+  if($lang -eq 'javascript'){
+    $lang = "JavaScript"
+  }
+  elseif ($lang -eq "dotnet"){
+    $lang = "C#"
+  }
+  elseif ($lang -eq "java"){
+    $lang = "Java"
+  }
+  elseif ($lang -eq "python"){
+    $lang = "Python"
+  }
+
+  $headers = @{ "ApiKey" = $apiKey }
+  $body = @{
+    language = $lang
+    packageName = $packageName
+  }
+
+  try
+  {
+    $Response = Invoke-WebRequest $url -Method 'GET' -Headers $headers -Body $body
+    Write-Host "Response: $($Response.Content)"
+    if ($Response.StatusCode -eq '200')
+    {
+      Write-Host "API Review is approved for package $($packageName)"
+    }
+    else
+    {
+      Write-Error "API Review is not approved for package $($packageName). Please get automatic API review approved by architects."
+      Write-Host "You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
+    }
+  }
+  catch
+  {
+    Write-Host "Exception details: $($_.Exception.Response)"
+    Write-Host "Failed to check API review status for package $($PackageName). You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
+  }
+}
+
 $ErrorPreference = 'Stop'
 
 $packageProperties = $null
@@ -127,7 +176,14 @@ if ($null -eq $newVersionParsed)
   exit 1
 }
 
-&$EngCommonScriptsDir/Update-DevOps-Release-WorkItem.ps1 `
+# Check API status if version is GA
+if (-not $newVersionParsed.IsPrerelease)
+{
+  Check-ApiReviewStatus -PackageName $packageProperties.Name -Language $LanguageDisplayName
+}
+
+exit 0
+##&$EngCommonScriptsDir/Update-DevOps-Release-WorkItem.ps1 `
   -language $LanguageDisplayName `
   -packageName $packageProperties.Name `
   -version $newVersion `

From c557dbeddf387d52f9b041b4f4c11a5d81033dcd Mon Sep 17 00:00:00 2001
From: praveenkuttappan <prmarott@microsoft.com>
Date: Wed, 19 May 2021 12:24:37 -0400
Subject: [PATCH 2/9] Revert temp change

---
 eng/common/scripts/Prepare-Release.ps1 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eng/common/scripts/Prepare-Release.ps1 b/eng/common/scripts/Prepare-Release.ps1
index 3751ee1ecf2..4dd24190d5e 100644
--- a/eng/common/scripts/Prepare-Release.ps1
+++ b/eng/common/scripts/Prepare-Release.ps1
@@ -182,8 +182,7 @@ if (-not $newVersionParsed.IsPrerelease)
   Check-ApiReviewStatus -PackageName $packageProperties.Name -Language $LanguageDisplayName
 }
 
-exit 0
-##&$EngCommonScriptsDir/Update-DevOps-Release-WorkItem.ps1 `
+&$EngCommonScriptsDir/Update-DevOps-Release-WorkItem.ps1 `
   -language $LanguageDisplayName `
   -packageName $packageProperties.Name `
   -version $newVersion `

From 6420f9c0865f8ef2e268581a5d131f4cceec5b34 Mon Sep 17 00:00:00 2001
From: praveenkuttappan <prmarott@microsoft.com>
Date: Thu, 20 May 2021 10:13:21 -0400
Subject: [PATCH 3/9] Update as per review comments

---
 eng/common/scripts/Prepare-Release.ps1 | 56 ++++----------------------
 eng/common/scripts/apiview-helper.ps1  | 56 ++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 49 deletions(-)
 create mode 100644 eng/common/scripts/apiview-helper.ps1

diff --git a/eng/common/scripts/Prepare-Release.ps1 b/eng/common/scripts/Prepare-Release.ps1
index 4dd24190d5e..4155109b144 100644
--- a/eng/common/scripts/Prepare-Release.ps1
+++ b/eng/common/scripts/Prepare-Release.ps1
@@ -49,6 +49,7 @@ param(
 Set-StrictMode -Version 3
 
 . ${PSScriptRoot}\common.ps1
+. ${PSScriptRoot}\apiview-helper.ps1
 
 function Get-ReleaseDay($baseDate)
 {
@@ -64,54 +65,6 @@ function Get-ReleaseDay($baseDate)
   return $baseDate;
 }
 
-function Check-ApiReviewStatus($packageName, $language)
-{
-  # Get API view URL and API Key to check status
-  Login-AzAccount
-  $url = Get-AzKeyvaultSecret -VaultName "AzureSDKPrepRelease-KV" -Name APIURL -AsPlainText
-  $apiKey = Get-AzKeyvaultSecret -VaultName "AzureSDKPrepRelease-KV" -Name APIKEY -AsPlainText
-
-  $lang = $language
-  # Update language name to match those in API cosmos DB. Cosmos SQL is case sensitive and handling this within the query makes it slow.
-  if($lang -eq 'javascript'){
-    $lang = "JavaScript"
-  }
-  elseif ($lang -eq "dotnet"){
-    $lang = "C#"
-  }
-  elseif ($lang -eq "java"){
-    $lang = "Java"
-  }
-  elseif ($lang -eq "python"){
-    $lang = "Python"
-  }
-
-  $headers = @{ "ApiKey" = $apiKey }
-  $body = @{
-    language = $lang
-    packageName = $packageName
-  }
-
-  try
-  {
-    $Response = Invoke-WebRequest $url -Method 'GET' -Headers $headers -Body $body
-    Write-Host "Response: $($Response.Content)"
-    if ($Response.StatusCode -eq '200')
-    {
-      Write-Host "API Review is approved for package $($packageName)"
-    }
-    else
-    {
-      Write-Error "API Review is not approved for package $($packageName). Please get automatic API review approved by architects."
-      Write-Host "You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
-    }
-  }
-  catch
-  {
-    Write-Host "Exception details: $($_.Exception.Response)"
-    Write-Host "Failed to check API review status for package $($PackageName). You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
-  }
-}
 
 $ErrorPreference = 'Stop'
 
@@ -179,7 +132,12 @@ if ($null -eq $newVersionParsed)
 # Check API status if version is GA
 if (-not $newVersionParsed.IsPrerelease)
 {
-  Check-ApiReviewStatus -PackageName $packageProperties.Name -Language $LanguageDisplayName
+  $isApproved = Check-ApiReviewStatus -PackageName $packageProperties.Name -Language $LanguageDisplayName
+  if (-not $isApproved)
+  {
+    Write-Error "API review is not approved in APIView system."
+    exit 1
+  }
 }
 
 &$EngCommonScriptsDir/Update-DevOps-Release-WorkItem.ps1 `
diff --git a/eng/common/scripts/apiview-helper.ps1 b/eng/common/scripts/apiview-helper.ps1
new file mode 100644
index 00000000000..2cfec18904f
--- /dev/null
+++ b/eng/common/scripts/apiview-helper.ps1
@@ -0,0 +1,56 @@
+
+
+function Map-LanguageToAPiview-Filter($language)
+{
+    $lang = $language
+    # Update language name to match those in API cosmos DB. Cosmos SQL is case sensitive and handling this within the query makes it slow.
+    if($lang -eq 'javascript'){
+        $lang = "JavaScript"
+    }
+    elseif ($lang -eq "dotnet"){
+        $lang = "C#"
+    }
+    elseif ($lang -eq "java"){
+        $lang = "Java"
+    }
+    elseif ($lang -eq "python"){
+        $lang = "Python"
+    }
+    return $lang
+}
+
+function Check-ApiReviewStatus($packageName, $language)
+{
+  # Get API view URL and API Key to check status
+  Login-AzAccount
+  $url = Get-AzKeyvaultSecret -VaultName "AzureSDKPrepRelease-KV" -Name APIURL -AsPlainText
+  $apiKey = Get-AzKeyvaultSecret -VaultName "AzureSDKPrepRelease-KV" -Name APIKEY -AsPlainText
+
+  $lang = Map-LanguageToAPiview-Filter -language $language
+  $headers = @{ "ApiKey" = $apiKey }
+  $body = @{
+    language = $lang
+    packageName = $packageName
+  }
+
+  try
+  {
+    $Response = Invoke-WebRequest $url -Method 'GET' -Headers $headers -Body $body
+    if ($Response.StatusCode -eq '200')
+    {
+      Write-Host "API Review is approved for package $($packageName)"
+      return $true
+    }
+    else
+    {
+      Write-Host "API Review is not approved for package $($packageName). Please get automatic API review approved by architects."
+      Write-Host "You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
+    }
+  }
+  catch
+  {
+    Write-Host "Exception details: $($_.Exception.Response)"
+    Write-Host "Failed to check API review status for package $($PackageName). You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
+  }
+  return $false
+}
\ No newline at end of file

From c432ec8da1a3270ec9c4bc5bc4236406650e26c4 Mon Sep 17 00:00:00 2001
From: praveenkuttappan <prmarott@microsoft.com>
Date: Thu, 20 May 2021 12:00:09 -0400
Subject: [PATCH 4/9] Removed blank line

---
 eng/common/scripts/Prepare-Release.ps1 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/common/scripts/Prepare-Release.ps1 b/eng/common/scripts/Prepare-Release.ps1
index 4155109b144..81d03d0b3bf 100644
--- a/eng/common/scripts/Prepare-Release.ps1
+++ b/eng/common/scripts/Prepare-Release.ps1
@@ -65,7 +65,6 @@ function Get-ReleaseDay($baseDate)
   return $baseDate;
 }
 
-
 $ErrorPreference = 'Stop'
 
 $packageProperties = $null

From d7e18dd34e852a98f3bdd5526ffbd0c5d5559423 Mon Sep 17 00:00:00 2001
From: praveenkuttappan <prmarott@microsoft.com>
Date: Mon, 24 May 2021 12:58:03 -0400
Subject: [PATCH 5/9] Review comments to use az cli

---
 .../ApiView-Helpers.ps1}                      | 22 +++++++++++------
 eng/common/scripts/Prepare-Release.ps1        | 24 +++++++++----------
 2 files changed, 27 insertions(+), 19 deletions(-)
 rename eng/common/scripts/{apiview-helper.ps1 => Helpers/ApiView-Helpers.ps1} (67%)

diff --git a/eng/common/scripts/apiview-helper.ps1 b/eng/common/scripts/Helpers/ApiView-Helpers.ps1
similarity index 67%
rename from eng/common/scripts/apiview-helper.ps1
rename to eng/common/scripts/Helpers/ApiView-Helpers.ps1
index 2cfec18904f..fdeac61677c 100644
--- a/eng/common/scripts/apiview-helper.ps1
+++ b/eng/common/scripts/Helpers/ApiView-Helpers.ps1
@@ -1,5 +1,3 @@
-
-
 function Map-LanguageToAPiview-Filter($language)
 {
     $lang = $language
@@ -19,18 +17,28 @@ function Map-LanguageToAPiview-Filter($language)
     return $lang
 }
 
-function Check-ApiReviewStatus($packageName, $language)
+function Check-ApiReviewStatus($packageName, $packageVersion, $language)
 {
   # Get API view URL and API Key to check status
-  Login-AzAccount
-  $url = Get-AzKeyvaultSecret -VaultName "AzureSDKPrepRelease-KV" -Name APIURL -AsPlainText
-  $apiKey = Get-AzKeyvaultSecret -VaultName "AzureSDKPrepRelease-KV" -Name APIKEY -AsPlainText
-
+  Write-Host "Checking API review status"
+  try
+  {
+    az login -o none
+    $url = az keyvault secret show --name "APIURL" --vault-name "AzureSDKPrepRelease-KV" --query "value" --output "tsv"
+    $apiKey = az keyvault secret show --name "APIKEY" --vault-name "AzureSDKPrepRelease-KV" --query "value" --output "tsv"
+  }
+  catch
+  {
+    Write-Host "Failed to get APIView URL and API Key from Keyvault AzureSDKPrepRelease-KV. Please check and ensure you have access to this Keyvault as reader."
+    Write-Host "You can check http://aka.ms/azsdk/engsys/apireview/faq for more details."
+  }
+  
   $lang = Map-LanguageToAPiview-Filter -language $language
   $headers = @{ "ApiKey" = $apiKey }
   $body = @{
     language = $lang
     packageName = $packageName
+    packageVersion = $packageVersion
   }
 
   try
diff --git a/eng/common/scripts/Prepare-Release.ps1 b/eng/common/scripts/Prepare-Release.ps1
index 81d03d0b3bf..5485b6c7eac 100644
--- a/eng/common/scripts/Prepare-Release.ps1
+++ b/eng/common/scripts/Prepare-Release.ps1
@@ -49,7 +49,7 @@ param(
 Set-StrictMode -Version 3
 
 . ${PSScriptRoot}\common.ps1
-. ${PSScriptRoot}\apiview-helper.ps1
+. ${PSScriptRoot}\Helpers\ApiView-Helpers.ps1
 
 function Get-ReleaseDay($baseDate)
 {
@@ -128,17 +128,6 @@ if ($null -eq $newVersionParsed)
   exit 1
 }
 
-# Check API status if version is GA
-if (-not $newVersionParsed.IsPrerelease)
-{
-  $isApproved = Check-ApiReviewStatus -PackageName $packageProperties.Name -Language $LanguageDisplayName
-  if (-not $isApproved)
-  {
-    Write-Error "API review is not approved in APIView system."
-    exit 1
-  }
-}
-
 &$EngCommonScriptsDir/Update-DevOps-Release-WorkItem.ps1 `
   -language $LanguageDisplayName `
   -packageName $packageProperties.Name `
@@ -153,6 +142,17 @@ if ($LASTEXITCODE -ne 0) {
   exit 1
 }
 
+# Check API status if version is GA
+if (!$newVersionParsed.IsPrerelease)
+{
+  $isApproved = Check-ApiReviewStatus -PackageName $packageProperties.Name -packageVersion $newVersion -Language $LanguageDisplayName
+  if (!$isApproved)
+  {
+    Write-Error "API review is not approved in APIView system."
+    exit 1
+  }
+}
+
 if ($releaseTrackingOnly)
 {
   Write-Host

From 967ea860f4fd1ae2c7feff89cadf6103a43bbae6 Mon Sep 17 00:00:00 2001
From: praveenkuttappan <prmarott@microsoft.com>
Date: Tue, 25 May 2021 09:40:20 -0400
Subject: [PATCH 6/9] Changes to move az cli commands to caller script and
 other review comments

---
 .../scripts/Helpers/ApiView-Helpers.ps1       | 28 +++++--------------
 eng/common/scripts/Prepare-Release.ps1        | 19 +++++++++----
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/eng/common/scripts/Helpers/ApiView-Helpers.ps1 b/eng/common/scripts/Helpers/ApiView-Helpers.ps1
index fdeac61677c..63b126ad2c8 100644
--- a/eng/common/scripts/Helpers/ApiView-Helpers.ps1
+++ b/eng/common/scripts/Helpers/ApiView-Helpers.ps1
@@ -1,4 +1,4 @@
-function Map-LanguageToAPiview-Filter($language)
+function MapLanguageName($language)
 {
     $lang = $language
     # Update language name to match those in API cosmos DB. Cosmos SQL is case sensitive and handling this within the query makes it slow.
@@ -17,23 +17,11 @@ function Map-LanguageToAPiview-Filter($language)
     return $lang
 }
 
-function Check-ApiReviewStatus($packageName, $packageVersion, $language)
+function Check-ApiReviewStatus($packageName, $packageVersion, $language, $url, $apiKey)
 {
   # Get API view URL and API Key to check status
   Write-Host "Checking API review status"
-  try
-  {
-    az login -o none
-    $url = az keyvault secret show --name "APIURL" --vault-name "AzureSDKPrepRelease-KV" --query "value" --output "tsv"
-    $apiKey = az keyvault secret show --name "APIKEY" --vault-name "AzureSDKPrepRelease-KV" --query "value" --output "tsv"
-  }
-  catch
-  {
-    Write-Host "Failed to get APIView URL and API Key from Keyvault AzureSDKPrepRelease-KV. Please check and ensure you have access to this Keyvault as reader."
-    Write-Host "You can check http://aka.ms/azsdk/engsys/apireview/faq for more details."
-  }
-  
-  $lang = Map-LanguageToAPiview-Filter -language $language
+  $lang = MapLanguageName -language $language
   $headers = @{ "ApiKey" = $apiKey }
   $body = @{
     language = $lang
@@ -43,22 +31,20 @@ function Check-ApiReviewStatus($packageName, $packageVersion, $language)
 
   try
   {
-    $Response = Invoke-WebRequest $url -Method 'GET' -Headers $headers -Body $body
-    if ($Response.StatusCode -eq '200')
+    $response = Invoke-WebRequest $url -Method 'GET' -Headers $headers -Body $body
+    if ($response.StatusCode -eq '200')
     {
       Write-Host "API Review is approved for package $($packageName)"
-      return $true
     }
     else
     {
-      Write-Host "API Review is not approved for package $($packageName). Please get automatic API review approved by architects."
+      Write-Warning "API Review is not approved for package $($packageName). Release pipeline will fail if API review is not approved."
       Write-Host "You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
     }
   }
   catch
   {
     Write-Host "Exception details: $($_.Exception.Response)"
-    Write-Host "Failed to check API review status for package $($PackageName). You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
+    Write-Warning "Failed to check API review status for package $($PackageName). You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
   }
-  return $false
 }
\ No newline at end of file
diff --git a/eng/common/scripts/Prepare-Release.ps1 b/eng/common/scripts/Prepare-Release.ps1
index 5485b6c7eac..eed113299a2 100644
--- a/eng/common/scripts/Prepare-Release.ps1
+++ b/eng/common/scripts/Prepare-Release.ps1
@@ -144,12 +144,21 @@ if ($LASTEXITCODE -ne 0) {
 
 # Check API status if version is GA
 if (!$newVersionParsed.IsPrerelease)
-{
-  $isApproved = Check-ApiReviewStatus -PackageName $packageProperties.Name -packageVersion $newVersion -Language $LanguageDisplayName
-  if (!$isApproved)
+{ 
+  try
+  {
+    az account show *> $null
+    if (!$?) {
+      Write-Host 'Running az login...'
+      az login *> $null
+    }
+    $url = az keyvault secret show --name "APIURL" --vault-name "AzureSDKPrepRelease-KV" --query "value" --output "tsv"
+    $apiKey = az keyvault secret show --name "APIKEY" --vault-name "AzureSDKPrepRelease-KV" --query "value" --output "tsv"
+    Check-ApiReviewStatus -PackageName $packageProperties.Name -packageVersion $newVersion -Language $LanguageDisplayName -url $url -apiKey $apiKey
+  }
+  catch
   {
-    Write-Error "API review is not approved in APIView system."
-    exit 1
+    Write-Warning "Failed to get APIView URL and API Key from Keyvault AzureSDKPrepRelease-KV. Please check and ensure you have access to this Keyvault as reader."
   }
 }
 

From f5b50b33cdbe355a0c009e7855f4c337692bfafe Mon Sep 17 00:00:00 2001
From: praveenkuttappan <prmarott@microsoft.com>
Date: Wed, 26 May 2021 22:10:47 -0400
Subject: [PATCH 7/9] Skip languages that's not supported in APIView

---
 eng/common/scripts/Helpers/ApiView-Helpers.ps1 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eng/common/scripts/Helpers/ApiView-Helpers.ps1 b/eng/common/scripts/Helpers/ApiView-Helpers.ps1
index 63b126ad2c8..c9d9b1c07e3 100644
--- a/eng/common/scripts/Helpers/ApiView-Helpers.ps1
+++ b/eng/common/scripts/Helpers/ApiView-Helpers.ps1
@@ -14,7 +14,7 @@ function MapLanguageName($language)
     elseif ($lang -eq "python"){
         $lang = "Python"
     }
-    return $lang
+    return $null
 }
 
 function Check-ApiReviewStatus($packageName, $packageVersion, $language, $url, $apiKey)
@@ -22,6 +22,9 @@ function Check-ApiReviewStatus($packageName, $packageVersion, $language, $url, $
   # Get API view URL and API Key to check status
   Write-Host "Checking API review status"
   $lang = MapLanguageName -language $language
+  if ($lang -eq $null) {
+    return
+  }
   $headers = @{ "ApiKey" = $apiKey }
   $body = @{
     language = $lang
@@ -44,7 +47,6 @@ function Check-ApiReviewStatus($packageName, $packageVersion, $language, $url, $
   }
   catch
   {
-    Write-Host "Exception details: $($_.Exception.Response)"
     Write-Warning "Failed to check API review status for package $($PackageName). You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
   }
 }
\ No newline at end of file

From 2fe46b0349c643f5c695fa9198f608b5a8292e12 Mon Sep 17 00:00:00 2001
From: praveenkuttappan <prmarott@microsoft.com>
Date: Thu, 27 May 2021 17:00:16 -0400
Subject: [PATCH 8/9] Fix bug in language mapping

---
 .../scripts/Helpers/ApiView-Helpers.ps1       |  5 +-
 .../snippet-replacer-maven-plugin/.classpath  | 50 +++++++++++++++++++
 .../.factorypath                              | 32 ++++++++++++
 .../snippet-replacer-maven-plugin/.project    | 34 +++++++++++++
 .../org.eclipse.core.resources.prefs          |  5 ++
 .../.settings/org.eclipse.jdt.apt.core.prefs  |  4 ++
 .../.settings/org.eclipse.jdt.core.prefs      |  9 ++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 src/java/apiview-java-processor/.classpath    | 44 ++++++++++++++++
 src/java/apiview-java-processor/.project      | 34 +++++++++++++
 .../org.eclipse.core.resources.prefs          |  3 ++
 .../.settings/org.eclipse.jdt.apt.core.prefs  |  2 +
 .../.settings/org.eclipse.jdt.core.prefs      |  9 ++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 14 files changed, 238 insertions(+), 1 deletion(-)
 create mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.classpath
 create mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.factorypath
 create mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.project
 create mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.core.resources.prefs
 create mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs
 create mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 src/java/apiview-java-processor/.classpath
 create mode 100644 src/java/apiview-java-processor/.project
 create mode 100644 src/java/apiview-java-processor/.settings/org.eclipse.core.resources.prefs
 create mode 100644 src/java/apiview-java-processor/.settings/org.eclipse.jdt.apt.core.prefs
 create mode 100644 src/java/apiview-java-processor/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 src/java/apiview-java-processor/.settings/org.eclipse.m2e.core.prefs

diff --git a/eng/common/scripts/Helpers/ApiView-Helpers.ps1 b/eng/common/scripts/Helpers/ApiView-Helpers.ps1
index c9d9b1c07e3..3be12566e23 100644
--- a/eng/common/scripts/Helpers/ApiView-Helpers.ps1
+++ b/eng/common/scripts/Helpers/ApiView-Helpers.ps1
@@ -14,7 +14,10 @@ function MapLanguageName($language)
     elseif ($lang -eq "python"){
         $lang = "Python"
     }
-    return $null
+    else{
+      $lang = $null
+    }
+    return $lang
 }
 
 function Check-ApiReviewStatus($packageName, $packageVersion, $language, $url, $apiKey)
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.classpath b/packages/java-packages/snippet-replacer-maven-plugin/.classpath
new file mode 100644
index 00000000000..5c8072ecc61
--- /dev/null
+++ b/packages/java-packages/snippet-replacer-maven-plugin/.classpath
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.factorypath b/packages/java-packages/snippet-replacer-maven-plugin/.factorypath
new file mode 100644
index 00000000000..e1616a4b67d
--- /dev/null
+++ b/packages/java-packages/snippet-replacer-maven-plugin/.factorypath
@@ -0,0 +1,32 @@
+<factorypath>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-plugin-api/3.3.9/maven-plugin-api-3.3.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.2/org.eclipse.sisu.plexus-0.3.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.2/org.eclipse.sisu.inject-0.3.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-core/3.3.9/maven-core-3.3.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-settings/3.3.9/maven-settings-3.3.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-settings-builder/3.3.9/maven-settings-builder-3.3.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/guava/18.0/guava-18.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/aether/aether-spi/1.0.2.v20150114/aether-spi-1.0.2.v20150114.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/aether/aether-impl/1.0.2.v20150114/aether-impl-1.0.2.v20150114.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/aether/aether-api/1.0.2.v20150114/aether-api-1.0.2.v20150114.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/aether/aether-util/1.0.2.v20150114/aether-util-1.0.2.v20150114.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/inject/guice/4.0/guice-4.0-no_aop.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/plugin-tools/maven-plugin-annotations/3.6.0/maven-plugin-annotations-3.6.0.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.project b/packages/java-packages/snippet-replacer-maven-plugin/.project
new file mode 100644
index 00000000000..90ae0b7bda2
--- /dev/null
+++ b/packages/java-packages/snippet-replacer-maven-plugin/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>snippet-replacer-maven-plugin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1622062742819</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.core.resources.prefs b/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..cdfe4f1b669
--- /dev/null
+++ b/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs b/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 00000000000..687ad91a74c
--- /dev/null
+++ b/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.genSrcDir=target\\generated-sources\\annotations
+org.eclipse.jdt.apt.genTestSrcDir=target\\generated-test-sources\\test-annotations
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.core.prefs b/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..90f7a5b4252
--- /dev/null
+++ b/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=enabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.m2e.core.prefs b/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/src/java/apiview-java-processor/.classpath b/src/java/apiview-java-processor/.classpath
new file mode 100644
index 00000000000..f0257c5a541
--- /dev/null
+++ b/src/java/apiview-java-processor/.classpath
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/src/java/apiview-java-processor/.project b/src/java/apiview-java-processor/.project
new file mode 100644
index 00000000000..e613d4e5395
--- /dev/null
+++ b/src/java/apiview-java-processor/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>apiview-java-processor</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1622062742811</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/src/java/apiview-java-processor/.settings/org.eclipse.core.resources.prefs b/src/java/apiview-java-processor/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..e9441bb123e
--- /dev/null
+++ b/src/java/apiview-java-processor/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/src/java/apiview-java-processor/.settings/org.eclipse.jdt.apt.core.prefs b/src/java/apiview-java-processor/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 00000000000..d4313d4b25e
--- /dev/null
+++ b/src/java/apiview-java-processor/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/src/java/apiview-java-processor/.settings/org.eclipse.jdt.core.prefs b/src/java/apiview-java-processor/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..1b6e1ef22f9
--- /dev/null
+++ b/src/java/apiview-java-processor/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/src/java/apiview-java-processor/.settings/org.eclipse.m2e.core.prefs b/src/java/apiview-java-processor/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/src/java/apiview-java-processor/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

From 868956f842142fef82fa66e04b27123ac49b4557 Mon Sep 17 00:00:00 2001
From: praveenkuttappan <prmarott@microsoft.com>
Date: Thu, 27 May 2021 17:02:36 -0400
Subject: [PATCH 9/9] Reverted accidental changes in temp files

---
 .../snippet-replacer-maven-plugin/.classpath  | 50 -------------------
 .../.factorypath                              | 32 ------------
 .../snippet-replacer-maven-plugin/.project    | 34 -------------
 .../org.eclipse.core.resources.prefs          |  5 --
 .../.settings/org.eclipse.jdt.apt.core.prefs  |  4 --
 .../.settings/org.eclipse.jdt.core.prefs      |  9 ----
 .../.settings/org.eclipse.m2e.core.prefs      |  4 --
 src/java/apiview-java-processor/.classpath    | 44 ----------------
 src/java/apiview-java-processor/.project      | 34 -------------
 .../org.eclipse.core.resources.prefs          |  3 --
 .../.settings/org.eclipse.jdt.apt.core.prefs  |  2 -
 .../.settings/org.eclipse.jdt.core.prefs      |  9 ----
 .../.settings/org.eclipse.m2e.core.prefs      |  4 --
 13 files changed, 234 deletions(-)
 delete mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.classpath
 delete mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.factorypath
 delete mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.project
 delete mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs
 delete mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 src/java/apiview-java-processor/.classpath
 delete mode 100644 src/java/apiview-java-processor/.project
 delete mode 100644 src/java/apiview-java-processor/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 src/java/apiview-java-processor/.settings/org.eclipse.jdt.apt.core.prefs
 delete mode 100644 src/java/apiview-java-processor/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 src/java/apiview-java-processor/.settings/org.eclipse.m2e.core.prefs

diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.classpath b/packages/java-packages/snippet-replacer-maven-plugin/.classpath
deleted file mode 100644
index 5c8072ecc61..00000000000
--- a/packages/java-packages/snippet-replacer-maven-plugin/.classpath
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="target/generated-sources/annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.factorypath b/packages/java-packages/snippet-replacer-maven-plugin/.factorypath
deleted file mode 100644
index e1616a4b67d..00000000000
--- a/packages/java-packages/snippet-replacer-maven-plugin/.factorypath
+++ /dev/null
@@ -1,32 +0,0 @@
-<factorypath>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-plugin-api/3.3.9/maven-plugin-api-3.3.9.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.2/org.eclipse.sisu.plexus-0.3.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.2/org.eclipse.sisu.inject-0.3.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-core/3.3.9/maven-core-3.3.9.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-settings/3.3.9/maven-settings-3.3.9.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-settings-builder/3.3.9/maven-settings-builder-3.3.9.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/guava/18.0/guava-18.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/aether/aether-spi/1.0.2.v20150114/aether-spi-1.0.2.v20150114.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/aether/aether-impl/1.0.2.v20150114/aether-impl-1.0.2.v20150114.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/aether/aether-api/1.0.2.v20150114/aether-api-1.0.2.v20150114.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/aether/aether-util/1.0.2.v20150114/aether-util-1.0.2.v20150114.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/inject/guice/4.0/guice-4.0-no_aop.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/plugin-tools/maven-plugin-annotations/3.6.0/maven-plugin-annotations-3.6.0.jar" enabled="true" runInBatchMode="false"/>
-</factorypath>
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.project b/packages/java-packages/snippet-replacer-maven-plugin/.project
deleted file mode 100644
index 90ae0b7bda2..00000000000
--- a/packages/java-packages/snippet-replacer-maven-plugin/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>snippet-replacer-maven-plugin</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1622062742819</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.core.resources.prefs b/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index cdfe4f1b669..00000000000
--- a/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs b/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs
deleted file mode 100644
index 687ad91a74c..00000000000
--- a/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.apt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=true
-org.eclipse.jdt.apt.genSrcDir=target\\generated-sources\\annotations
-org.eclipse.jdt.apt.genTestSrcDir=target\\generated-test-sources\\test-annotations
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.core.prefs b/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 90f7a5b4252..00000000000
--- a/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.processAnnotations=enabled
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.m2e.core.prefs b/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb2..00000000000
--- a/packages/java-packages/snippet-replacer-maven-plugin/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/src/java/apiview-java-processor/.classpath b/src/java/apiview-java-processor/.classpath
deleted file mode 100644
index f0257c5a541..00000000000
--- a/src/java/apiview-java-processor/.classpath
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="target/generated-sources/annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/src/java/apiview-java-processor/.project b/src/java/apiview-java-processor/.project
deleted file mode 100644
index e613d4e5395..00000000000
--- a/src/java/apiview-java-processor/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>apiview-java-processor</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1622062742811</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
diff --git a/src/java/apiview-java-processor/.settings/org.eclipse.core.resources.prefs b/src/java/apiview-java-processor/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index e9441bb123e..00000000000
--- a/src/java/apiview-java-processor/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/src/java/apiview-java-processor/.settings/org.eclipse.jdt.apt.core.prefs b/src/java/apiview-java-processor/.settings/org.eclipse.jdt.apt.core.prefs
deleted file mode 100644
index d4313d4b25e..00000000000
--- a/src/java/apiview-java-processor/.settings/org.eclipse.jdt.apt.core.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=false
diff --git a/src/java/apiview-java-processor/.settings/org.eclipse.jdt.core.prefs b/src/java/apiview-java-processor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1b6e1ef22f9..00000000000
--- a/src/java/apiview-java-processor/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.processAnnotations=disabled
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/src/java/apiview-java-processor/.settings/org.eclipse.m2e.core.prefs b/src/java/apiview-java-processor/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb2..00000000000
--- a/src/java/apiview-java-processor/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1