Skip to content

Commit 7d3e902

Browse files
committed
Revert #768
1 parent f14d2ed commit 7d3e902

File tree

3 files changed

+1
-22
lines changed

3 files changed

+1
-22
lines changed

pom.xml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ com.fasterxml.jackson.core.*;version=${project.version}
4646
<packageVersion.dir>com/fasterxml/jackson/core/json</packageVersion.dir>
4747
<packageVersion.package>${project.groupId}.json</packageVersion.package>
4848

49-
<!-- Bnd annotations for generating extra OSGi metadata. -->
50-
<version.bnd.annotation>6.3.1</version.bnd.annotation>
51-
5249
<!-- for Reproducible Builds -->
5350
<project.build.outputTimestamp>2022-10-10T23:25:41Z</project.build.outputTimestamp>
5451
</properties>
@@ -147,16 +144,7 @@ com.fasterxml.jackson.core.*;version=${project.version}
147144
</build>
148145

149146
<dependencies>
150-
<!-- 31-Jul-2022, tatu: [core#768] OSGi metadata -->
151-
<dependency>
152-
<groupId>biz.aQute.bnd</groupId>
153-
<artifactId>biz.aQute.bnd.annotation</artifactId>
154-
<version>${version.bnd.annotation}</version>
155-
<optional>true</optional>
156-
<scope>provided</scope>
157-
</dependency>
158-
159-
<!-- plus test dependencies -->
147+
<!-- Test dependencies -->
160148
<dependency>
161149
<groupId>org.junit.vintage</groupId>
162150
<artifactId>junit-vintage-engine</artifactId>

release-notes/VERSION-2.x

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ JSON library.
5151
(contributed by Evan G)
5252
#763: `JsonFactory.createParser()` with `File` may leak `InputStream`s
5353
#764: `JsonFactory.createGenerator()` with `File` may leak `OutputStream`s
54-
#768: Jackson bundles are missing OSGi's osgi.serviceloader metadata
55-
(requested by Chris R)
5654
#773: Add option to accept non-standard trailing decimal point
5755
(`JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS`)
5856
(contributed by @pjfanning)
@@ -71,8 +69,6 @@ JSON library.
7169
(contributed by @pjfanning)
7270
#818: Calling `JsonPointer.compile(...)` on very deeply nested expression
7371
throws `StackOverflowErrror`
74-
#822: Declare osgi.serviceloader.registrar requirement as optional
75-
(contributed by Chris R)
7672
#828: Make `BigInteger` parsing lazy
7773
(contributed by @pjfanning)
7874

src/main/java/com/fasterxml/jackson/core/JsonFactory.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import java.lang.ref.SoftReference;
99
import java.net.URL;
1010

11-
import aQute.bnd.annotation.spi.ServiceProvider;
12-
1311
import com.fasterxml.jackson.core.format.InputAccessor;
1412
import com.fasterxml.jackson.core.format.MatchStrength;
1513
import com.fasterxml.jackson.core.io.*;
@@ -23,8 +21,6 @@
2321
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
2422
import com.fasterxml.jackson.core.util.JacksonFeature;
2523

26-
import static aQute.bnd.annotation.Resolution.OPTIONAL;
27-
2824
/**
2925
* The main factory class of Jackson package, used to configure and
3026
* construct reader (aka parser, {@link JsonParser})
@@ -46,7 +42,6 @@
4642
* @author Tatu Saloranta
4743
*/
4844
@SuppressWarnings("resource")
49-
@ServiceProvider(value = JsonFactory.class, resolution = OPTIONAL) // will be `TokenStreamFactory` in 3.x
5045
public class JsonFactory
5146
extends TokenStreamFactory
5247
implements Versioned,

0 commit comments

Comments
 (0)