1
0
mirror of synced 2026-02-04 12:07:59 +08:00

规划1.1.0版本

This commit is contained in:
6tail
2020-04-08 10:06:16 +08:00
parent 0e667f9d29
commit 846ae42453
4 changed files with 64 additions and 28 deletions

View File

@@ -1,18 +1,18 @@
# lunar [![License](https://img.shields.io/badge/license-MIT-4EB1BA.svg?style=flat-square)](https://github.com/6tail/lunar/blob/master/LICENSE)
lunar是一个无依赖的支持历和阴历的日历工具库
lunar是一款无第三方依赖的日历工具,支持历和农历、星座、干支、生肖、节气、节日、彭祖百忌、吉神方位、冲煞、纳音、星宿、八字、五行、十神等
> 支持java 1.5及以上版本。
[English](https://github.com/6tail/lunar-java/blob/master/README_EN.md)
### 稳定版本
### 也许稳定版本
```xml
<dependency>
<groupId>cn.6tail</groupId>
<artifactId>lunar</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</dependency>
```
@@ -34,7 +34,7 @@ lunar是一个无依赖的支持阳历和阴历的日历工具库。
<dependency>
<groupId>cn.6tail</groupId>
<artifactId>lunar</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</dependency>
```
@@ -42,7 +42,7 @@ lunar是一个无依赖的支持阳历和阴历的日历工具库。
如果使用jar建议下载最新的SNAPSHOT版本bug将得到及时的修复。
[Download](https://oss.sonatype.org/content/groups/public/cn/6tail/lunar/)
[Download](https://github.com/6tail/lunar-java/releases)
## 示例

View File

@@ -6,13 +6,13 @@ lunar is a calendar library for Solar and Chinese Lunar.
[简体中文](https://github.com/6tail/lunar-java/blob/master/README.md)
### Release
### Pre Release
```xml
<dependency>
<groupId>cn.6tail</groupId>
<artifactId>lunar</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</dependency>
```
@@ -34,7 +34,7 @@ lunar is a calendar library for Solar and Chinese Lunar.
<dependency>
<groupId>cn.6tail</groupId>
<artifactId>lunar</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</dependency>
```
@@ -42,7 +42,7 @@ lunar is a calendar library for Solar and Chinese Lunar.
If you will use jars in your projects, I suggest you to download latest snapshot versions with less bugs.
[Download](https://oss.sonatype.org/content/groups/public/cn/6tail/lunar/)
[Download](https://github.com/6tail/lunar-java/releases)
## Example

57
pom.xml
View File

@@ -7,10 +7,10 @@
<groupId>cn.6tail</groupId>
<artifactId>lunar</artifactId>
<packaging>jar</packaging>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.0</version>
<name>${project.groupId}:${project.artifactId}</name>
<url>https://github.com/6tail/lunar-java</url>
<description>calendar util</description>
<description>a calendar library for Solar and Chinese Lunar</description>
<licenses>
<license>
<name>The MIT License</name>
@@ -43,8 +43,17 @@
</repository>
</distributionManagement>
<properties>
<encoding>UTF-8</encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sourceEncoding>UTF-8</sourceEncoding>
<source-version>1.5</source-version>
<target-version>1.5</target-version>
<maven-compiler-plugin-version>3.3</maven-compiler-plugin-version>
<maven-surefire-plugin-version>2.5</maven-surefire-plugin-version>
<maven-javadoc-plugin-version>2.9</maven-javadoc-plugin-version>
<maven-source-plugin-version>2.4</maven-source-plugin-version>
<maven-release-plugin-version>2.2.2</maven-release-plugin-version>
<maven-gpg-plugin-version>1.6</maven-gpg-plugin-version>
</properties>
<dependencies>
@@ -66,35 +75,27 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.2.2</version>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin-version}</version>
<configuration>
<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
<source>${source-version}</source>
<target>${target-version}</target>
<encoding>${encoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.5</version>
<version>${maven-surefire-plugin-version}</version>
<configuration>
<argLine>-Dfile.encoding=UTF-8</argLine>
<skipTests>false</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<version>${maven-javadoc-plugin-version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -110,7 +111,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<version>${maven-source-plugin-version}</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -120,10 +121,18 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin-version}</version>
<configuration>
<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>${maven-gpg-plugin-version}</version>
<configuration>
<passphrase>${gpg.passphrase}</passphrase>
</configuration>
@@ -137,6 +146,16 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<finalName>${project.artifactId}-${project.version}</finalName>
<descriptors>
<descriptor>${basedir}/src/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</plugin>
</plugins>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>

17
src/assembly/assembly.xml Normal file
View File

@@ -0,0 +1,17 @@
<assembly>
<id>jar-with-dependencies</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.build.directory}/classes</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/java</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly>