Skip to content

Commit 9abc6ca

Browse files
authored
Merge pull request #329 from ozlerhakan/4.7.0
v4.7.0
2 parents 835db2d + dedae2a commit 9abc6ca

File tree

3 files changed

+24
-48
lines changed

3 files changed

+24
-48
lines changed

.github/workflows/maven.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
name: Poiji Build
1+
name: Poiji Build and Test
22
on: [push, pull_request]
33
jobs:
4-
build:
4+
test:
5+
strategy:
6+
matrix:
7+
java: [ 11, 17, 23 ]
58
runs-on: ubuntu-latest
69
steps:
7-
- uses: actions/checkout@v2
8-
- name: Set up JDK 11
9-
uses: actions/setup-java@v2
10+
- uses: actions/checkout@v3
11+
- name: Set up JDK ${{ matrix.java }}
12+
uses: actions/setup-java@v3
1013
with:
11-
java-version: "11"
12-
distribution: "adopt"
13-
cache: maven
14-
- name: Build and Test with Maven
14+
java-version: ${{ matrix.java }}
15+
distribution: adopt
16+
- name: Build and Test project
1517
run: mvn clean -B package --file pom.xml -P coverage
1618
- name: Upload coverage reports to Codecov
1719
uses: codecov/[email protected]

README.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
:toclevels: 2
33

44
= Poiji
5-
:version: v4.6.0
6-
:branch: 4.6.0
5+
:version: v4.7.0
6+
:branch: 4.7.0
77

88
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"]
99
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:
2525
<dependency>
2626
<groupId>com.github.ozlerhakan</groupId>
2727
<artifactId>poiji</artifactId>
28-
<version>4.6.0</version>
28+
<version>4.7.0</version>
2929
</dependency>
3030
----
3131

pom.xml

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
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">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
45
<modelVersion>4.0.0</modelVersion>
56

67
<groupId>com.github.ozlerhakan</groupId>
78
<artifactId>poiji</artifactId>
8-
<version>4.6.0</version>
9+
<version>4.7.0</version>
910
<packaging>jar</packaging>
1011

1112
<name>poiji</name>
@@ -44,17 +45,16 @@
4445
</issueManagement>
4546

4647
<properties>
47-
<apache.poi.version>5.3.0</apache.poi.version>
48+
<apache.poi.version>5.4.0</apache.poi.version>
4849
<junit.version>4.13.2</junit.version>
4950
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
5051
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5152

5253
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
5354
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
54-
<jdk.source>11</jdk.source>
55-
<jdk.target>11</jdk.target>
56-
57-
<maven.version>3.0.4</maven.version>
55+
<maven.compiler.source>11</maven.compiler.source>
56+
<maven.compiler.target>11</maven.compiler.target>
57+
<java.version>11</java.version>
5858
</properties>
5959

6060
<dependencies>
@@ -94,10 +94,9 @@
9494
<plugin>
9595
<groupId>org.apache.maven.plugins</groupId>
9696
<artifactId>maven-compiler-plugin</artifactId>
97-
<version>3.6.1</version>
97+
<version>3.13.0</version>
9898
<configuration>
99-
<source>${jdk.source}</source>
100-
<target>${jdk.target}</target>
99+
<release>11</release>
101100
</configuration>
102101
</plugin>
103102
<plugin>
@@ -172,39 +171,14 @@
172171
</gpgArguments>
173172
</configuration>
174173
</plugin>
175-
176-
<plugin>
177-
<groupId>org.apache.maven.plugins</groupId>
178-
<artifactId>maven-enforcer-plugin</artifactId>
179-
<version>${maven-enforcer-plugin.version}</version>
180-
<executions>
181-
<execution>
182-
<id>enforce-versions</id>
183-
<goals>
184-
<goal>enforce</goal>
185-
</goals>
186-
<configuration>
187-
<rules>
188-
<!--Enforce maven version-->
189-
<requireMavenVersion>
190-
<version>${maven.version}</version>
191-
</requireMavenVersion>
192-
<requireJavaVersion>
193-
<version>${jdk.source}</version>
194-
</requireJavaVersion>
195-
</rules>
196-
</configuration>
197-
</execution>
198-
</executions>
199-
</plugin>
200174
</plugins>
201175
</build>
202176

203177
<profiles>
204178
<profile>
205179
<id>javadoclint</id>
206180
<activation>
207-
<jdk>[1.8)</jdk>
181+
<jdk>[11,)</jdk>
208182
</activation>
209183
<properties>
210184
<javadoc.none>-Xdoclint:none</javadoc.none>

0 commit comments

Comments
 (0)