Skip to content

Commit 853d638

Browse files
Merge branch '11.0.x' into 11.1.x by sp-gupta
2 parents e41c6f2 + b8dba95 commit 853d638

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Each line is a file pattern followed by one or more owners.
22
# These owners will be the default owners for everything in
33
# the repo.
4-
* @confluentinc/connect-team1
4+
* @confluentinc/connect-cloud

pom.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<dependency.check.version>6.1.6</dependency.check.version>
5656
<confluent.maven.repo>http://packages.confluent.io/maven/</confluent.maven.repo>
5757
<commons.codec.version>1.15</commons.codec.version>
58+
<jackson.version>2.16.0</jackson.version>
5859
</properties>
5960

6061
<repositories>
@@ -262,6 +263,22 @@
262263
<version>${confluent.version}</version>
263264
<scope>test</scope>
264265
</dependency>
266+
<!-- Bumping the common package version resulted in a few build issues which cannot be resolved until the next CP release. Hence pinning the Jackson packages. After the CP release, we can bump the common version and remove the Jackson packages from this pom.-->
267+
<dependency>
268+
<groupId>com.fasterxml.jackson.core</groupId>
269+
<artifactId>jackson-databind</artifactId>
270+
<version>${jackson.version}</version>
271+
</dependency>
272+
<dependency>
273+
<groupId>com.fasterxml.jackson.core</groupId>
274+
<artifactId>jackson-core</artifactId>
275+
<version>${jackson.version}</version>
276+
</dependency>
277+
<dependency>
278+
<groupId>com.fasterxml.jackson.core</groupId>
279+
<artifactId>jackson-annotations</artifactId>
280+
<version>${jackson.version}</version>
281+
</dependency>
265282
</dependencies>
266283

267284
<dependencyManagement>
@@ -683,4 +700,4 @@
683700
</build>
684701
</profile>
685702
</profiles>
686-
</project>
703+
</project>

src/test/java/io/confluent/connect/elasticsearch/MappingTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import static org.junit.Assert.assertEquals;
4343
import static org.junit.Assert.assertNull;
4444

45+
@SuppressWarnings("deprecation")
4546
public class MappingTest {
4647

4748
@Test(expected = DataException.class)

0 commit comments

Comments
 (0)