Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,14 @@ public Option[] configuration() throws IOException, URISyntaxException {
mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.9.20"),
mavenBundle("org.apache.felix", "org.apache.felix.fileinstall", "3.2.6"),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"),

// Jackson dependency for object serialisation.
// (these only need to be defined here when the versions are different from the ones
// defined in the project -- otherwise -> "bundle symbolic name and version are not unique")
mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version("2.19.1"),
mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").version("2.19.1"),
mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version("2.19.1"),
// mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version("2.22.0"),
// mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").version("2.22"),
// mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version("2.22.0"),

mavenBundle().groupId("com.github.ben-manes.caffeine").artifactId("caffeine").version("3.1.8"),

frameworkProperty("repository.home").value("target"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,14 @@ public Option[] configuration() throws IOException, URISyntaxException {
// require at least ConfigAdmin 1.6 supported by felix.configadmin 1.9.0+
mavenBundle( "org.apache.felix", "org.apache.felix.configadmin", "1.9.20" ),
mavenBundle( "org.apache.felix", "org.apache.felix.fileinstall", "3.2.6" ),

mavenBundle( "org.ops4j.pax.logging", "pax-logging-api", "1.7.2" ),
// Jackson dependency for object serialisation.
// (these only need to be defined here when the versions are different from the ones
// defined in the project -- otherwise -> "bundle symbolic name and version are not unique")
mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version("2.19.1"),
mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").version("2.19.1"),
mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version("2.19.1"),
// mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version("2.22.0"),
// mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").version("2.22"),
// mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version("2.22.0"),

mavenBundle().groupId("com.github.ben-manes.caffeine").artifactId("caffeine").version("3.1.8"),

Expand Down
2 changes: 2 additions & 0 deletions oak-it-osgi/test-bundles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@
<include>commons-codec:commons-codec</include>
<include>commons-io:commons-io</include>
<include>commons-logging:commons-logging</include>
<include>com.fasterxml.jackson.core:jackson-annotations</include>
<include>com.fasterxml.jackson.core:jackson-core</include>
<include>com.fasterxml.jackson.core:jackson-databind</include>
<include>org.apache.commons:commons-lang3</include>
<include>org.apache.commons:commons-math3</include>
<include>org.apache.commons:commons-text</include>
Expand Down
5 changes: 3 additions & 2 deletions oak-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
<h2.version>2.1.214</h2.version>
<tika.version>1.28.5</tika.version>
<derby.version>10.16.1.1</derby.version>
<jackson.version>2.19.4</jackson.version>
<jackson.version>2.22.0</jackson.version>
<jackson.annotations.version>2.22</jackson.annotations.version> <!-- not aligned with jackson anymore -->
Comment on lines +67 to +68

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just as a cautionary step, can we jump one minor version at one time.

Apart from that PR looks okk.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be three steps for changes since last August.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rishabhdaim - what's your preference: just separate PRs, or seperate tickets?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer 3 separate tickets, 1 for each and we should do 1 per release (if possible).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With one per release we may not be able to keep up :-)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okk, for this case, lets jump twice in next release.

<testcontainers.version>1.21.4</testcontainers.version>
<pax-exam.version>4.14.0</pax-exam.version>
<pax-url.version>2.6.17</pax-url.version>
Expand Down Expand Up @@ -709,7 +710,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
<version>${jackson.annotations.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
Loading