Merge pull request #10 from wavemaker/dev-udaya/11.9

Upgraded connector code to support java 17 and compatible with wavema…
wavemaker · Oct 21, 2024 · e2aa84a · e2aa84a
2 parents 4f3f57a + 9ffb0b5
commit e2aa84a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 51 deletions.
diff --git a/jasper-report-connector-api/pom.xml b/jasper-report-connector-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.wavemaker.connector</groupId>
         <artifactId>jasper-report-connector</artifactId>
-        <version>1.0</version>
+        <version>2.0</version>
     </parent>
 
     <artifactId>jasper-report-connector-api</artifactId>
@@ -22,8 +22,8 @@
             <artifactId>wavemaker-app-runtime-connector-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/jasper-report-connector-api/src/main/resources/connector-metadata.yaml b/jasper-report-connector-api/src/main/resources/connector-metadata.yaml
@@ -1,4 +1,4 @@
-version: "1.0"
+version: "2.0"
 name: "jasper"
 description: "This connector is used to generate reports using jasper framework"
 springConfigurationClass: "com.wavemaker.connector.jasper.configuration.JasperConnectorConfiguration"
diff --git a/jasper-report-connector-impl/pom.xml b/jasper-report-connector-impl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.wavemaker.connector</groupId>
         <artifactId>jasper-report-connector</artifactId>
-        <version>1.0</version>
+        <version>2.0</version>
     </parent>
 
     <artifactId>jasper-report-connector-impl</artifactId>
@@ -25,11 +25,6 @@
             <groupId>com.wavemaker.runtime.connector</groupId>
             <artifactId>wavemaker-app-runtime-connector-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>6.0.4</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
@@ -147,8 +142,13 @@
             <artifactId>slf4j-api</artifactId>
         </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>
@@ -162,13 +162,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>

diff --git a/jasper-report-connector-packaging/pom.xml b/jasper-report-connector-packaging/pom.xml
@@ -7,27 +7,20 @@
     <parent>
         <groupId>com.wavemaker.connector</groupId>
         <artifactId>jasper-report-connector</artifactId>
-        <version>1.0</version>
+        <version>2.0</version>
     </parent>
 
     <artifactId>jasper-report-connector-packaging</artifactId>
 
     <packaging>jar</packaging>
     <name>jasper-report-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>jasper</connectorId>
                 </configuration>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.wavemaker.connector</groupId>
     <artifactId>jasper-report-connector</artifactId>
-    <version>1.0</version>
+    <version>2.0</version>
 
     <modules>
         <module>jasper-report-connector-api</module>
@@ -18,15 +18,17 @@
     <name>jasper-report-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>
@@ -41,29 +43,17 @@
                 <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>jasper-report-connector-api</artifactId>
                 <version>${project.version}</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>
 
@@ -72,11 +62,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>