Skip to content

Commit

Permalink
Merge branch 'release-5u18' into master
Browse files Browse the repository at this point in the history 
# Conflicts:
#	nablarch-archetype-parent/pom.xml
#	nablarch-batch-ee/pom.xml
#	nablarch-batch/pom.xml
#	nablarch-jaxrs/pom.xml
#	nablarch-web/pom.xml
  • Loading branch information
@mseko
mseko committed Sep 28, 2020
2 parents 45a08da + 38639eb commit 0edd144
Show file tree
Hide file tree
Showing 155 changed files with 10,789 additions and 245 deletions.
4 changes: 4 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
/nablarch-batch-ee/gsp-target
/nablarch-jaxrs/target
/nablarch-jaxrs/gsp-target
/nablarch-container-web/target
/nablarch-container-web/gsp-target
/nablarch-container-jaxrs/target
/nablarch-container-jaxrs/gsp-target

**/*.log
tmp
Expand Down
54 changes: 49 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
nablarch-single-module-archetype
================================

| master | develop |
|:-----------|:------------|
|[![Build Status](https://travis-ci.org/nablarch/nablarch-single-module-archetype.svg?branch=master)](https://travis-ci.org/nablarch/nablarch-single-module-archetype)|[![Build Status](https://travis-ci.org/nablarch/nablarch-single-module-archetype.svg?branch=develop)](https://travis-ci.org/nablarch/nablarch-single-module-archetype)|


| master | develop |
|:-----------|:------------|
|[![Build Status](https://travis-ci.org/nablarch/nablarch-single-module-archetype.svg?branch=master)](https://travis-ci.org/nablarch/nablarch-single-module-archetype)|[![Build Status](https://travis-ci.org/nablarch/nablarch-single-module-archetype.svg?branch=develop)](https://travis-ci.org/nablarch/nablarch-single-module-archetype)|


# 概要

アーキタイプ及び、アーキタイプが参照するparentです。
Expand All @@ -22,6 +22,8 @@ nablarch-single-module-archetype
|nablarch-jaxrs |RESTfulウェブサービス用アーキタイプ。 |
|nablarch-batch |Nablarchバッチアプリケーション用アーキタイプ。 |
|nablarch-batch-ee |JSR352に準拠したバッチアプリケーション用アーキタイプ。 |
|nablarch-container-web |ウェブアプリケーションのDockerコンテナ用アーキタイプ。 |
|nablarch-container-jaxrs |RESTfulウェブサービスのDockerコンテナ用アーキタイプ。 |


# ビルド方法
Expand Down Expand Up @@ -95,6 +97,34 @@ cd nablarch-batch-ee/target/generated-sources/archetype/
mvn install
```

## nablarch-container-web

```
# nablarch-container-webプロジェクトをベースにアーキタイプを生成
pushd nablarch-container-web
mvn clean archetype:create-from-project
popd
# 独自のカスタマイズを加える
./pre-create-maven-archetype-container-web.sh
cd nablarch-container-web/target/generated-sources/archetype/
mvn install
```

## nablarch-container-jaxrs
```
# nablarch-container-jaxrsプロジェクトをベースにアーキタイプを生成
pushd nablarch-container-jaxrs
mvn clean archetype:create-from-project
popd
# 独自のカスタマイズを加える
./pre-create-maven-archetype-container-jaxrs.sh
cd nablarch-container-jaxrs/target/generated-sources/archetype/
mvn install
```

# ビルドしたアーキタイプからプロジェクトを生成する方法

Expand Down Expand Up @@ -133,3 +163,17 @@ mvn org.apache.maven.plugins:maven-archetype-plugin:2.4:generate -DarchetypeGrou
mvn org.apache.maven.plugins:maven-archetype-plugin:2.4:generate -DarchetypeGroupId=com.nablarch.archetype -DarchetypeArtifactId=nablarch-batch-ee-archetype -DarchetypeVersion=xxx
```
(xxxの箇所は、適切なバージョンを指定してください)

## nablarch-container-web

```
mvn org.apache.maven.plugins:maven-archetype-plugin:2.4:generate -DarchetypeGroupId=com.nablarch.archetype -DarchetypeArtifactId=nablarch-container-web-archetype -DarchetypeVersion=xxx
```
(xxxの箇所は、適切なバージョンを指定してください)

## nablarch-container-jaxrs

```
mvn org.apache.maven.plugins:maven-archetype-plugin:2.4:generate -DarchetypeGroupId=com.nablarch.archetype -DarchetypeArtifactId=nablarch-container-jaxrs-archetype -DarchetypeVersion=xxx
```
(xxxの箇所は、適切なバージョンを指定してください)
104 changes: 104 additions & 0 deletions archetype-metadata-container-jaxrs.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="nablarch-container-jaxrs"
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/main/java</directory>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/webapp</directory>
<includes>
<include>**/*.xml</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
<include>**/*.config</include>
</includes>
</fileSet>
<fileSet encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
<include>**/*.edm</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources/META-INF</directory>
<includes>
<include>services/*</include>
</includes>
</fileSet>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/test/resources</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
</fileSet>
<fileSet encoding="MS932">
<directory>src/test/resources</directory>
<includes>
<include>**/*.csv</include>
</includes>
</fileSet>
<fileSet encoding="UTF-8">
<directory>h2/db</directory>
<includes>
<include>**/*.org</include>
<include>**/*.db</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="MS932">
<directory>db/data</directory>
<includes>
<include>**/*.sql</include>
</includes>
</fileSet>
<fileSet encoding="MS932">
<directory>db/ddl</directory>
<includes>
<include>**/*.sql</include>
</includes>
</fileSet>
<fileSet encoding="UTF-8">
<directory>h2/bin</directory>
<includes>
<include>**/*.bat</include>
<include>**/*.sh</include>
<include>**/*.jar</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/jib</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
</fileSet>
<fileSet encoding="UTF-8">
<directory></directory>
<includes>
<include>README.md</include>
<include>.gitignore</include>
</includes>
</fileSet>
</fileSets>
</archetype-descriptor>
134 changes: 134 additions & 0 deletions archetype-metadata-container-web.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="nablarch-container-web"
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/main/java</directory>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources/META-INF</directory>
<includes>
<include>services/*</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/webapp</directory>
<includes>
<include>**/*.jsp</include>
<include>**/*.xml</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
<include>**/*.config</include>
</includes>
</fileSet>
<fileSet encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
<include>**/*.edm</include>
</includes>
</fileSet>
<fileSet encoding="UTF-8">
<directory>src/main/webapp</directory>
<includes>
<include>**/*.jpg</include>
</includes>
</fileSet>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
<fileSet packaged="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
<include>**/*.xls</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/test/resources</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
<include>**/*.datarestore</include>
</includes>
</fileSet>
<fileSet encoding="MS932">
<directory>src/test/resources</directory>
<includes>
<include>**/*.csv</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>tools</directory>
<includes>
<include>**/*.xml</include>
</includes>
</fileSet>
<fileSet encoding="UTF-8">
<directory>h2/db</directory>
<includes>
<include>**/*.org</include>
<include>**/*.db</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="MS932">
<directory>db/data</directory>
<includes>
<include>**/*.sql</include>
</includes>
</fileSet>
<fileSet encoding="UTF-8">
<directory>tools/static-analysis</directory>
<includes>
<include>**/*.xsl</include>
<include>**/*.txt</include>
</includes>
</fileSet>
<fileSet encoding="MS932">
<directory>db/ddl</directory>
<includes>
<include>**/*.sql</include>
</includes>
</fileSet>
<fileSet encoding="UTF-8">
<directory>h2/bin</directory>
<includes>
<include>**/*.bat</include>
<include>**/*.sh</include>
<include>**/*.jar</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/jib</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
</fileSet>
<fileSet>
<directory>src/main/jib/var/nablarch/format</directory>
</fileSet>
<fileSet encoding="UTF-8">
<directory></directory>
<includes>
<include>README.md</include>
<include>.gitignore</include>
</includes>
</fileSet>
</fileSets>
</archetype-descriptor>
21 changes: 19 additions & 2 deletions nablarch-archetype-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>com.nablarch.archetype</groupId>
<artifactId>nablarch-archetype-parent</artifactId>
<version>5u17</version>
<version>5u18</version>
<packaging>pom</packaging>

<name>nablarch-archetype-parent</name>
Expand Down Expand Up @@ -51,7 +51,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<version.plugins.gsp.dba>4.4.0</version.plugins.gsp.dba>
<version.plugins.gsp.dba>4.4.1</version.plugins.gsp.dba>
<version.plugins.compiler>3.2</version.plugins.compiler>
<version.plugins.surefire>2.22.2</version.plugins.surefire>
<version.plugins.antrun>1.7</version.plugins.antrun>
Expand All @@ -68,6 +68,7 @@
<version.plugins.source>2.4</version.plugins.source>
<version.plugins.jacoco>0.8.3</version.plugins.jacoco>
<version.plugins.build-helper-maven>1.9.1</version.plugins.build-helper-maven>
<version.plugins.jib>2.1.0</version.plugins.jib>

<!-- toolsディレクトリへのパス -->
<nablarch.tools.dir>${project.basedir}/tools</nablarch.tools.dir>
Expand Down Expand Up @@ -99,6 +100,10 @@

<release.allow.snapshot>false</release.allow.snapshot>

<!-- 生成するイメージの名前 -->
<jib.to.image>${project.artifactId}</jib.to.image>
<!-- 生成するタグ -->
<jib.to.tags>latest,${project.version}</jib.to.tags>
</properties>


Expand Down Expand Up @@ -361,6 +366,18 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>${version.plugins.jib}</version>
<configuration>
<container>
<environment>
<JAVA_OPTS>-Duser.language=ja -Duser.country=JP</JAVA_OPTS>
</environment>
</container>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down
Loading

0 comments on commit 0edd144

Please sign in to comment.