Skip to content

Commit

Permalink
Merge pull request #2 from wavemaker/dev-udaya/11.9
Browse files Browse the repository at this point in the history
Upgraded connector code to support java 17 and compatible with wavema…
  • Loading branch information
udaysa authored Oct 21, 2024
2 parents 6657197 + 4aeff6b commit c9e3658
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 44 deletions.
2 changes: 1 addition & 1 deletion kafka-connector-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.wavemaker.connector</groupId>
<artifactId>kafka-connector</artifactId>
<version>1.0</version>
<version>2.0</version>
</parent>

<artifactId>kafka-connector-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "1.0"
version: "2.0"
name: "kafka"
description: "This connector is used to publish and receive messages through kafka distributed messaging framework"
springConfigurationClass: "com.wavemaker.connector.kafka.configuration.KafkaConnectorConfiguration"
20 changes: 10 additions & 10 deletions kafka-connector-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.wavemaker.connector</groupId>
<artifactId>kafka-connector</artifactId>
<version>1.0</version>
<version>2.0</version>
</parent>

<artifactId>kafka-connector-impl</artifactId>
Expand Down Expand Up @@ -40,8 +40,13 @@
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -55,13 +60,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
11 changes: 2 additions & 9 deletions kafka-connector-packaging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,20 @@
<parent>
<groupId>com.wavemaker.connector</groupId>
<artifactId>kafka-connector</artifactId>
<version>1.0</version>
<version>2.0</version>
</parent>

<artifactId>kafka-connector-packaging</artifactId>

<packaging>jar</packaging>
<name>kafka-connector-packaging</name>


<dependencies>
<dependency>
<artifactId>wavemaker-connector-build-maven-plugin</artifactId>
<groupId>com.wavemaker.connector.build</groupId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>com.wavemaker.connector.build</groupId>
<artifactId>wavemaker-connector-build-maven-plugin</artifactId>
<version>${wavemaker-version}</version>
<configuration>
<connectorId>kafka</connectorId>
</configuration>
Expand Down
32 changes: 9 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.wavemaker.connector</groupId>
<artifactId>kafka-connector</artifactId>
<version>1.0</version>
<version>2.0</version>

<modules>
<module>kafka-connector-api</module>
Expand All @@ -18,15 +18,16 @@
<name>kafka-connector</name>

<properties>
<wavemaker-version>10.5.3.9077</wavemaker-version>
<wavemaker-version>11.9.0</wavemaker-version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>


<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.wavemaker.runtime</groupId>
<artifactId>wavemaker-app-runtime-services</artifactId>
<groupId>com.wavemaker.app</groupId>
<artifactId>wavemaker-app-dependencies</artifactId>
<version>${wavemaker-version}</version>
<scope>import</scope>
<type>pom</type>
Expand All @@ -41,11 +42,6 @@
<artifactId>wavemaker-app-runtime-connector-impl</artifactId>
<version>${wavemaker-version}</version>
</dependency>
<dependency>
<groupId>com.wavemaker.connector.build</groupId>
<artifactId>wavemaker-connector-build-maven-plugin</artifactId>
<version>${wavemaker-version}</version>
</dependency>
<dependency>
<groupId>com.wavemaker.connector</groupId>
<artifactId>kafka-connector-api</artifactId>
Expand All @@ -61,18 +57,12 @@
<artifactId>spring-kafka</artifactId>
<version>2.2.3.RELEASE</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>

</dependencies>
</dependencyManagement>

Expand All @@ -81,11 +71,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
<version>3.13.0</version>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit c9e3658

Please sign in to comment.