Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump gson from 2.8.5 to 2.8.9 in /samples/Java/Basic/SimpleProxy #494

Open
wants to merge 88 commits into
base: master
Choose a base branch
from
Open

Bump gson from 2.8.5 to 2.8.9 in /samples/Java/Basic/SimpleProxy #494

wants to merge 88 commits into from

Commits on Jun 27, 2019

  1. draft

    @serkantkaraca
    serkantkaraca committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    9c355e9 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2019

  1. Adding control plane + data plane EH sample

    @serkantkaraca
    serkantkaraca committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    037168f View commit details
    Browse the repository at this point in the history

  2. SDK ref fixes for EH RBAC sample

    @serkantkaraca
    serkantkaraca committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    37cf05a View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2019

  1. Merge branch 'master' of https://github.com/Azure/azure-event-hubs in… 

    …to serkar.AddCustomRbacEhSample
    @serkantkaraca
    serkantkaraca committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    2dba515 View commit details
    Browse the repository at this point in the history

  2. Updates for 3.0.0 RBAC release

    @JamesBirdsall
    JamesBirdsall committed Jul 1, 2019
    3 Configuration menu
    Copy the full SHA
    118133b View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2019

  1. Adding RBAC custom role sample

    @serkantkaraca
    serkantkaraca committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    27c213b View commit details
    Browse the repository at this point in the history

  2. Remove unintented files

    @serkantkaraca
    serkantkaraca committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    51587c8 View commit details
    Browse the repository at this point in the history

  3. Reverting unintended changes

    @serkantkaraca
    serkantkaraca committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    10ec29a View commit details
    Browse the repository at this point in the history

  4. readme changes

    @serkantkaraca
    serkantkaraca committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    c030b6d View commit details
    Browse the repository at this point in the history

  5. minor changes

    @serkantkaraca
    serkantkaraca committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    1306652 View commit details
    Browse the repository at this point in the history

  6. Refactoring token acquisition

    @serkantkaraca
    serkantkaraca committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    eda4dbd View commit details
    Browse the repository at this point in the history

  7. Update readme.md

    @serkantkaraca
    serkantkaraca authored Jul 2, 2019
    Configuration menu
    Copy the full SHA
    4a87ed4 View commit details
    Browse the repository at this point in the history

  8. Update readme.md

    @serkantkaraca
    serkantkaraca authored Jul 2, 2019
    Configuration menu
    Copy the full SHA
    3337741 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #446 from Azure/serkar.AddCustomRbacEhSample 

    Adding RBAC custom role sample
    @serkantkaraca
    serkantkaraca authored Jul 2, 2019
    Configuration menu
    Copy the full SHA
    d47a55f View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2019

  1. Adding sender sample for rbac

    @ShubhaVijayasarathy
    ShubhaVijayasarathy committed Jul 3, 2019
    Configuration menu
    Copy the full SHA
    8caf262 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2019

  1. Merge pull request #445 from Azure/RBACupdates 

    Updates for Java client 3.0.0 RBAC release
    @ShubhaVijayasarathy
    ShubhaVijayasarathy authored Jul 17, 2019
    Configuration menu
    Copy the full SHA
    edb6409 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2019

  1. Merge branch 'master' of https://github.com/Azure/azure-event-hubs in… 

    …to MsiSampleChanges
    @serkantkaraca
    serkantkaraca committed Jul 18, 2019
    Configuration menu
    Copy the full SHA
    9940943 View commit details
    Browse the repository at this point in the history

  2. Moving Managed Identity sample to .NET Standard SDK

    @serkantkaraca
    serkantkaraca committed Jul 18, 2019
    Configuration menu
    Copy the full SHA
    23d3eaa View commit details
    Browse the repository at this point in the history

  3. Remove unintended SampleSender changes

    @serkantkaraca
    serkantkaraca committed Jul 18, 2019
    Configuration menu
    Copy the full SHA
    566ef0c View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2019

  1. Revert "Updates for Java client 3.0.0 RBAC release" (#448)

    @ShubhaVijayasarathy
    ShubhaVijayasarathy authored Jul 22, 2019
    Configuration menu
    Copy the full SHA
    12583b9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #449 from Azure/MsiSampleChanges 

    Managed Identity sample changes
    @serkantkaraca
    serkantkaraca authored Jul 22, 2019
    Configuration menu
    Copy the full SHA
    f335055 View commit details
    Browse the repository at this point in the history

  3. Move EH SDK to 4.0.0

    @serkantkaraca
    serkantkaraca committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    ff85c7c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #451 from Azure/FixRbcSample2 

    Move EH SDK to 4.0.0
    @serkantkaraca
    serkantkaraca authored Jul 22, 2019
    Configuration menu
    Copy the full SHA
    582fc0b View commit details
    Browse the repository at this point in the history

  5. Remove CxCache dependency in ReliableSender sample

    @serkantkaraca
    serkantkaraca committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    bb7a402 View commit details
    Browse the repository at this point in the history

  6. -

    @serkantkaraca
    serkantkaraca committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    526c56c View commit details
    Browse the repository at this point in the history

  7. Merge pull request #452 from Azure/RemoveCxCacheReferences 

    Remove CxCache dependency in ReliableSender sample
    @serkantkaraca
    serkantkaraca authored Jul 22, 2019
    Configuration menu
    Copy the full SHA
    a5895c7 View commit details
    Browse the repository at this point in the history

  8. Reorging the folder structure

    @ShubhaVijayasarathy
    ShubhaVijayasarathy committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    225db71 View commit details
    Browse the repository at this point in the history

  9. adding samples to Messaging.SErviceBus

    @ShubhaVijayasarathy
    ShubhaVijayasarathy committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    d548f8f View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2019

  1. Update App.config

    @serkantkaraca
    serkantkaraca authored Jul 24, 2019
    Configuration menu
    Copy the full SHA
    a35a76f View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2019

  1. Moving SFProcessor sample into SDK folder

    @serkantkaraca
    serkantkaraca committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    5cb25d3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #453 from Azure/reorg_samples 

    Reorging the folder structure
    @serkantkaraca
    serkantkaraca authored Jul 25, 2019
    Configuration menu
    Copy the full SHA
    a9876ef View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2019

  1. Update Java samples for 3.0.0 client (#455) 

    * Update client version in poms to 3.0.0

* Remove unwanted files

* Update API names
    @JamesBirdsall
    JamesBirdsall authored Aug 29, 2019
    Configuration menu
    Copy the full SHA
    d096ca2 View commit details
    Browse the repository at this point in the history

  2. Consolidate all Java RBAC sample work (#456) 

    * Adding Java RBAC sample
* Remove unwanted classpath and project files
* README with RBAC and MI instructions
    @JamesBirdsall
    JamesBirdsall authored Aug 29, 2019
    Configuration menu
    Copy the full SHA
    12b87e6 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2019

  1. updated to use the 5.0.0 SDK (#459) 

    * updated to use the 5.0.0 SDK

* updated to use the 5.0.0 azure.messaging.eventhubs
    @spelluru @ShubhaVijayasarathy
    spelluru authored and ShubhaVijayasarathy committed Oct 23, 2019
    Configuration menu
    Copy the full SHA
    cbc412e View commit details
    Browse the repository at this point in the history

  2. Update samples for client 3.0.2 (#457) 

    * Update samples for client 3.0.1

* Update samples for client 3.0.2
    @JamesBirdsall
    JamesBirdsall authored Oct 23, 2019
    Configuration menu
    Copy the full SHA
    790471f View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2019

  1. updated samples used by tutorials to use the new package

    @spelluru
    spelluru committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    8cf2471 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2019

  1. updated Anomaly Detector and Wind Turbine Data Generator samples for … 

    …Preview 5
    @spelluru
    spelluru committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    17f6ceb View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2019

  1. updated Anomaly Detector and WindTurbineDataGenerator samples for Pre… 

    …view 6:
    @spelluru
    spelluru committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    a4354c1 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2019

  1. updated for Preview 6

    @spelluru
    spelluru committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    2be764e View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2020

  1. updated based on feedback from Serkant and Jesse

    @spelluru
    spelluru committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    78ec550 View commit details
    Browse the repository at this point in the history

  2. minor update to UI - fully qualified name

    @spelluru
    spelluru committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    000b20a View commit details
    Browse the repository at this point in the history

  3. added using statements

    @spelluru
    spelluru committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    40fa580 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2020

  1. Merge pull request #463 from spelluru/newpackagesamples1029 

    updated samples used by tutorials to use the new package
    @serkantkaraca
    serkantkaraca authored Jan 13, 2020
    Configuration menu
    Copy the full SHA
    284fd90 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2020

  1. fixed the receive code

    @spelluru
    spelluru committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    f4f50e8 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2020

  1. Merge pull request #464 from spelluru/fixmsi0115 

    fixed the receive code
    @spelluru
    spelluru authored Jan 16, 2020
    Configuration menu
    Copy the full SHA
    f65204b View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2020

  1. Updated samples to use the latest .NET package

    @spelluru
    spelluru committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    72fc2bb View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2020

  1. Merge pull request #466 from spelluru/ehubsamples0130 

    Updated samples to use the latest .NET package
    @spelluru
    spelluru authored Feb 12, 2020
    Configuration menu
    Copy the full SHA
    1b66691 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. Add async send sample (#468) 

    Sample demonstrates async send, the benefits of concurrent sends, and how to limit the number of concurrent sends.
    @JamesBirdsall
    JamesBirdsall authored Apr 22, 2020
    Configuration menu
    Copy the full SHA
    3527fe9 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2020

  1. updated the readme to point to new samples. Cleaned up too.

    @spelluru
    spelluru committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    7ed366d View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. Merge pull request #469 from spelluru/sdklinks0430 

    updated the readme to point to new samples. Cleaned up too.
    @spelluru
    spelluru authored May 6, 2020
    Configuration menu
    Copy the full SHA
    5a42971 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2020

  1. Updated to use Functions runtime version 3 (latest)

    @spelluru
    spelluru committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    5a16c14 View commit details
    Browse the repository at this point in the history

  2. removed publish profile

    @spelluru
    spelluru committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    5acf9e8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #471 from spelluru/egridintegrationsample0608 

    Updated the sample to use Functions runtime version 3
    @spelluru
    spelluru authored Jun 9, 2020
    Configuration menu
    Copy the full SHA
    3af21a2 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2020

  1. updated to use Azure.Messaging.EventHubs 5.2 - latest stable version

    @spelluru
    spelluru committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    e9e01dd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #472 from spelluru/ehubegridintegration1207 

    updated to use Azure.Messaging.EventHubs 5.2 - latest stable version
    @serkantkaraca
    serkantkaraca authored Dec 8, 2020
    Configuration menu
    Copy the full SHA
    d6bf8b1 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. modified readmes to point to Track 2 content; moved files to right fo… 

    …lder
    Lily Ma committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    da5dd91 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2021

  1. addressed review feedback

    Lily Ma committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    aa20765 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2021

  1. Simplify readme for RBAC

    @ramya-rao-a
    ramya-rao-a committed Apr 2, 2021
    Configuration menu
    Copy the full SHA
    8576c5e View commit details
    Browse the repository at this point in the history

  2. Re-order steps for custom role sample for clarity

    @ramya-rao-a
    ramya-rao-a committed Apr 2, 2021
    Configuration menu
    Copy the full SHA
    719324b View commit details
    Browse the repository at this point in the history

  3. Consolidate intro and note, use quick start links

    @ramya-rao-a
    ramya-rao-a committed Apr 2, 2021
    Configuration menu
    Copy the full SHA
    de8fe23 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2021

  1. Merge pull request #475 from ramya-rao-a/lily-patch 

    Updates to Lily's PR to azure-event-hubs to add pointers to new library
    @lilyjma
    lilyjma authored Apr 5, 2021
    Configuration menu
    Copy the full SHA
    ca68875 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2021

  1. Merge pull request #474 from Azure/lily-patch 

    Modified readmes to point to Track 2 content
    @lilyjma
    lilyjma authored Apr 6, 2021
    Configuration menu
    Copy the full SHA
    f471963 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. moved samples to approach directories

    Lily Ma committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    97caf51 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2021

  1. Remove duplicate sample for EventHubsCaptureEventGridDemo

    @ramya-rao-a
    ramya-rao-a committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    1362353 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2021

  1. Merge pull request #477 from ramya-rao-a/remove-dupe 

    Remove duplicate sample for EventHubsCaptureEventGridDemo
    @spelluru
    spelluru authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    6d8fc54 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #476 from Azure/lily-patch2 

    moved samples to appropriate folders
    @spelluru
    spelluru authored Apr 12, 2021
    Configuration menu
    Copy the full SHA
    10df2c2 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2021

  1. Clean up of the EventHubsCaptureEventGridDemo sample in the azure-eve… 

    …nt-hubs repo
    @zedy-wj
    zedy-wj committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    809eb4c View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2021

  1. Add pointers to new packages in readme files at the root and for .Net… 

    … legacy package (#478)

* Add pointers to new packages in readme files

* re-arrange readme

* Update Java readme too
    @ramya-rao-a
    ramya-rao-a authored Apr 16, 2021
    Configuration menu
    Copy the full SHA
    71ed5ea View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2021

  1. Updating to use EventHubsCaptureAvroBlobUri to create the BlobClient … 

    …directly,and modify reference of packages.
    @zedy-wj
    zedy-wj committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    d961416 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2021

  1. Updating the Reference

    @zedy-wj
    zedy-wj committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    4cadf09 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2021

  1. Merge pull request #479 from zedy-wj/CleanupEventhub 

    Clean up of the EventHubsCaptureEventGridDemo sample in the azure-event-hubs repo
    @spelluru
    spelluru authored Apr 23, 2021
    Configuration menu
    Copy the full SHA
    bffa22a View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2021

  1. Sample using Event Hub Log4j Appender (#482) 

    * sample added for Log4j Event Hub appender

* updated ReadME

* updated files
    @sagar027
    sagar027 authored Sep 2, 2021
    Configuration menu
    Copy the full SHA
    5c333eb View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2021

  1. Update readme with pointers to newer samples (#481) 

    This PR copies over content from https://github.com/Azure/azure-event-hubs/blob/master/samples/README.md to ensure we point users to newer packages
    @ramya-rao-a
    ramya-rao-a authored Sep 22, 2021
    Configuration menu
    Copy the full SHA
    15b99a5 View commit details
    Browse the repository at this point in the history

  2. Fix incorrect redirection (#467)

    @madushajg
    madushajg authored Sep 22, 2021
    Configuration menu
    Copy the full SHA
    3cb13d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2022

  1. fix code comment (#485)

    @v-thpra
    v-thpra authored Mar 7, 2022
    Configuration menu
    Copy the full SHA
    0b193ff View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2022

  1. Addition of Schema to Schema groups via Powershell 

    This sample would act as reference to add schema to schema groups in event hubs via PowerShell
    @Saglodha
    Saglodha authored Apr 7, 2022
    Configuration menu
    Copy the full SHA
    df61522 View commit details
    Browse the repository at this point in the history

  2. Add schema to schema groups via Bash 

    This sample would act as reference to add schema to schema groups in event hubs via Bash script
    @Saglodha
    Saglodha authored Apr 7, 2022
    Configuration menu
    Copy the full SHA
    af22936 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2022

  1. Added PS variables 

    Added PS variables and committed suggested changes
    @Saglodha
    Saglodha authored Apr 28, 2022
    Configuration menu
    Copy the full SHA
    ab93acf View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2022

  1. Merge pull request #488 from Saglodha/master 

    Addition of schema to schema groups in event hub - PS/ Bash sample
    @serkantkaraca
    serkantkaraca authored Apr 29, 2022
    Configuration menu
    Copy the full SHA
    d910592 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2022

  1. Updating the sample to use latest packages

    @spelluru
    spelluru authored May 6, 2022
    Configuration menu
    Copy the full SHA
    f8c2795 View commit details
    Browse the repository at this point in the history

  2. ARM template

    @spelluru
    spelluru authored May 6, 2022
    Configuration menu
    Copy the full SHA
    fe3a7bc View commit details
    Browse the repository at this point in the history

  3. Delete samples/e2e/EventHubsCaptureEventGridDemo/DWDumper directory

    @spelluru
    spelluru authored May 6, 2022
    Configuration menu
    Copy the full SHA
    6c396fc View commit details
    Browse the repository at this point in the history

  4. Delete samples/e2e/EventHubsCaptureEventGridDemo/media directory

    @spelluru
    spelluru authored May 6, 2022
    Configuration menu
    Copy the full SHA
    2570003 View commit details
    Browse the repository at this point in the history

  5. Delete samples/e2e/EventHubsCaptureEventGridDemo/scripts directory

    @spelluru
    spelluru authored May 6, 2022
    Configuration menu
    Copy the full SHA
    2f0f8d7 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1 from spelluru/spelluru-patch-1 

    Updating the sample to use latest packages
    @spelluru
    spelluru authored May 6, 2022
    Configuration menu
    Copy the full SHA
    3702362 View commit details
    Browse the repository at this point in the history

  7. Duplicate of Data.cs

    @spelluru
    spelluru authored May 6, 2022
    Configuration menu
    Copy the full SHA
    34706f7 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2022

  1. Merge pull request #490 from spelluru/master 

    Updated the EventHubsCaptureEventGridDemo sample
    @spelluru
    spelluru authored May 13, 2022
    Configuration menu
    Copy the full SHA
    5723a0c View commit details
    Browse the repository at this point in the history

Commits on May 20, 2022

  1. Bump gson from 2.8.5 to 2.8.9 in /samples/Java/Basic/SimpleProxy 

    Bumps [gson](https://github.com/google/gson) from 2.8.5 to 2.8.9.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](google/gson@gson-parent-2.8.5...gson-parent-2.8.9)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored May 20, 2022
    Configuration menu
    Copy the full SHA
    f30fcd7 View commit details
    Browse the repository at this point in the history