Skip to content

Commit b8dba95

Browse files
authored
Merge pull request #777 from confluentinc/pr_merge_from_10_0_x_to_11_0_x
Merge Conflict Resolution (from 10.0.x to 11.0.x)
2 parents 15883ca + 50ee67e commit b8dba95

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
@@ -53,6 +53,7 @@
5353
<dependency.check.version>6.1.6</dependency.check.version>
5454
<confluent.maven.repo>http://packages.confluent.io/maven/</confluent.maven.repo>
5555
<commons.codec.version>1.15</commons.codec.version>
56+
<jackson.version>2.16.0</jackson.version>
5657
</properties>
5758

5859
<repositories>
@@ -261,6 +262,22 @@
261262
<version>${confluent.version}</version>
262263
<scope>test</scope>
263264
</dependency>
265+
<!-- 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.-->
266+
<dependency>
267+
<groupId>com.fasterxml.jackson.core</groupId>
268+
<artifactId>jackson-databind</artifactId>
269+
<version>${jackson.version}</version>
270+
</dependency>
271+
<dependency>
272+
<groupId>com.fasterxml.jackson.core</groupId>
273+
<artifactId>jackson-core</artifactId>
274+
<version>${jackson.version}</version>
275+
</dependency>
276+
<dependency>
277+
<groupId>com.fasterxml.jackson.core</groupId>
278+
<artifactId>jackson-annotations</artifactId>
279+
<version>${jackson.version}</version>
280+
</dependency>
264281
</dependencies>
265282

266283
<dependencyManagement>
@@ -660,4 +677,4 @@
660677
</build>
661678
</profile>
662679
</profiles>
663-
</project>
680+
</project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import static org.junit.Assert.assertEquals;
3939
import static org.junit.Assert.assertNull;
4040

41+
@SuppressWarnings("deprecation")
4142
public class MappingTest {
4243

4344
@Test(expected = DataException.class)

0 commit comments

Comments
 (0)