Skip to content

Commit

Permalink
Merge pull request #136 from mygreen/develop/2.3
Browse files Browse the repository at this point in the history
Develop/2.3 のmasterマージ
  • Loading branch information
mygreen authored Jan 2, 2025
2 parents a43a5f3 + 797e639 commit 1fbcc76
Show file tree
Hide file tree
Showing 148 changed files with 8,964 additions and 2,000 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ jobs:
- name: Set up Locale
run: |
sudo apt-get -y install fonts-ipafont language-pack-ja
sudo locale-gen ja_JP.UTF-8
sudo update-locale LANG=ja_JP.UTF-8
sudo update-locale LC_ALL=ja_JP.UTF-8
sudo localectl status
- name: Set up Time-Zone
run: sudo timedatectl set-timezone Asia/Tokyo
- uses: actions/checkout@v4
Expand All @@ -31,8 +33,10 @@ jobs:
distribution: 'corretto'
java-version: 8
- name: Set up Maven
uses: stCarolas/setup-maven@v4.5
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.6
- name: Build with Maven
env:
TZ: 'Asia/Tokyo'
run: mvn -B clean verify -Dgpg.skip=true
22 changes: 0 additions & 22 deletions .travis.yml

This file was deleted.

21 changes: 8 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.mygreen/xlsmapper/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.mygreen/xlsmapper/)
[![Javadocs](http://javadoc.io/badge/com.github.mygreen/xlsmapper.svg?color=blue)](http://javadoc.io/doc/com.github.mygreen/xlsmapper)
[![Java CI with Maven](https://github.com/mygreen/xlsmapper/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/mygreen/xlsmapper/actions?query=workflow%3A%22Java+CI+with+Maven%22)
[![SonarQube](https://sonarcloud.io/api/project_badges/measure?project=com.github.mygreen%3Axlsmapper&metric=alert_status)](https://sonarcloud.io/dashboard?id=com.github.mygreen%3Axlsmapper)

# XlsMapper

Expand All @@ -13,23 +12,24 @@ Apache License verion 2.0

# Depends
+ Java1.8
+ Apache POI v5.1.0
+ SpringFramework 3.0+ (optional)
+ BeanValidation 1.0/1.1/2.0 (optional)
+ Apache POI v5.1.0+
+ Spring Framework 3.0+ (optional)
+ Bean Validation 1.0/1.1/2.0 (optional)
+ Jakarta Bean Validation 3.0/3.1 (optional)

# Setup

1. Add dependency for XlsMapper
```xml
```xml:pom.xml
<dependency>
<groupId>com.github.mygreen</groupId>
<artifactId>xlsmapper</artifactId>
<version>2.2</version>
<version>2.3</version>
</dependency>
```

2. Add dependency for Logging library. Example Logback.
```xml
```xml:pom.xml
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand All @@ -39,18 +39,13 @@ Apache License verion 2.0

# Build

1. Setup Java SE 8 (1.8.0_121+)
1. Setup Java SE 8
2. Setup Maven
3. Build jar files.
```console
# mvn clean package
```
4. Generate site files. (with Docker)
1. build docker for sphinx.
```console
docker build -t xlsmapper/sphinx ./docker/sphinx
```
2. generate site.
```console
# mvn site -Dgpg.skip=true
```
Expand Down
2 changes: 1 addition & 1 deletion deploy.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ call env.bat

call mvn -version

call mvn clean deploy
call mvn clean verify deploy

pause
5 changes: 0 additions & 5 deletions docker/sphinx/Dockerfile

This file was deleted.

2 changes: 0 additions & 2 deletions docker/sphinx/requirements.txt

This file was deleted.

21 changes: 0 additions & 21 deletions make_sphinx_html.bat

This file was deleted.

34 changes: 0 additions & 34 deletions make_sphinx_html.sh

This file was deleted.

Loading

0 comments on commit 1fbcc76

Please sign in to comment.