3946 Commits
Author SHA1 Message Date
shaojin.wensj f56b5d895f 1.2.80 pom.xml 1.2.80 2022-03-24 09:18:45 +08:00
shaojin.wensj 7bd661dc4c update pom.xml test dependency 2022-03-22 13:13:08 +08:00
温绍锦 9c9e855d23 Merge pull request #4037 from alibaba/dependabot/maven/net.minidev-json-smart-2.4.5
Bump json-smart from 2.4.1 to 2.4.5
2022-03-22 13:09:30 +08:00
温绍锦 514d421233 Merge pull request #4058 from Koooooo-7/feat-getOrDefault
feat: JSONObject getOrDefault.
2022-03-21 20:19:59 +08:00
shaojin.wensj aa71e753d8 JSONField.unwrapped support List Field 2022-03-21 20:18:43 +08:00
Koy 39bc3cb12a feat: JSONObject getOrDefault. 2022-03-21 14:34:40 +08:00
dependabot[bot] a73bf2506b Bump json-smart from 2.4.1 to 2.4.5
Bumps [json-smart](https://github.com/netplex/json-smart-v2) from 2.4.1 to 2.4.5.
- [Release notes](https://github.com/netplex/json-smart-v2/releases)
- [Commits](https://github.com/netplex/json-smart-v2/compare/2.4.1...2.4.5)

---
updated-dependencies:
- dependency-name: net.minidev:json-smart
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-11 03:48:54 +00:00
温绍锦 e14b1e4a2c Merge pull request #4025 from matteobaccan/master
Removed double semicolon
2022-02-09 09:22:51 +08:00
Matteo Baccan 6841ca7910 Removed double semicolon
Hi

I have removed a double semicolon at the end of one line

ciao
matteo
2022-01-24 20:46:25 +01:00
高铁 6460f65759 1.2.79 release 1.2.79 2021-12-19 20:32:40 +08:00
高铁 9130f8e78e bug fix for JSONReader.handleResovleTask 2021-12-19 20:30:53 +08:00
高铁 f33474b4c6 bug fix for MethodInheritanceComparator 2021-12-19 20:30:29 +08:00
高铁 b1b7a68198 bug fixed for MethodInheritanceComparator 2021-12-16 16:27:47 +08:00
高铁 869746101f bug fixed for Set[] 2021-10-12 18:42:45 +08:00
温绍锦 93d8c01e90 Merge pull request #3875 from YunLemon/Modify_Travis_1
Improve Travis CI build Performance
2021-08-29 18:00:01 +08:00
温绍锦 69c0d2aa16 Merge pull request #3886 from RobberPhex/fix-for-modularity
修复jdk9模块化导致的NoClassDefFoundError: java/sql/Timestamp
2021-08-29 16:50:11 +08:00
luyanbo 751291fc5e 修复jdk9模块化导致的NoClassDefFoundError: java/sql/Timestamp 2021-08-29 16:37:28 +08:00
温绍锦 1da6cf57ac Merge pull request #3885 from alibaba/revert-3878-origin
Revert "修复jdk9模块化导致的NoClassDefFoundError: java/sql/Timestamp"
2021-08-29 15:59:06 +08:00
温绍锦 8b02d16b8d Revert "修复jdk9模块化导致的NoClassDefFoundError: java/sql/Timestamp" 2021-08-29 15:58:26 +08:00
温绍锦 0b269eb6b2 Merge pull request #3878 from RobberPhex/origin
修复jdk9模块化导致的NoClassDefFoundError: java/sql/Timestamp
2021-08-29 15:44:17 +08:00
luyanbo f10d080d45 修复jdk9模块化导致的NoClassDefFoundError: java/sql/Timestamp 2021-08-29 14:05:53 +08:00
luyanbo c5695ab27d use GitHub Actions 2021-08-29 14:05:47 +08:00
高铁 aab3a1bb10 add github Java CI 2021-08-29 12:40:54 +08:00
高铁 91eaa954c7 Merge branch 'master' of https://github.com/alibaba/fastjson 2021-08-29 11:13:41 +08:00
高铁 84835dd3cf bug fixed for set list 1.2.78 2021-08-29 11:03:47 +08:00
高铁 b183861694 bug fixed for JSONObject/JSONArray.equals 2021-08-23 16:49:28 +08:00
Chen Zhang 3d3becde32 Improve Travis CI build Performance 2021-08-18 21:50:21 +08:00
高铁 5271d86fc4 improved jsonpath 2021-07-17 18:51:43 +08:00
高铁 4a51ad4d09 improved blacklist 2021-07-17 18:51:07 +08:00
温绍锦 6e956d2c45 Merge pull request #3530 from MengdiGao/fix-JSONPath_reverse_test
Fix flaky test JSONPath_reverse_test
2021-07-10 13:47:00 +08:00
温绍锦 433398d5fd Merge pull request #3570 from MengdiGao/fix-test-Issue3082
Fix 3 flaky tests caused by Map ordering assumption
2021-07-10 13:44:09 +08:00
温绍锦 23070b2ccd Merge pull request #3538 from hulog/issue3521
fixed issue3521
2021-07-10 13:33:06 +08:00
温绍锦 5bc4e8bec2 Merge pull request #3641 from vacuityv/vac-add-clone-feature
JSONObject clone return JSONObject
2021-07-10 13:23:17 +08:00
温绍锦 3b370ac07c Merge pull request #3722 from lethal233/fastjson-lsl
fix #3067 & #3638
2021-07-10 10:41:48 +08:00
温绍锦 78a98bf3a9 Merge pull request #3684 from fmeum/patch-1
Add OSS-Fuzz status badge
2021-07-10 10:19:17 +08:00
温绍锦 3f96301342 Merge branch 'master' into patch-1 2021-07-10 10:19:11 +08:00
温绍锦 0657d1ef9e Merge pull request #3758 from kingom0426/master
fix spelling error. (DefaultJSONParser.java)
2021-07-10 10:15:27 +08:00
温绍锦 07556942be Merge pull request #3797 from kurisu9az/master
Fix issue 3796 类的字段过多时,生成的字节码错误
2021-07-10 10:14:14 +08:00
温绍锦 96d0ee532a Merge pull request #3826 from hnyyghk/fix-generic-field-deserialize
Fix generic field deserialize, issue #3810
2021-07-10 10:08:51 +08:00
温绍锦 8fe305b62a Merge pull request #3832 from alibaba/dependabot/maven/net.minidev-json-smart-2.4.1
Bump json-smart from 2.2.1 to 2.4.1
2021-07-10 10:02:25 +08:00
高铁 02f5b0afeb merge pull request #3661 2021-07-08 09:56:24 +08:00
dependabot[bot] a6840f3fdf Bump json-smart from 2.2.1 to 2.4.1
Bumps [json-smart](https://github.com/netplex/json-smart-v2) from 2.2.1 to 2.4.1.
- [Release notes](https://github.com/netplex/json-smart-v2/releases)
- [Commits](https://github.com/netplex/json-smart-v2/commits/2.4.1)

---
updated-dependencies:
- dependency-name: net.minidev:json-smart
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-08 01:36:10 +00:00
温绍锦 ea03ec84d7 Merge pull request #3757 from alibaba/dependabot/maven/org.springframework.security-spring-security-web-5.2.10.RELEASE
Bump spring-security-web from 4.2.3.RELEASE to 5.2.10.RELEASE
2021-07-08 09:36:06 +08:00
温绍锦 9a2756445d Merge pull request #3744 from alibaba/dependabot/maven/commons-io-commons-io-2.7
Bump commons-io from 1.4 to 2.7
2021-07-08 09:35:42 +08:00
温绍锦 410abd3a0b Merge pull request #3737 from clark-liu/master
Fix typo valiateResult -> validateResult
2021-07-08 09:34:07 +08:00
温绍锦 0cf65682ae Merge pull request #3733 from rootcn/master
Update README.md
2021-07-08 09:33:41 +08:00
温绍锦 8a929a42c5 Merge pull request #3711 from Certseeds/issue3689
fix #3689
2021-07-08 09:25:13 +08:00
温绍锦 1286becf8f Merge pull request #3808 from RLin2015New/issue3805_tryfix
Issue3805 tryfix
2021-07-08 09:17:36 +08:00
温绍锦 0f30967e5a Merge pull request #3763 from MaverickNyk/SonarFix
Fixed Sonar Issues
2021-07-07 22:10:50 +08:00
温绍锦 db0789fca9 Merge pull request #3811 from itsVol/fix#3804
Fix #3804
2021-07-07 22:06:14 +08:00