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 |