Johannes Frohnmeyer
89ae8b48c2
Merge remote-tracking branch 'origin/master'
...
ci/woodpecker/push/woodpecker Pipeline was successful
Details
# Conflicts:
# extras/pom.xml
# extras/src/main/java/com/google/gson/graph/GraphAdapterBuilder.java
# extras/src/main/java/com/google/gson/interceptors/InterceptorFactory.java
# extras/src/test/java/com/google/gson/typeadapters/PostConstructAdapterFactoryTest.java
# gson/src/main/java/com/google/gson/Gson.java
# gson/src/main/java/com/google/gson/GsonBuilder.java
# gson/src/main/java/com/google/gson/util/ISO8601Utils.java
# gson/src/main/java/module-info.java
# gson/src/test/java/com/google/gson/GsonTest.java
# gson/src/test/java/com/google/gson/functional/ArrayTest.java
# gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
# gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
# gson/src/test/java/com/google/gson/functional/EnumWithObfuscatedTest.java
# gson/src/test/java/com/google/gson/functional/InternationalizationTest.java
# gson/src/test/java/com/google/gson/functional/Java17RecordTest.java
# gson/src/test/java/com/google/gson/functional/JavaUtilConcurrentAtomicTest.java
# gson/src/test/java/com/google/gson/functional/JavaUtilTest.java
# gson/src/test/java/com/google/gson/functional/JsonAdapterAnnotationOnClassesTest.java
# gson/src/test/java/com/google/gson/functional/JsonAdapterAnnotationOnFieldsTest.java
# gson/src/test/java/com/google/gson/functional/JsonParserTest.java
# gson/src/test/java/com/google/gson/functional/MapTest.java
# gson/src/test/java/com/google/gson/functional/PrimitiveTest.java
# gson/src/test/java/com/google/gson/functional/ReflectionAccessTest.java
# gson/src/test/java/com/google/gson/functional/StreamingTypeAdaptersTest.java
# gson/src/test/java/com/google/gson/functional/TypeAdapterPrecedenceTest.java
# gson/src/test/java/com/google/gson/internal/bind/Java17ReflectiveTypeAdapterFactoryTest.java
# gson/src/test/java/com/google/gson/internal/bind/JsonTreeReaderTest.java
# gson/src/test/java/com/google/gson/internal/bind/JsonTreeWriterTest.java
# gson/src/test/java/com/google/gson/internal/reflect/Java17ReflectionHelperTest.java
# gson/src/test/java/com/google/gson/regression/JsonAdapterNullSafeTest.java
# gson/src/test/java/com/google/gson/stream/JsonReaderPathTest.java
# gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
# metrics/pom.xml
# metrics/src/main/java/com/google/gson/metrics/NonUploadingCaliperRunner.java
# metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java
# pom.xml
# proto/pom.xml
2023-02-23 14:21:42 +01:00
e8b6fa9287
Bump maven-surefire-plugin from 3.0.0-M8 to 3.0.0-M9 ( #2313 )
...
Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire ) from 3.0.0-M8 to 3.0.0-M9.
- [Release notes](https://github.com/apache/maven-surefire/releases )
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M8...surefire-3.0.0-M9 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-15 05:41:42 -08:00
2658aca66a
Fix error prone warnings ( #2316 )
...
* Fix `OperatorPrecedence` warn in `JsonWriter#close`
* Fix `ReferenceEquality` warn in `LinkedTreeMap#replaceInParent`
* Fix `UnnecessaryParentheses` warn in `LinkedTreeMap#replaceInParent`
* Fix `ReferenceEquality` warn in `LinkedTreeMap#hasNext`
* Fix `ReferenceEquality` warn in `LinkedTreeMap#nextNode`
* Adds `error_prone_annotations` to the `pom.xml` of `gson`
* Fix `InlineMeSuggester` warns in `JsonParser`
* Fix `UnnecessaryParentheses` warns in `ConstructorConstructor#newDefaultImplementationConstructor`
* Fix `ThreadLocalUsage` warn in `Gson`
* Fix `JdkObsolete` warn in `GsonBuilder`
* Fix `ReferenceEquality` warn in `LazilyParsedNumber#equals`
* Fix `OperatorPrecedence` warn in `TreeTypeAdapter#create`
* Fix `OperatorPrecedence` warn in `ArrayTypeAdapter`
* Fix `UnnecessaryParentheses` warn in `TypeAdapters`
* Adds `-XepExcludedPaths` flag to ErrorProne plugin to exclude tests and proto path
* Fix `ClassNewInstance` warn in `InterceptorAdapter`
* Fix `ThreadLocalUsage` warn in `GraphAdapterBuilder`
* Fix `JdkObsolete` warn in `GraphAdapterBuilder`
* Revert "Adds `error_prone_annotations` to the `pom.xml` of `gson`"
This reverts commit 14af14dfa23b46a54f4855a70ccf2b0a2cdc3e3f.
* Revert "Fix `InlineMeSuggester` warns in `JsonParser`"
This reverts commit 095bfd517e06510e4cc9cc6b1aac58ad9bf3038a.
* Adds `@SuppressWarnings("ThreadLocalUsage")`
* Fix `OperatorPrecedence` in `JsonWriter`
* Revert "Fix `ReferenceEquality` warn in `LinkedTreeMap#nextNode`"
This reverts commit 387746c7f7e3d0943c8f80501f5d9c3710f4862e.
* Adds `@SuppressWarnings("ReferenceEquality")`
* Adds `guava-testlib` to the gson `pom.xml`
* `@SuppressWarnings("TruthSelfEquals")` removed to use `EqualsTester()`
2023-02-15 05:18:43 -08:00
0d22e5d205
Add copyright notices to files that were missing them. ( #2307 )
...
In each case the copyright year is the year in which the file was first added.
2023-01-31 14:05:12 -08:00
Johannes Frohnmeyer
b6cc63919d
Merge remote-tracking branch 'origin/master'
...
ci/woodpecker/push/woodpecker Pipeline failed
Details
# Conflicts:
# .github/ISSUE_TEMPLATE/bug_report.md
# .github/workflows/build.yml
# extras/pom.xml
# extras/src/main/java/com/google/gson/graph/GraphAdapterBuilder.java
# extras/src/main/java/com/google/gson/typeadapters/UtcDateTypeAdapter.java
# extras/src/test/java/com/google/gson/interceptors/InterceptorTest.java
# extras/src/test/java/com/google/gson/typeadapters/PostConstructAdapterFactoryTest.java
# extras/src/test/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactoryTest.java
# extras/src/test/java/com/google/gson/typeadapters/UtcDateTypeAdapterTest.java
# gson/src/test/java/com/google/gson/CommentsTest.java
# gson/src/test/java/com/google/gson/ToNumberPolicyTest.java
# gson/src/test/java/com/google/gson/functional/EnumWithObfuscatedTest.java
# gson/src/test/java/com/google/gson/functional/JsonParserTest.java
# gson/src/test/java/com/google/gson/functional/LeniencyTest.java
# gson/src/test/java/com/google/gson/functional/MapTest.java
# gson/src/test/java/com/google/gson/functional/PrimitiveCharacterTest.java
# gson/src/test/java/com/google/gson/functional/ReflectionAccessTest.java
# gson/src/test/java/com/google/gson/functional/SecurityTest.java
# gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
# gson/src/test/resources/testcases-proguard.conf
# metrics/pom.xml
# metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
# proto/pom.xml
# proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java
# proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithComplexAndRepeatedFieldsTest.java
# proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithPrimitiveTypesTest.java
2023-01-21 14:24:25 +01:00
be87c3fd0e
Port Junit test to Truth in the package `com.google.gson` of the module `gson` ( #2299 )
...
* Add the Truth dependency
* Port Junit test to Truth in the package `com.google.gson` of the module `gson`
* Replace the `assertThat(e.getMessage()).isEqualTo(...)"` with `assertThat(e).hasMessageThat().isEqualTo(...)`
* Minor fixes
2023-01-17 07:59:10 -08:00
21989d7ff8
Bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 ( #2298 )
...
Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire ) from 3.0.0-M7 to 3.0.0-M8.
- [Release notes](https://github.com/apache/maven-surefire/releases )
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M7...surefire-3.0.0-M8 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-12 10:59:29 -08:00
3adf2ad748
[maven-release-plugin] prepare for next development iteration
2023-01-06 07:42:33 -08:00
2ce6a6106c
[maven-release-plugin] prepare release gson-parent-2.10.1
2023-01-06 07:42:31 -08:00
dcbc164cb0
Bump bnd-maven-plugin from 6.3.1 to 6.4.0 ( #2245 )
...
Bumps [bnd-maven-plugin](https://github.com/bndtools/bnd ) from 6.3.1 to 6.4.0.
- [Release notes](https://github.com/bndtools/bnd/releases )
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md )
- [Commits](https://github.com/bndtools/bnd/compare/6.3.1...6.4.0 )
---
updated-dependencies:
- dependency-name: biz.aQute.bnd:bnd-maven-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-09 08:03:07 -08:00
Johannes Frohnmeyer
188b2beb26
Plz
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2022-11-24 18:52:42 +01:00
Johannes Frohnmeyer
26ce5dd19f
Plz
ci/woodpecker/push/woodpecker Pipeline failed
Details
2022-11-24 18:48:53 +01:00
Johannes Frohnmeyer
b357260039
Plz
ci/woodpecker/push/woodpecker Pipeline failed
Details
2022-11-24 18:45:24 +01:00
Johannes Frohnmeyer
2a87b3009d
Plz
ci/woodpecker/push/woodpecker Pipeline failed
Details
2022-11-24 18:42:46 +01:00
Johannes Frohnmeyer
b48d9bacc9
Plz
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2022-11-24 18:40:56 +01:00
Johannes Frohnmeyer
9dc1f2d803
Plz
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2022-11-24 18:34:37 +01:00
Johannes Frohnmeyer
bdba5f3987
Plz
ci/woodpecker/push/woodpecker Pipeline failed
Details
2022-11-24 18:26:37 +01:00
Johannes Frohnmeyer
5eaa85fffa
11
ci/woodpecker/push/woodpecker Pipeline failed
Details
2022-11-24 18:06:23 +01:00
Johannes Frohnmeyer
d6ad135e1d
h
ci/woodpecker/push/woodpecker Pipeline failed
Details
2022-11-24 18:05:42 +01:00
Johannes Frohnmeyer
7633b4cf85
Try to shade
ci/woodpecker/push/woodpecker Pipeline failed
Details
2022-11-24 17:44:55 +01:00
Johannes Frohnmeyer
bf388059a3
Merge remote-tracking branch 'origin/master'
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2022-11-24 17:33:52 +01:00
818faeeaa2
Adjust version numbers and a test to conform to the SemVer spec. ( #2237 )
...
* Adjust version numbers and a test to conform to the SemVer spec.
Gson releases since 2.8.0 have been following this spec. We mistakenly released 2.10
without the .0 patch version, and adjusted `GsonVersionDiagnosticsTest` so it would
accept that, as well as the two-digit `10`. Here we make the test no longer accept
versions without a patch number, while still accepting two-digit minor versions of course.
We also change the snapshot version to 2.11.0-SNAPSHOT instead of 2.11-SNAPSHOT.
2022-11-13 15:36:09 -08:00
Johannes Frohnmeyer
9409197165
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# gson/src/main/java/com/google/gson/stream/JsonReader.java
# gson/src/test/java/com/google/gson/functional/ReflectionAccessFilterTest.java
# gson/src/test/java/com/google/gson/functional/ReflectionAccessTest.java
# gson/src/test/java/com/google/gson/internal/bind/DefaultDateTypeAdapterTest.java
# pom.xml
2022-10-31 12:44:34 +01:00
763e69a331
[maven-release-plugin] prepare for next development iteration
2022-10-24 18:06:57 -07:00
dd92e49b27
[maven-release-plugin] prepare release gson-parent-2.10
2022-10-24 18:06:55 -07:00
79c27dd885
[maven-release-plugin] prepare for next development iteration
2022-10-24 17:48:57 -07:00
87e9ee5511
[maven-release-plugin] prepare release gson-parent-2.10
2022-10-24 17:48:55 -07:00
7bca5c4061
[maven-release-plugin] rollback the release of gson-parent-2.10
2022-10-24 17:42:45 -07:00
c7544a0e86
[maven-release-plugin] prepare for next development iteration
2022-10-24 17:33:36 -07:00
9efdfad33c
[maven-release-plugin] prepare release gson-parent-2.10
2022-10-24 17:33:34 -07:00
5253ddbde0
Follow-up for record test build changes ( #2207 )
2022-09-27 23:02:15 -07:00
441406cc78
Add a currently-failing test for Java records and `@Ignore` it. ( #2203 )
...
* Add a currently-failing test for Java records and `@Ignore` it.
Also do the Maven gymastics required to ensure that this test only runs on Java
versions ≥17. (It would also work on Java 16, but 17 is all we have in the CI.)
Fix some compilation problems I saw when running locally, which for some reason
don't show up in the CI.
* Suppress some new lint options that trigger `-Werror`.
We may fix these later. (Every test will need an explicit constructor!)
* Select Java version with maven.compiler.release and maven.compiler.testRelease.
Use `assumeNotNull` rather than an if-statement.
* Specify <release>11</release> for javadoc.
* Restore the @see for AccessibleObject.
2022-09-27 12:32:40 -07:00
Johannes Frohnmeyer
ded8d1c79f
No module
2022-09-14 19:44:09 +02:00
Johannes Frohnmeyer
8ec31281a7
Try fixing
2022-09-14 19:41:29 +02:00
Johannes Frohnmeyer
67402b1acf
Attempt to fix pom by replacing it with the current upstream
2022-09-14 19:31:32 +02:00
Johannes Frohnmeyer
ce02cb3bc1
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# gson/pom.xml
# gson/src/main/java/com/google/gson/Gson.java
# gson/src/main/java/com/google/gson/GsonBuilder.java
# gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
# gson/src/main/java/com/google/gson/stream/JsonWriter.java
# gson/src/test/java/com/google/gson/functional/ArrayTest.java
# gson/src/test/java/com/google/gson/functional/MapTest.java
# pom.xml
2022-09-14 19:20:24 +02:00
2266ccdd67
Remove usage of oss-parent Maven parent and update ReleaseProcess.md ( #2159 )
...
The oss-parent configuration has been applied manually to the root pom.xml,
except that now newer plugin versions are used for source and javadoc JAR
creation, and for GPG signing.
This required some reordering of the plugins for the gson module to make
sure they are executed in the correct order. Otherwise this would cause
failures for javadoc:jar.
2022-09-06 16:26:53 -07:00
ca22b68008
[maven-release-plugin] prepare for next development iteration
2022-07-31 14:25:34 -07:00
bb9a1f255a
[maven-release-plugin] prepare release gson-parent-2.9.1
2022-07-31 14:25:32 -07:00
924c496b95
Bump maven-resources-plugin from 3.2.0 to 3.3.0 ( #2157 )
...
Bumps [maven-resources-plugin](https://github.com/apache/maven-resources-plugin ) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/apache/maven-resources-plugin/releases )
- [Commits](https://github.com/apache/maven-resources-plugin/compare/maven-resources-plugin-3.2.0...maven-resources-plugin-3.3.0 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-resources-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-25 20:37:16 -07:00
08d4572fc4
Bump proguard-maven-plugin from 2.5.3 to 2.6.0 ( #2136 )
...
Bumps [proguard-maven-plugin](https://github.com/wvengen/proguard-maven-plugin ) from 2.5.3 to 2.6.0.
- [Release notes](https://github.com/wvengen/proguard-maven-plugin/releases )
- [Changelog](https://github.com/wvengen/proguard-maven-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/wvengen/proguard-maven-plugin/commits )
---
updated-dependencies:
- dependency-name: com.github.wvengen:proguard-maven-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-20 17:01:20 -07:00
15b9fa9c31
Bump maven-surefire-plugin from 3.0.0-M6 to 3.0.0-M7 ( #2128 )
...
Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire ) from 3.0.0-M6 to 3.0.0-M7.
- [Release notes](https://github.com/apache/maven-surefire/releases )
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M6...surefire-3.0.0-M7 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-08 07:21:23 -07:00
d1fce29b27
Bump bnd-maven-plugin from 6.2.0 to 6.3.1 ( #2129 )
...
Bumps [bnd-maven-plugin](https://github.com/bndtools/bnd ) from 6.2.0 to 6.3.1.
- [Release notes](https://github.com/bndtools/bnd/releases )
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md )
- [Commits](https://github.com/bndtools/bnd/compare/6.2.0...6.3.1 )
---
updated-dependencies:
- dependency-name: biz.aQute.bnd:bnd-maven-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-08 07:21:02 -07:00
Johannes Frohnmeyer
41cafc0987
Remove references to deleted test
2022-05-17 21:35:52 +02:00
Johannes Frohnmeyer
35241fc7b2
Add comment support
2022-05-12 23:23:14 +02:00
f79ea208b1
Bump maven-surefire-plugin from 3.0.0-M5 to 3.0.0-M6 ( #2101 )
...
Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire ) from 3.0.0-M5 to 3.0.0-M6.
- [Release notes](https://github.com/apache/maven-surefire/releases )
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M5...surefire-3.0.0-M6 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-03 20:08:33 -07:00
9125653278
Bump bnd-maven-plugin from 6.1.0 to 6.2.0 ( #2084 )
...
Bumps [bnd-maven-plugin](https://github.com/bndtools/bnd ) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/bndtools/bnd/releases )
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md )
- [Commits](https://github.com/bndtools/bnd/compare/6.1.0...6.2.0 )
---
updated-dependencies:
- dependency-name: biz.aQute.bnd:bnd-maven-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-28 07:40:22 -08:00
d19e9fe0af
Improve Maven build and GitHub Maven workflow ( #2079 )
...
* Fix consecutive Maven builds failing without performing `clean`
By default moditect-maven-plugin refuses to overwrite the JAR file it
generated in a previous run.
* Make GitHub Maven build workflow detect Javadoc issues
2022-02-16 12:51:08 -08:00
e58db43f57
[maven-release-plugin] prepare for next development iteration
2022-02-11 11:13:24 -08:00
b6acf1178a
[maven-release-plugin] prepare release gson-parent-2.9.0
2022-02-11 11:13:22 -08:00
Johannes Frohnmeyer
dependabot[bot]