Merge pull request #142 from microsoft/users/marmegh/JuneUpdates

Newtonsoft and Layout Changes

.github/CODEOWNERS

@@ -2,4 +2,4 @@
 # This file controls who is tagged for review for any given pull request.
 
 # For anything not explicitly taken by someone else:
-* @eddynaka @michaelcfanning @EasyRhinoMSFT
+* @michaelcfanning @EasyRhinoMSFT @marmegh @cfaucon

azure-pipelines.yml

@@ -10,3 +10,5 @@ steps:
     command: 'build'
     projects: src/SarifWeb.sln
     configuration: 'Release'
+
+- task: ComponentGovernanceComponentDetection@0

src/ReleaseHistory.md

@@ -1,5 +1,8 @@
 # SARIF Website Release History
 
+## **v1.0.1**
+- Updating contributors list/images, bump Sarif.Multitool.Library from 2.4.14 to 2.4.16, add link to java-sarif documentation. [#142](https://github.com/microsoft/sarif-website/pull/142)
+
 ## **v1.0.0**
 
 - Add README and CONTRIBUTING files

src/SarifWeb/SarifWeb.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -23,11 +23,11 @@
   <ItemGroup>
     <None Include="wwwroot\images\logos\GitHub.png" />
     <None Include="wwwroot\images\logos\GrammaTech.png" />
-    <None Include="wwwroot\images\logos\KestrelTechnology.png" />
+    <None Include="wwwroot\images\logos\ForAllSecure.png" />
     <None Include="wwwroot\images\logos\MicroFocus.png" />
     <None Include="wwwroot\images\logos\Microsoft.png" />
-    <None Include="wwwroot\images\logos\SWAMP.png" />
     <None Include="wwwroot\images\Nuget.png" />
+    <None Include="wwwroot\images\Sonar.png" />
     <None Include="wwwroot\images\screenshots\VSCodeViewer.png" />
     <None Include="wwwroot\images\screenshots\VSCodeViewer.thumbnail.png" />
     <None Include="wwwroot\images\screenshots\VSViewer.png" />
@@ -42,8 +42,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.20.0" />
-    <PackageReference Include="Sarif.Multitool.Library" Version="2.4.14" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
+    <PackageReference Include="Sarif.Multitool.Library" Version="3.0.0-beta1" />
   </ItemGroup>
 
 </Project>

src/SarifWeb/Views/Home/Index.cshtml

@@ -32,8 +32,8 @@
 </div>
     <div id="specSectionButtons">
         <div id="specSectionButtons1">
-            <button id="specSectionButtonTutorials" role="button" href="https://github.com/microsoft/sarif-tutorials" target="_blank" class="content-button sarifweb-button gray-section">Study the tutorials</button>
             <button id="specSectionButtonRead" role="button" href="https://docs.oasis-open.org/sarif/sarif/v2.1.0/" target="_blank" class="content-button sarifweb-button gray-section">Read the specification</button>
+            <button id="specSectionButtonTutorials" role="button" href="https://github.com/microsoft/sarif-tutorials" target="_blank" class="content-button sarifweb-button gray-section">Study the tutorials</button>
             <button id="specSectionButtonAsk" role="button" href="https://github.com/oasis-tcs/sarif-spec/issues/new" target="_blank" class="content-button sarifweb-button gray-section">Ask a question</button>
         </div>
         <div id="specSectionButtons2">
@@ -56,8 +56,14 @@
         The SARIF project is supported by a group of industry contributors.
     </div>
     <div id="collabSectionButtons" role="list" aria-labelledby="collabSectionTitle">
-        <a role="listitem" href="http://www.kestreltechnology.com" target="_blank">
-            <img aria-label="Kestrel Technology" src="~/Images/Logos/KestrelTechnology.png" alt="Kestrel Technology" />
+        <a href="https://www.sonarsource.com/" target="_blank">
+            <img role="listitem" aria-label="Sonar" src="~/Images/Logos/Sonar.png" alt="Sonar" />
+        </a>
+        <a href="https://forallsecure.com/" target="_blank">
+            <img role="listitem" aria-label="ForAllSecure" src="~/Images/Logos/ForAllSecure.png" alt="ForAllSecure" />
+        </a>
+        <a href="https://www.mend.io/" target="_blank">
+            <img role="listitem" aria-label="Mend" src="~/Images/Logos/Mend.png" alt="Mend" />
         </a>
         <a role="listitem" href="https://www.grammatech.com/" target="_blank">
             <img aria-label="GrammaTech" src="~/Images/Logos/GrammaTech.png" alt="GrammaTech" />
@@ -71,9 +77,6 @@
         <a role="listitem" href="https://github.com/features/security" target="_blank">
             <img aria-label="GitHub, Inc." src="~/Images/Logos/GitHub.png" alt="GitHub, Inc." />
         </a>
-        <a role="listitem" href="https://continuousassurance.org/" target="_blank">
-            <img aria-label="SWAMP" src="~/Images/Logos/SWAMP.png" alt="SWAMP" />
-        </a>
     </div>
 </section>
 
@@ -118,26 +121,26 @@
                     </button>
                 </div>
                 <div role="listitem">
-                    <div class="tools-item-description"><b>Converters</b> - classes for converting the output of various static analysis tools to the SARIF format.</div>
-                    <button id="toolsItemConvertersLink" role="button" aria-label="View SARIF Converters NuGet package" href="https://www.nuget.org/packages/Sarif.Converters/" target="_blank" class="tools-item-button sarifweb-button">
+                    <div class="tools-item-description"><b>Multitool</b> - Multi-purpose command line tool for analyzing and manipulating SARIF files.</div>
+                    <button id="toolsItemMultitoolLink" role="button" aria-label="View SARIF Multitool NuGet package" href="https://www.nuget.org/packages/Sarif.Multitool/" target="_blank" class="tools-item-button sarifweb-button">
                         <div class="tools-item-button-icon">
                             <img src="~/Images/Nuget.png" alt="NuGet" />
                         </div>
                         <div>View Package</div>
                     </button>
                 </div>
                 <div role="listitem">
-                    <div class="tools-item-description"><b>Multitool</b> - Multi-purpose command line tool for analyzing and manipulating SARIF files.</div>
-                    <button id="toolsItemMultitoolLink" role="button" aria-label="View SARIF Multitool NuGet package" href="https://www.nuget.org/packages/Sarif.Multitool/" target="_blank" class="tools-item-button sarifweb-button">
+                    <div class="tools-item-description"><b>Interop</b> - Library that enables Visual Studio extensions to easily consume services exposed by the SARIF Viewer for VS.</div>                  
+                    <button id="toolsItemInteropLink" role="button" aria-label="View SARIF Viewer interop library NuGet package" href="https://www.nuget.org/packages/Sarif.Viewer.VisualStudio.Interop/" target="_blank" class="tools-item-button sarifweb-button">
                         <div class="tools-item-button-icon">
                             <img src="~/Images/Nuget.png" alt="NuGet" />
                         </div>
                         <div>View Package</div>
                     </button>
                 </div>
                 <div role="listitem">
-                    <div class="tools-item-description"><b>Interop</b> - Library that enables Visual Studio extensions to easily consume services exposed by the SARIF Viewer for VS.</div>                  
-                    <button id="toolsItemInteropLink" role="button" aria-label="View SARIF Viewer interop library NuGet package" href="https://www.nuget.org/packages/Sarif.Viewer.VisualStudio.Interop/" target="_blank" class="tools-item-button sarifweb-button">
+                    <div class="tools-item-description"><b>Converters</b> - classes for converting the output of various static analysis tools to the SARIF format.</div>
+                    <button id="toolsItemConvertersLink" role="button" aria-label="View SARIF Converters NuGet package" href="https://www.nuget.org/packages/Sarif.Converters/" target="_blank" class="tools-item-button sarifweb-button">
                         <div class="tools-item-button-icon">
                             <img src="~/Images/Nuget.png" alt="NuGet" />
                         </div>
@@ -159,7 +162,9 @@
                         </svg>
                     </div>
                 </div>
-                <div class="tools-item-description tools-other-item-description"><a href="https://github.com/microsoft/sarif-js-sdk">Code and supporting files</a> for working with SARIF in JavaScript applications.</div>
+                <div class="tools-item-description tools-other-item-description">
+                    <a href="https://github.com/microsoft/sarif-js-sdk">Code and supporting files</a> for working with SARIF in JavaScript applications.
+                </div>
             </div>
             <div role="listitem" aria-labelledby="toolsSectionPlatformLabelTypeScript">
                 <div class="tools-item-other-label">
@@ -187,7 +192,9 @@
                         </svg>
                     </div>
                 </div>
-                <div class="tools-item-description tools-other-item-description">Coming soon.</div>
+                <div class="tools-item-description tools-other-item-description">
+                    <a href="https://github.com/Contrast-Security-OSS/java-sarif">POJOs</a> generated from the Static Analysis Results Interchange Format (SARIF) JSON schema for Java applications.
+                </div>
             </div>
             <div role="listitem" aria-labelledby="toolsSectionPlatformLabelPython">
                 <div class="tools-item-other-label">