Merge pull request #329 from ozlerhakan/4.7.0

v4.7.0
ozlerhakan · Jan 19, 2025 · 9abc6ca · 9abc6ca
2 parents 835db2d + dedae2a
commit 9abc6ca
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 48 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -1,17 +1,19 @@
-name: Poiji Build
+name: Poiji Build and Test
 on: [push, pull_request]
 jobs:
-  build:
+  test:
+    strategy:
+      matrix:
+        java: [ 11, 17, 23 ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v3
         with:
-          java-version: "11"
-          distribution: "adopt"
-          cache: maven
-      - name: Build and Test with Maven
+          java-version: ${{ matrix.java }}
+          distribution: adopt
+      - name: Build and Test project
         run: mvn clean -B package --file pom.xml -P coverage
       - name: Upload coverage reports to Codecov
         uses: codecov/[email protected]

diff --git a/README.adoc b/README.adoc
@@ -2,8 +2,8 @@
 :toclevels: 2
 
 = Poiji
-:version: v4.6.0
-:branch: 4.6.0
+:version: v4.7.0
+:branch: 4.7.0
 
 image:https://github.com/ozlerhakan/poiji/actions/workflows/maven.yml/badge.svg["Build Status"] image:https://app.codacy.com/project/badge/Grade/64f7e2cb9e604807b62334a4cfc3952d["Codacy code quality",link="https://www.codacy.com/gh/ozlerhakan/poiji/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ozlerhakan/poiji&utm_campaign=Badge_Grade"]
 image:https://codecov.io/gh/ozlerhakan/poiji/branch/master/graph/badge.svg?token=MN6V6xOWBq["Codecov",link="https://codecov.io/gh/ozlerhakan/poiji"] image:https://img.shields.io/badge/apache.poi-5.3.0-brightgreen.svg[] image:https://app.fossa.com/api/projects/git%2Bgithub.com%2Fozlerhakan%2Fpoiji.svg?type=shield["FOSSA Status",link="https://app.fossa.com/projects/git%2Bgithub.com%2Fozlerhakan%2Fpoiji?ref=badge_shield"]
@@ -25,7 +25,7 @@ In your Maven/Gradle project, first add the corresponding dependency:
 <dependency>
   <groupId>com.github.ozlerhakan</groupId>
   <artifactId>poiji</artifactId>
-  <version>4.6.0</version>
+  <version>4.7.0</version>
 </dependency>
 ----
 

diff --git a/pom.xml b/pom.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.github.ozlerhakan</groupId>
     <artifactId>poiji</artifactId>
-    <version>4.6.0</version>
+    <version>4.7.0</version>
     <packaging>jar</packaging>
 
     <name>poiji</name>
@@ -44,17 +45,16 @@
     </issueManagement>
 
     <properties>
-        <apache.poi.version>5.3.0</apache.poi.version>
+        <apache.poi.version>5.4.0</apache.poi.version>
         <junit.version>4.13.2</junit.version>
         <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
         <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
-        <jdk.source>11</jdk.source>
-        <jdk.target>11</jdk.target>
-
-        <maven.version>3.0.4</maven.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>11</java.version>
     </properties>
 
     <dependencies>
@@ -94,10 +94,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.13.0</version>
                 <configuration>
-                    <source>${jdk.source}</source>
-                    <target>${jdk.target}</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -172,39 +171,14 @@
                     </gpgArguments>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>${maven-enforcer-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <!--Enforce maven version-->
-                                <requireMavenVersion>
-                                    <version>${maven.version}</version>
-                                </requireMavenVersion>
-                                <requireJavaVersion>
-                                    <version>${jdk.source}</version>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
     <profiles>
         <profile>
             <id>javadoclint</id>
             <activation>
-                <jdk>[1.8)</jdk>
+                <jdk>[11,)</jdk>
             </activation>
             <properties>
                 <javadoc.none>-Xdoclint:none</javadoc.none>