Commit Graph

Select branches

Hide Pull Requests

20240303-pre-release-updates

gh-pages

license-clarification

master

pre-release-20230618

pre-release-20231013

pre-release-20241224

pre-release-20250107

pre-release-20250517

pre-release-20251224

tech-debt-20250701

update-security-md-with-key

#1

#100

#100

#1000

#1001

#1002

#1004

#1005

#1006

#1008

#1009

#101

#101

#1011

#1013

#1014

#1017

#1018

#1019

#102

#102

#1020

#1021

#1022

#1022

#1027

#1028

#1029

#103

#103

#1030

#1037

#1038

#1039

#104

#1041

#1044

#1046

#1047

#105

#105

#1050

#1053

#106

#106

#107

#107

#108

#108

#109

#109

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#119

#119

#120

#121

#121

#122

#123

#123

#127

#127

#128

#128

#130

#130

#131

#131

#132

#133

#133

#135

#136

#136

#138

#138

#140

#142

#142

#143

#143

#146

#146

#15

#151

#151

#152

#152

#153

#154

#155

#155

#158

#158

#159

#16

#16

#160

#161

#161

#164

#164

#168

#169

#169

#17

#170

#173

#173

#175

#179

#18

#18

#180

#181

#181

#185

#186

#188

#19

#190

#190

#193

#193

#195

#20

#20

#200

#200

#201

#201

#202

#202

#203

#206

#206

#208

#208

#21

#21

#214

#214

#215

#215

#216

#216

#219

#222

#226

#229

#229

#23

#23

#234

#236

#239

#239

#241

#241

#242

#244

#244

#246

#247

#247

#249

#251

#251

#253

#256

#256

#259

#261

#262

#262

#271

#272

#272

#274

#277

#277

#283

#283

#288

#292

#297

#297

#299

#299

#30

#30

#301

#301

#304

#306

#306

#310

#310

#312

#312

#313

#313

#316

#316

#317

#321

#321

#322

#322

#324

#326

#326

#329

#329

#33

#33

#336

#337

#338

#338

#34

#34

#341

#345

#346

#346

#347

#348

#35

#35

#350

#351

#351

#352

#354

#355

#355

#357

#358

#358

#360

#362

#364

#364

#365

#365

#371

#371

#373

#375

#376

#376

#377

#377

#380

#381

#386

#386

#389

#389

#390

#390

#392

#4

#400

#403

#404

#404

#405

#406

#41

#41

#411

#412

#414

#414

#417

#421

#430

#432

#439

#439

#44

#44

#440

#447

#45

#45

#452

#453

#46

#46

#460

#461

#467

#47

#47

#470

#474

#475

#48

#48

#481

#482

#483

#485

#486

#488

#489

#492

#494

#495

#499

#502

#507

#515

#518

#519

#52

#52

#521

#524

#525

#526

#527

#529

#53

#53

#532

#538

#539

#540

#542

#543

#549

#552

#558

#562

#565

#568

#570

#575

#577

#581

#583

#585

#587

#588

#594

#596

#597

#6

#60

#60

#601

#604

#606

#607

#608

#610

#613

#617

#621

#622

#623

#626

#629

#630

#631

#633

#634

#637

#638

#639

#640

#645

#646

#651

#655

#658

#660

#661

#662

#663

#665

#668

#671

#675

#68

#68

#683

#684

#685

#687

#688

#690

#691

#692

#693

#694

#696

#699

#70

#70

#703

#704

#707

#71

#71

#711

#712

#715

#717

#72

#72

#720

#721

#723

#725

#726

#727

#729

#730

#731

#733

#734

#735

#736

#738

#740

#741

#744

#747

#749

#75

#75

#752

#753

#754

#755

#759

#76

#76

#761

#764

#768

#769

#77

#77

#770

#772

#773

#774

#775

#776

#777

#778

#779

#78

#78

#782

#783

#784

#785

#787

#787

#788

#79

#79

#791

#792

#793

#794

#795

#797

#798

#8

#8

#80

#80

#801

#802

#803

#804

#805

#806

#807

#808

#809

#81

#81

#810

#812

#814

#815

#816

#817

#818

#819

#82

#82

#820

#823

#824

#827

#828

#83

#83

#830

#831

#832

#833

#835

#839

#84

#84

#845

#846

#848

#85

#85

#851

#854

#855

#856

#857

#858

#86

#86

#860

#862

#864

#867

#869

#87

#87

#870

#872

#874

#875

#876

#877

#879

#88

#88

#880

#881

#882

#886

#888

#889

#89

#89

#894

#9

#9

#90

#90

#900

#903

#907

#91

#91

#911

#913

#914

#916

#917

#918

#919

#92

#92

#921

#924

#929

#93

#93

#930

#931

#934

#936

#937

#938

#94

#94

#942

#946

#948

#949

#95

#95

#950

#951

#955

#957

#96

#96

#960

#961

#962

#963

#964

#965

#966

#968

#969

#97

#97

#973

#974

#978

#979

#98

#98

#981

#983

#985

#987

#988

#989

#99

#99

#990

#991

#992

#993

#994

#995

#996

#997

#998

#999

20150729

20151123

20160212

20160807

20160810

20170516

20171018

20180130

20180813

20190722

20200518

20201115

20210307

20211205

20220320

20220924

20230227

20230618

20231013

20240205

20240303

20241224

20250107

20250517

20251224

Mono Color

• 228598ca84 Merge pull request #6 from hofi1/bugfix/fix-flakyness-testToJSONObject_reversibility Simon Hofbauer 2023-10-10 18:20:20 -05:00
• 0a6fb1d578 Merge pull request #5 from hofi1/bugfix/fix-flakyness-org.json.junit.JSONObjectTest#valueToString Simon Hofbauer 2023-10-10 18:19:28 -05:00
• c4cd526c53 Merge pull request #779 from Madjosz/713_jsonobject_nonfinite Sean Leary 2023-10-08 17:08:32 -05:00
• 776b5ccb85 Merge pull request #778 from Madjosz/fix_xml_test Sean Leary 2023-10-08 17:06:55 -05:00
• fb99c06bad Merge branch 'master' into fix_xml_test Sean Leary 2023-10-08 17:03:35 -05:00
• bc09f90e90 Merge pull request #782 from mureinik/XMLTest-windows Sean Leary 2023-10-08 17:00:25 -05:00
• c93014cb53 add validity check for JSONObject constructors Madjosz 2023-10-04 12:00:47 +02:00
• 0e4a94d91d fix failing test XML test on Windows machines Madjosz 2023-10-04 11:17:13 +02:00
• 1a38879c90 #653 - optLong vs getLong inconsistencies For exponential decimal conversion, number is not touched. Leading zeros removed from numeric number strings before converting to number. rudrajyoti biswas 2023-10-06 21:34:00 +05:30
• 4c8cac22a8 Use System.lineSeparator() Allon Mureinik 2023-10-05 19:47:33 +03:00
• fe45fa9cfb Fix XMLTest on Windows Allon Mureinik 2023-10-05 15:29:51 +03:00
• 79af389f7a Merge pull request #774 from mccartney/removing-synchronized Sean Leary 2023-10-04 07:40:10 -05:00
• 1726b6cf55 Merge pull request #776 from mccartney/junit-4-13-2 Sean Leary 2023-10-04 07:39:26 -05:00
• beb2fb5706 Merge pull request #772 from eamonnmcmanus/complexkey Sean Leary 2023-10-01 11:04:40 -05:00
• ff921db783 Junit 4.13.2 Grzegorz Olędzki 2023-09-30 21:53:36 +02:00
• 61bb60e752 Removing excessive synchronization Grzegorz Olędzki 2023-09-30 21:36:11 +02:00
• ef68cdf810 Merge pull request #773 from eedijs/master Sean Leary 2023-09-30 11:47:01 -05:00
• eaa5611ba3 Merge branch 'stleary:master' into complexkey Éamonn McManus 2023-09-28 11:33:08 -07:00
• dbb113176b Add more test cases for unquoted text in objects and arrays. Éamonn McManus 2023-09-28 11:05:50 -07:00
• 16967f322e Simplify the check for object keys that are themselves objects. Éamonn McManus 2023-09-27 12:42:04 -07:00
• 284a316838 Add optJSONArray and optJSONObject methods to JSONArray with a default value Edijs 2023-09-27 19:30:45 +03:00
• 4e8231c512 Merge pull request #770 from eamonnmcmanus/testfixes Sean Leary 2023-09-25 20:37:44 -05:00
• db0fde2a56 Add optJSONArray method to JSONObject with a default value Edijs 2023-09-25 20:18:33 +03:00
• 661114c50d Generalize the logic to disallow nested objects and arrays as keys in objects. Éamonn McManus 2023-09-20 10:50:48 -07:00
• ca88454f1c fix: flakiness in org.json.junit.JSONObjectTest#valueToString simonh5 2023-09-19 14:28:06 -05:00
• 3e688afc66 Small test fixes. Éamonn McManus 2023-09-19 07:38:13 -07:00
• becc1631e6 fix: flakiness in JSONMLTest#testToJSONObject_reversibility simonh5 2023-09-18 20:20:13 -05:00
• 01727fd0ed Merge pull request #769 from jscrdev/fixed-warnings Sean Leary 2023-09-16 08:30:44 -05:00
• 74cd73f97c Addressed compile warnings Valentyn Kolesnikov 2023-09-08 07:34:00 +03:00
• c29d4881e0 Merge pull request #741 from jscrdev/setup-java-11 Sean Leary 2023-09-03 17:17:04 -05:00
• 7c1b6531e7 Update CONTRIBUTING.md Sean Leary 2023-09-03 11:35:15 -05:00
• db122e5d3a Merge branch 'master' into setup-java-11 Valentyn Kolesnikov 2023-09-03 18:40:40 +03:00
• a309931d20 Merge pull request #761 from bowbahdoe/master Sean Leary 2023-09-03 10:35:21 -05:00
• e27da22e05 Update build.gradle Valentyn Kolesnikov 2023-08-29 05:00:13 +03:00
• af6d07cecb Resolved Gradle build dependency Valentyn Kolesnikov 2023-08-29 03:22:20 +03:00
• 64093366b3 Merge pull request #764 from johnjaylward/CodeQl_Pipeline_Update Sean Leary 2023-08-28 19:20:36 -05:00
• 9b69ec49ad update CodeQL action version John J. Aylward 2023-08-28 12:43:17 -04:00
• 2c674be1b6 Update pipeline.yml Valentyn Kolesnikov 2023-08-28 18:13:22 +03:00
• be33deb7d5 Update README.md Valentyn Kolesnikov 2023-08-28 02:36:02 +03:00
• 48089a4da7 Update pipeline.yml Valentyn Kolesnikov 2023-08-28 02:21:18 +03:00
• a4e152f4f0 Update pipeline.yml Valentyn Kolesnikov 2023-08-27 15:42:27 +03:00
• 3dd8f2ecd5 Correction of bug when compiling/testing on Windows: Issue537 file must be read as UTF-8 (Issue 745) dburbrid 2023-06-26 09:33:03 +01:00
• bae0b0dac9 Updated mockito Valentyn Kolesnikov 2023-05-29 11:01:16 +03:00
• e563dbcaaa Setup java 8 as minimum version Valentyn Kolesnikov 2023-05-29 10:34:40 +03:00
• 50dfcc59b3 Remove automatic module name Ethan McCue 2023-08-16 11:25:15 -04:00
• b2943eb395 Add module-info to maven build Ethan McCue 2023-08-16 11:24:57 -04:00
• 60662e2f83 Merge pull request #759 from eamonnmcmanus/eofnull Sean Leary 2023-08-05 08:33:26 -05:00
• 2a4bc3420a Apply simplification suggested by @johnjaylward. Éamonn McManus 2023-08-01 14:38:45 -07:00
• b6ff0db984 Fix indentation in test. Éamonn McManus 2023-08-01 13:49:59 -07:00
• c8a9e15a57 Don't skip past \0 when parsing JSON objects. Éamonn McManus 2023-08-01 13:11:25 -07:00
• 402db6ad84 Merge pull request #753 from davejbur/add-object-methods-and-test Sean Leary 2023-07-14 20:03:13 -05:00
• 4951ec48c8 Renamed object methods from ...Obj to ...Object. Added object method for optDoubleObject (returns Double vice double). Added similar methods in JSONArray. Added test methods. dburbrid 2023-06-29 09:39:34 +01:00
• 8ce0019a5d Merge pull request #752 from davejbur/issue-745-compile-error Sean Leary 2023-06-28 20:45:05 -05:00
• 3d524349a1 Correction of bug when compiling/testing on Windows: Issue537 file must be read as UTF-8 (Issue 745) dburbrid 2023-06-26 09:33:03 +01:00
• a963115ac2 Update pom.xml for maven deploy 20230618 Sean Leary 2023-06-18 12:58:32 -05:00
• f959baa3cb Merge pull request #749 from stleary/pre-release-20230618 Sean Leary 2023-06-18 12:24:27 -05:00
• c048b36516 Update pom.xml for 20230618 pre-release-20230618 Sean Leary 2023-06-18 12:18:36 -05:00
• f6e5bfa2db Update RELEASES.md for 20230618 Sean Leary 2023-06-18 12:17:56 -05:00
• 084b24cbe7 Update README.md for 20230618 Sean Leary 2023-06-18 12:16:14 -05:00
• 22ccf1b8e5 Merge pull request #740 from michael-o/proper-encoding Sean Leary 2023-05-28 14:11:41 -05:00
• 133c0cc75f JSONTokener(InputStream) violates rfc8259#section-8.1 (#739) Michael Osipov 2023-05-24 11:45:25 +02:00
• 0578285036 Merge pull request #734 from superMaaax/fix_flaky Sean Leary 2023-03-27 16:25:57 -05:00
• 48fb5261fe Fixed Flaky Tests Caused by JSON permutations superMaaax 2023-03-21 20:58:32 -05:00
• 8353b9c3f0 Merge pull request #731 from JoaoGFarias/patch-1 Sean Leary 2023-03-11 19:28:01 -06:00
• fe22b242b5 Merge pull request #733 from haribabu-dev/jsontokener_closable Sean Leary 2023-03-11 19:26:55 -06:00
• 7eca507d13 Removed overriding closable interface. HariBabu t 2023-03-07 13:58:30 +08:00
• e1eabc9c27 JSONTokener implemented java.io.Closeable HariBabu t 2023-03-04 23:08:32 +08:00
• 0d436d92e2 Removing commented out code João Farias 2023-03-02 16:39:11 +01:00
• 45bcba518f Merge pull request #729 from TamasPergerDWP/f-parserconfig Sean Leary 2023-02-28 12:49:42 -06:00
• 47fb49b6a8 Update for release 20230227 20230227 Sean Leary 2023-02-27 07:21:11 -06:00
• 0df034c9fd Update for release 20230227 Sean Leary 2023-02-27 07:20:10 -06:00
• f0a05e6911 Update README.md Sean Leary 2023-02-27 07:17:51 -06:00
• 24093491a8 refactor: introduce ParserConfiguration class hierarchy Tamas Perger 2023-02-21 19:13:07 +00:00
• 1275f6809d Merge pull request #723 from TamasPergerDWP/master Sean Leary 2023-02-17 13:47:36 -06:00
• 9234eab00a refactor: make JSONMLParserConfiguration all-args constructor private, enforcing the builder pattern. Tamas Perger 2023-02-13 01:09:29 +00:00
• 72f4c3e646 refactor: rename XMLtoJSONMLParserConfiguration to JSONMLParserConfiguration Tamas Perger 2023-02-12 01:32:34 +00:00
• df2d6f8363 fix: introduce optional XMLtoJSONMLParserConfiguration parameter for JSONML.toJSONArray(...) functions, to facilitate max nesting depth override. Tamas Perger 2023-02-11 01:52:13 +00:00
• a6e412bded fix: limit the nesting depth in JSONML Tamas Perger 2023-02-10 01:46:44 +00:00
• 2391d248cc fix: amend XMLParserConfiguration.clone() to include the new maxNestingDepth param. Tamas Perger 2023-02-10 01:45:34 +00:00
• 401495ae86 Merge pull request #720 from cleydyr/issue-708 Sean Leary 2023-02-05 19:30:04 -06:00
• 448e204186 docs: remove wrong description of parse method Cleydyr de Albuquerque 2023-02-02 20:16:16 +01:00
• eb56704e68 fix: set default maximum nesting depth as 512 Cleydyr de Albuquerque 2023-02-02 18:15:03 +01:00
• 651511f500 tests: add new test to verify that an XML having the permitted nesting depth can be converted Cleydyr de Albuquerque 2023-02-01 20:21:14 +01:00
• a14cb12c85 refactor: keep consistence with other tests and tidy up constant Cleydyr de Albuquerque 2023-02-01 20:20:18 +01:00
• f566a1d9ee fix: limit the nesting depth Cleydyr de Albuquerque 2023-01-31 17:32:34 +01:00
• 5920eca2d7 Merge pull request #711 from 6d64/revert-pull-707-interviewbit-spam Sean Leary 2022-11-30 20:20:39 -06:00
• 3b097d051a Revert pull 707 - interviewbit spam 6d64 2022-12-01 03:21:26 +11:00
• 4e630e58a4 Merge pull request #707 from ASAlishaa/patch-1 Sean Leary 2022-11-17 19:14:11 -06:00
• b732188e4e Added new resource to this repos. ASAlisha 2022-11-15 16:31:05 +05:30
• 5369442671 Added new resource to the repos ASAlisha 2022-11-14 03:26:18 +05:30
• bb1138762a Merge pull request #703 from TomerPacific/feature/update-release-for-JSONMap-Change Sean Leary 2022-11-05 17:39:13 -05:00
• 6a732ec99d Merge pull request #704 from niranjanib/fix-javadoc-not-visible-in-website Sean Leary 2022-11-05 17:38:15 -05:00
• c798c76ddd move javadoc comments above the interface definition to make it visible Niranjani 2022-10-30 22:10:38 +05:30
• 23d5e52a53 feature/update-release-for-JSONMap-Change adding breaking change for JSONMap to corresponding release unknown 2022-10-28 08:45:54 +03:00
• 98df35449a Merge pull request #696 from bmk15897/fix-flaky-test Sean Leary 2022-10-15 08:24:01 -05:00
• 1be6ee31a7 Merge pull request #694 from DeaneOC/Pretty-Print-XML-Functionality Sean Leary 2022-10-13 21:46:26 -05:00
• a2d3d3c9b5 Fix Flaky Test Bharati Kulkarni 2022-10-11 14:33:43 -05:00
• bf9219386a Merge branch 'master' of https://github.com/stleary/JSON-java into Pretty-Print-XML-Functionality Dean 2022-10-10 11:12:49 +01:00
• 85495facbd Corrected test Dean 2022-10-10 11:12:35 +01:00
• 7aba3ac941 System line seperator now being used in JUnit test Dean 2022-10-10 11:09:42 +01:00