From 97376aa5f2126ade48babc7a45e263138147dee1 Mon Sep 17 00:00:00 2001 From: koyi2016 Date: Fri, 14 May 2021 13:11:27 +0900 Subject: [PATCH 1/8] Update pom.xml to 6-NEXT-SNAPSHOT (#32) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3c75a40..b028144 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.nablarch.example nablarch-example-rest - 5-NEXT-SNAPSHOT + 6-NEXT-SNAPSHOT war @@ -39,7 +39,7 @@ com.nablarch.profile nablarch-bom - 5-NEXT-SNAPSHOT + 6-NEXT-SNAPSHOT pom import From 7488c7bb098ed77163e1213d36d93997f73747d8 Mon Sep 17 00:00:00 2001 From: opengl-8080 Date: Thu, 20 May 2021 13:54:26 +0900 Subject: [PATCH 2/8] =?UTF-8?q?jetty11=20=E5=AF=BE=E5=BF=9C=E3=81=8C?= =?UTF-8?q?=E5=AE=8C=E4=BA=86=E3=81=99=E3=82=8B=E3=81=BE=E3=81=A7=20bom=20?= =?UTF-8?q?=E3=81=8B=E3=82=89=E5=89=8A=E9=99=A4=E3=81=97=E3=81=9F=20jetty?= =?UTF-8?q?=20=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=82=92=E6=98=8E=E8=A8=98=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=8A=E3=81=8F=E4=BF=AE=E6=AD=A3=20(#33)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index b028144..677f885 100644 --- a/pom.xml +++ b/pom.xml @@ -73,6 +73,11 @@ com.nablarch.framework nablarch-testing-jetty6 + + 5-NEXT-SNAPSHOT test From 94452a5f142c351f686b5b3e78060eb27b3ac5fc Mon Sep 17 00:00:00 2001 From: opengl-8080 Date: Mon, 20 Feb 2023 20:02:41 +0900 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20Jakarta=20EE=20=E5=AF=BE=E5=BF=9C?= =?UTF-8?q?=20(#44)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .mvn/jvm.config | 1 + README.md | 105 +++++++++--------- pom.xml | 71 +++++++----- .../example/action/ProjectAction.java | 18 +-- .../example/error/ExampleErrorLogWriter.java | 2 +- .../error/ExampleErrorResponseBuilder.java | 2 +- .../nablarch/example/form/ProjectForm.java | 2 +- .../example/form/ProjectUpdateForm.java | 2 +- .../nablarch/example/validator/CodeValue.java | 4 +- .../example/validator/CodeValueValidator.java | 4 +- .../nablarch/example/validator/YYYYMMDD.java | 4 +- .../example/validator/YYYYMMDDValidator.java | 4 +- src/main/webapp/WEB-INF/web.xml | 6 +- .../example/client/ProjectClient.java | 8 +- src/test/resources/unit-test.xml | 4 +- 15 files changed, 127 insertions(+), 110 deletions(-) create mode 100644 .mvn/jvm.config diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 0000000..45d7a1d --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1 @@ +--add-opens java.base/java.lang=ALL-UNNAMED \ No newline at end of file diff --git a/README.md b/README.md index de808a5..cd122df 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,14 @@ Nablarchを使ったRESTfulウェブサービスのExampleです。 ### 1.動作環境 実行環境に以下のソフトウェアがインストールされている事を前提とします。 -* Java Version : 8 -* Maven 3.0.5以降 +* Java Version : 17 +* Maven 3.9.0以降 以下は、本手順では事前準備不要です。 |ソフトウェア|説明| |:---|:---| -|APサーバ|このアプリケーションはTomcat8を使用しています。waitt-maven-pluginはTomcat8へのアプリケーションのデプロイ、起動を行います。（起動前にエンティティクラスの作成とアプリケーションのコンパイルを別途行う必要があります。）| +|APサーバ|このアプリケーションはJetty12を使用しています。jetty-ee10-maven-pluginはJetty12へのアプリケーションのデプロイ、起動を行います。| |DBサーバ|このアプリケーションはH2 Database Engine(以下H2)を組み込んであるため、別途インストールの必要はありません。| ### 2. プロジェクトリポジトリの取得 @@ -33,10 +33,12 @@ Gitを使用しない場合、最新のタグからzipをダウンロードし $cd nablarch-example-rest $mvn compile +※gspプラグインをJava 17で実行するためにはJVMオプションの指定が必要ですが、そのオプションは`.mvn/jvm.config`で指定しています。 + ### 4 アプリケーションの起動 -最後にwaitt-maven-pluginを実行し、ウェブサービスを起動します。以下のコマンドを実行してください。 +最後にjetty-ee10-maven-pluginを実行し、ウェブサービスを起動します。以下のコマンドを実行してください。 - $mvn waitt:run-headless + $mvn jetty-ee10:run ### 5. テスト用クライアントクラスからのアクセス @@ -46,52 +48,53 @@ Gitを使用しない場合、最新のタグからzipをダウンロードし 初期状態のデータでは、標準出力に以下の内容が表示されればOKです。 - ---- projects (size: 10) ---- - Project({projectId=1, projectName=プロジェクト００１, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2015/04/09, clientId=1, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=2, projectName=プロジェクト００２, projectType=maintenance, projectClass=b, projectStartDate=2010/09/18, projectEndDate=2014/11/10, clientId=2, projectManager=佐藤, projectLeader=鈴木, userId=100, note=null, sales=null, costOfGoodsSold=null, sga=null, allocationOfCorpExpenses=null, client=null, systemAccount=null}) - Project({projectId=3, projectName=プロジェクト００３, projectType=development, projectClass=c, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=3, projectManager=田中, projectLeader=佐藤, userId=100, note=空白, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=4, projectName=プロジェクト００４, projectType=development, projectClass=a, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=4, projectManager=山田, projectLeader=田中, userId=100, note=なし, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=5, projectName=プロジェクト００５, projectType=maintenance, projectClass=ss, projectStartDate=2012/12/01, projectEndDate=2014/12/31, clientId=5, projectManager=鈴木, projectLeader=山田, userId=100, note=テスト, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=6, projectName=プロジェクト００６, projectType=maintenance, projectClass=d, projectStartDate=2012/06/22, projectEndDate=2015/01/08, clientId=6, projectManager=佐藤, projectLeader=鈴木, userId=100, note=null, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=7, projectName=プロジェクト００７, projectType=development, projectClass=s, projectStartDate=2012/12/01, projectEndDate=2015/04/09, clientId=7, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄１, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=8, projectName=プロジェクト００８, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2014/11/10, clientId=8, projectManager=佐藤, projectLeader=佐藤, userId=100, note=備考欄２, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=9, projectName=プロジェクト００９, projectType=development, projectClass=b, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=9, projectManager=田中, projectLeader=鈴木, userId=100, note=備考欄３, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=10, projectName=プロジェクト０１０, projectType=maintenance, projectClass=c, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=10, projectManager=山田, projectLeader=佐藤, userId=100, note=備考欄４, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - ---- projects (size: 1) ---- - Project({projectId=1, projectName=プロジェクト００１, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2015/04/09, clientId=1, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - insert status:201 - ---- projects (size: 11) ---- - Project({projectId=1, projectName=プロジェクト００１, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2015/04/09, clientId=1, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=2, projectName=プロジェクト００２, projectType=maintenance, projectClass=b, projectStartDate=2010/09/18, projectEndDate=2014/11/10, clientId=2, projectManager=佐藤, projectLeader=鈴木, userId=100, note=null, sales=null, costOfGoodsSold=null, sga=null, allocationOfCorpExpenses=null, client=null, systemAccount=null}) - Project({projectId=3, projectName=プロジェクト００３, projectType=development, projectClass=c, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=3, projectManager=田中, projectLeader=佐藤, userId=100, note=空白, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=4, projectName=プロジェクト００４, projectType=development, projectClass=a, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=4, projectManager=山田, projectLeader=田中, userId=100, note=なし, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=5, projectName=プロジェクト００５, projectType=maintenance, projectClass=ss, projectStartDate=2012/12/01, projectEndDate=2014/12/31, clientId=5, projectManager=鈴木, projectLeader=山田, userId=100, note=テスト, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=6, projectName=プロジェクト００６, projectType=maintenance, projectClass=d, projectStartDate=2012/06/22, projectEndDate=2015/01/08, clientId=6, projectManager=佐藤, projectLeader=鈴木, userId=100, note=null, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=7, projectName=プロジェクト００７, projectType=development, projectClass=s, projectStartDate=2012/12/01, projectEndDate=2015/04/09, clientId=7, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄１, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=8, projectName=プロジェクト００８, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2014/11/10, clientId=8, projectManager=佐藤, projectLeader=佐藤, userId=100, note=備考欄２, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=9, projectName=プロジェクト００９, projectType=development, projectClass=b, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=9, projectManager=田中, projectLeader=鈴木, userId=100, note=備考欄３, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=10, projectName=プロジェクト０１０, projectType=maintenance, projectClass=c, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=10, projectManager=山田, projectLeader=佐藤, userId=100, note=備考欄４, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=11, projectName=プロジェクト９９９, projectType=development, projectClass=s, projectStartDate=2016/01/01, projectEndDate=2016/03/31, clientId=10, projectManager=鈴木, projectLeader=佐藤, userId=null, note=備考９９９, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - 2019-05-22 10:58:26.319 -INFO- nablarch.core.log.basic.BasicLoggerFactory [null] initialized. - LOGGER = [DEV] NAME REGEX = [DEV] LEVEL = [INFO] - LOGGER = [PER] NAME REGEX = [PERFORMANCE] LEVEL = [INFO] - LOGGER = [SQL] NAME REGEX = [SQL] LEVEL = [INFO] - LOGGER = [ROO] NAME REGEX = [.*] LEVEL = [INFO] - update status:200 - ---- projects (size: 11) ---- - Project({projectId=1, projectName=プロジェクト００１, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2015/04/09, clientId=1, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=2, projectName=プロジェクト００２, projectType=maintenance, projectClass=b, projectStartDate=2010/09/18, projectEndDate=2014/11/10, clientId=2, projectManager=佐藤, projectLeader=鈴木, userId=100, note=null, sales=null, costOfGoodsSold=null, sga=null, allocationOfCorpExpenses=null, client=null, systemAccount=null}) - Project({projectId=3, projectName=プロジェクト００３, projectType=development, projectClass=c, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=3, projectManager=田中, projectLeader=佐藤, userId=100, note=空白, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=4, projectName=プロジェクト００４, projectType=development, projectClass=a, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=4, projectManager=山田, projectLeader=田中, userId=100, note=なし, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=5, projectName=プロジェクト００５, projectType=maintenance, projectClass=ss, projectStartDate=2012/12/01, projectEndDate=2014/12/31, clientId=5, projectManager=鈴木, projectLeader=山田, userId=100, note=テスト, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=6, projectName=プロジェクト００６, projectType=maintenance, projectClass=d, projectStartDate=2012/06/22, projectEndDate=2015/01/08, clientId=6, projectManager=佐藤, projectLeader=鈴木, userId=100, note=null, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=7, projectName=プロジェクト００７, projectType=development, projectClass=s, projectStartDate=2012/12/01, projectEndDate=2015/04/09, clientId=7, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄１, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=8, projectName=プロジェクト００８, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2014/11/10, clientId=8, projectManager=佐藤, projectLeader=佐藤, userId=100, note=備考欄２, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=9, projectName=プロジェクト００９, projectType=development, projectClass=b, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=9, projectManager=田中, projectLeader=鈴木, userId=100, note=備考欄３, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=10, projectName=プロジェクト０１０, projectType=maintenance, projectClass=c, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=10, projectManager=山田, projectLeader=佐藤, userId=100, note=備考欄４, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) - Project({projectId=11, projectName=プロジェクト８８８, projectType=development, projectClass=a, projectStartDate=2015/01/01, projectEndDate=2015/03/31, clientId=1, projectManager=佐藤, projectLeader=鈴木, userId=null, note=備考８８８, sales=20000, costOfGoodsSold=2000, sga=3000, allocationOfCorpExpenses=4000, client=null, systemAccount=null}) - - Process finished with exit code 0 +```log +---- projects (size: 10) ---- +Project({projectId=1, projectName=プロジェクト００１, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2015/04/09, clientId=1, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=2, projectName=プロジェクト００２, projectType=maintenance, projectClass=b, projectStartDate=2010/09/18, projectEndDate=2014/11/10, clientId=2, projectManager=佐藤, projectLeader=鈴木, userId=100, note=null, sales=null, costOfGoodsSold=null, sga=null, allocationOfCorpExpenses=null, client=null, systemAccount=null}) +Project({projectId=3, projectName=プロジェクト００３, projectType=development, projectClass=c, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=3, projectManager=田中, projectLeader=佐藤, userId=100, note=空白, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=4, projectName=プロジェクト００４, projectType=development, projectClass=a, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=4, projectManager=山田, projectLeader=田中, userId=100, note=なし, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=5, projectName=プロジェクト００５, projectType=maintenance, projectClass=ss, projectStartDate=2012/12/01, projectEndDate=2014/12/31, clientId=5, projectManager=鈴木, projectLeader=山田, userId=100, note=テスト, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=6, projectName=プロジェクト００６, projectType=maintenance, projectClass=d, projectStartDate=2012/06/22, projectEndDate=2015/01/08, clientId=6, projectManager=佐藤, projectLeader=鈴木, userId=100, note=null, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=7, projectName=プロジェクト００７, projectType=development, projectClass=s, projectStartDate=2012/12/01, projectEndDate=2015/04/09, clientId=7, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄１, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=8, projectName=プロジェクト００８, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2014/11/10, clientId=8, projectManager=佐藤, projectLeader=佐藤, userId=100, note=備考欄２, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=9, projectName=プロジェクト００９, projectType=development, projectClass=b, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=9, projectManager=田中, projectLeader=鈴木, userId=100, note=備考欄３, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=10, projectName=プロジェクト０１０, projectType=maintenance, projectClass=c, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=10, projectManager=山田, projectLeader=佐藤, userId=100, note=備考欄４, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +---- projects (size: 1) ---- +Project({projectId=1, projectName=プロジェクト００１, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2015/04/09, clientId=1, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +insert status:201 +---- projects (size: 11) ---- +Project({projectId=1, projectName=プロジェクト００１, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2015/04/09, clientId=1, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=2, projectName=プロジェクト００２, projectType=maintenance, projectClass=b, projectStartDate=2010/09/18, projectEndDate=2014/11/10, clientId=2, projectManager=佐藤, projectLeader=鈴木, userId=100, note=null, sales=null, costOfGoodsSold=null, sga=null, allocationOfCorpExpenses=null, client=null, systemAccount=null}) +Project({projectId=3, projectName=プロジェクト００３, projectType=development, projectClass=c, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=3, projectManager=田中, projectLeader=佐藤, userId=100, note=空白, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=4, projectName=プロジェクト００４, projectType=development, projectClass=a, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=4, projectManager=山田, projectLeader=田中, userId=100, note=なし, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=5, projectName=プロジェクト００５, projectType=maintenance, projectClass=ss, projectStartDate=2012/12/01, projectEndDate=2014/12/31, clientId=5, projectManager=鈴木, projectLeader=山田, userId=100, note=テスト, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=6, projectName=プロジェクト００６, projectType=maintenance, projectClass=d, projectStartDate=2012/06/22, projectEndDate=2015/01/08, clientId=6, projectManager=佐藤, projectLeader=鈴木, userId=100, note=null, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=7, projectName=プロジェクト００７, projectType=development, projectClass=s, projectStartDate=2012/12/01, projectEndDate=2015/04/09, clientId=7, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄１, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=8, projectName=プロジェクト００８, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2014/11/10, clientId=8, projectManager=佐藤, projectLeader=佐藤, userId=100, note=備考欄２, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=9, projectName=プロジェクト００９, projectType=development, projectClass=b, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=9, projectManager=田中, projectLeader=鈴木, userId=100, note=備考欄３, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=10, projectName=プロジェクト０１０, projectType=maintenance, projectClass=c, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=10, projectManager=山田, projectLeader=佐藤, userId=100, note=備考欄４, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=11, projectName=プロジェクト９９９, projectType=development, projectClass=s, projectStartDate=2016/01/01, projectEndDate=2016/03/31, clientId=10, projectManager=鈴木, projectLeader=佐藤, userId=null, note=備考９９９, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +2023-02-15 17:10:49.832 -INFO- null [null] boot_proc = [] proc_sys = [rest] req_id = [null] usr_id = [null] initialized. + LOGGER = [DEV] NAME REGEX = [DEV] LEVEL = [INFO] + LOGGER = [PER] NAME REGEX = [PERFORMANCE] LEVEL = [INFO] + LOGGER = [SQL] NAME REGEX = [SQL] LEVEL = [INFO] + LOGGER = [ACC] NAME REGEX = [HTTP_ACCESS] LEVEL = [INFO] + LOGGER = [ROO] NAME REGEX = [.*] LEVEL = [DEBUG] +update status:200 +---- projects (size: 11) ---- +Project({projectId=1, projectName=プロジェクト００１, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2015/04/09, clientId=1, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=2, projectName=プロジェクト００２, projectType=maintenance, projectClass=b, projectStartDate=2010/09/18, projectEndDate=2014/11/10, clientId=2, projectManager=佐藤, projectLeader=鈴木, userId=100, note=null, sales=null, costOfGoodsSold=null, sga=null, allocationOfCorpExpenses=null, client=null, systemAccount=null}) +Project({projectId=3, projectName=プロジェクト００３, projectType=development, projectClass=c, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=3, projectManager=田中, projectLeader=佐藤, userId=100, note=空白, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=4, projectName=プロジェクト００４, projectType=development, projectClass=a, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=4, projectManager=山田, projectLeader=田中, userId=100, note=なし, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=5, projectName=プロジェクト００５, projectType=maintenance, projectClass=ss, projectStartDate=2012/12/01, projectEndDate=2014/12/31, clientId=5, projectManager=鈴木, projectLeader=山田, userId=100, note=テスト, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=6, projectName=プロジェクト００６, projectType=maintenance, projectClass=d, projectStartDate=2012/06/22, projectEndDate=2015/01/08, clientId=6, projectManager=佐藤, projectLeader=鈴木, userId=100, note=null, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=7, projectName=プロジェクト００７, projectType=development, projectClass=s, projectStartDate=2012/12/01, projectEndDate=2015/04/09, clientId=7, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄１, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=8, projectName=プロジェクト００８, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2014/11/10, clientId=8, projectManager=佐藤, projectLeader=佐藤, userId=100, note=備考欄２, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=9, projectName=プロジェクト００９, projectType=development, projectClass=b, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=9, projectManager=田中, projectLeader=鈴木, userId=100, note=備考欄３, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=10, projectName=プロジェクト０１０, projectType=maintenance, projectClass=c, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=10, projectManager=山田, projectLeader=佐藤, userId=100, note=備考欄４, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) +Project({projectId=11, projectName=プロジェクト８８８, projectType=development, projectClass=a, projectStartDate=2015/01/01, projectEndDate=2015/03/31, clientId=1, projectManager=佐藤, projectLeader=鈴木, userId=null, note=備考８８８, sales=20000, costOfGoodsSold=2000, sga=3000, allocationOfCorpExpenses=4000, client=null, systemAccount=null}) +``` ### 6. テーブルのデータの初期化手順 テーブルのデータを初期状態に戻したい場合は、以下のコマンドを実行します。 diff --git a/pom.xml b/pom.xml index 677f885..f7da693 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ war - 1.8 - 1.8 + 17 + 17 UTF-8 UTF-8 @@ -50,6 +50,20 @@ pom import + + jakarta.platform + jakarta.jakartaee-bom + 10.0.0 + pom + import + + + org.glassfish.jersey + jersey-bom + 3.1.1 + pom + import + @@ -72,12 +86,7 @@ com.nablarch.framework - nablarch-testing-jetty6 - - 5-NEXT-SNAPSHOT + nablarch-testing-jetty12 test @@ -143,39 +152,46 @@ - org.apache.geronimo.specs - geronimo-jpa_2.0_spec + jakarta.annotation + jakarta.annotation-api + + + + jakarta.persistence + jakarta.persistence-api - javax.ws.rs - javax.ws.rs-api - 2.1.1 + jakarta.ws.rs + jakarta.ws.rs-api - org.hibernate + org.hibernate.validator hibernate-validator - 5.3.6.Final + 8.0.0.Final runtime org.glassfish.jersey.media jersey-media-json-jackson - 2.29.1 + + + + com.fasterxml.jackson.core + jackson-databind + 2.14.1 org.glassfish.jersey.core jersey-client - 2.29.1 test org.glassfish.jersey.inject jersey-hk2 - 2.29.1 test @@ -210,7 +226,7 @@ jp.co.tis.gsp gsp-dba-maven-plugin - 4.6.0-SNAPSHOT + 5.0.0-SNAPSHOT src/main/resources/entity/data-model.edm @@ -280,18 +296,13 @@ - net.unit8.waitt - waitt-maven-plugin - 1.2.3 + org.eclipse.jetty.ee10 + jetty-ee10-maven-plugin + 12.0.0.alpha3 - 9080 - - - net.unit8.waitt.server - waitt-tomcat8 - 1.2.3 - - + + 9080 + diff --git a/src/main/java/com/nablarch/example/action/ProjectAction.java b/src/main/java/com/nablarch/example/action/ProjectAction.java index 73475c4..263894a 100644 --- a/src/main/java/com/nablarch/example/action/ProjectAction.java +++ b/src/main/java/com/nablarch/example/action/ProjectAction.java @@ -14,15 +14,15 @@ import nablarch.fw.web.HttpRequest; import nablarch.fw.web.HttpResponse; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PATCH; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/nablarch/example/error/ExampleErrorLogWriter.java b/src/main/java/com/nablarch/example/error/ExampleErrorLogWriter.java index 510cf55..04cdfca 100644 --- a/src/main/java/com/nablarch/example/error/ExampleErrorLogWriter.java +++ b/src/main/java/com/nablarch/example/error/ExampleErrorLogWriter.java @@ -6,7 +6,7 @@ import nablarch.fw.web.HttpRequest; import nablarch.fw.web.HttpResponse; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; /** * Example用のエラーログ出力クラス。 diff --git a/src/main/java/com/nablarch/example/error/ExampleErrorResponseBuilder.java b/src/main/java/com/nablarch/example/error/ExampleErrorResponseBuilder.java index 46db781..9ad9b3e 100644 --- a/src/main/java/com/nablarch/example/error/ExampleErrorResponseBuilder.java +++ b/src/main/java/com/nablarch/example/error/ExampleErrorResponseBuilder.java @@ -1,6 +1,6 @@ package com.nablarch.example.error; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import nablarch.common.dao.NoDataException; import nablarch.fw.ExecutionContext; diff --git a/src/main/java/com/nablarch/example/form/ProjectForm.java b/src/main/java/com/nablarch/example/form/ProjectForm.java index 008ffcb..a963c28 100644 --- a/src/main/java/com/nablarch/example/form/ProjectForm.java +++ b/src/main/java/com/nablarch/example/form/ProjectForm.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.AssertTrue; +import jakarta.validation.constraints.AssertTrue; import nablarch.core.validation.ee.Domain; import nablarch.core.validation.ee.Required; diff --git a/src/main/java/com/nablarch/example/form/ProjectUpdateForm.java b/src/main/java/com/nablarch/example/form/ProjectUpdateForm.java index 1b13fbb..e8afbc6 100644 --- a/src/main/java/com/nablarch/example/form/ProjectUpdateForm.java +++ b/src/main/java/com/nablarch/example/form/ProjectUpdateForm.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.validation.constraints.AssertTrue; +import jakarta.validation.constraints.AssertTrue; import nablarch.core.validation.ee.Domain; import nablarch.core.validation.ee.Required; diff --git a/src/main/java/com/nablarch/example/validator/CodeValue.java b/src/main/java/com/nablarch/example/validator/CodeValue.java index 98aca6d..888b9db 100644 --- a/src/main/java/com/nablarch/example/validator/CodeValue.java +++ b/src/main/java/com/nablarch/example/validator/CodeValue.java @@ -2,8 +2,8 @@ import com.nablarch.example.code.CodeEnum; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/main/java/com/nablarch/example/validator/CodeValueValidator.java b/src/main/java/com/nablarch/example/validator/CodeValueValidator.java index 6b9eaac..970951e 100644 --- a/src/main/java/com/nablarch/example/validator/CodeValueValidator.java +++ b/src/main/java/com/nablarch/example/validator/CodeValueValidator.java @@ -3,8 +3,8 @@ import com.nablarch.example.code.CodeEnum; import nablarch.core.util.StringUtil; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; /** * CodeValueの検証を行う実装クラス。 diff --git a/src/main/java/com/nablarch/example/validator/YYYYMMDD.java b/src/main/java/com/nablarch/example/validator/YYYYMMDD.java index d55296c..5bce404 100644 --- a/src/main/java/com/nablarch/example/validator/YYYYMMDD.java +++ b/src/main/java/com/nablarch/example/validator/YYYYMMDD.java @@ -4,8 +4,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.CONSTRUCTOR; diff --git a/src/main/java/com/nablarch/example/validator/YYYYMMDDValidator.java b/src/main/java/com/nablarch/example/validator/YYYYMMDDValidator.java index fe41dba..60d5a43 100644 --- a/src/main/java/com/nablarch/example/validator/YYYYMMDDValidator.java +++ b/src/main/java/com/nablarch/example/validator/YYYYMMDDValidator.java @@ -3,8 +3,8 @@ import nablarch.core.util.DateUtil; import nablarch.core.util.StringUtil; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; /** * YYYYMMDDの検証を行う実装クラス。 diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 817fd75..4b24d8c 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,9 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee + web-app_6_0.xsd" + version="6.0"> di.config diff --git a/src/test/java/com/nablarch/example/client/ProjectClient.java b/src/test/java/com/nablarch/example/client/ProjectClient.java index 3ac9625..687c0be 100644 --- a/src/test/java/com/nablarch/example/client/ProjectClient.java +++ b/src/test/java/com/nablarch/example/client/ProjectClient.java @@ -4,10 +4,10 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; import nablarch.core.beans.BeanUtil; import nablarch.core.beans.CopyOptions; diff --git a/src/test/resources/unit-test.xml b/src/test/resources/unit-test.xml index 054e05a..08324b9 100644 --- a/src/test/resources/unit-test.xml +++ b/src/test/resources/unit-test.xml @@ -19,7 +19,7 @@ - - + + From 0bc0c944f10e11ec955d8495aaf26fdf6678158b Mon Sep 17 00:00:00 2001 From: opengl-8080 Date: Wed, 5 Apr 2023 10:39:40 +0900 Subject: [PATCH 4/8] =?UTF-8?q?develop=E3=81=AE=E6=9C=80=E6=96=B0=E3=82=92?= =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B8=20(#46)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Jackson-databindのバージョンアップにあわせてjerseyもバージョンアップ (#43) * Jackson関連のバージョン不整合でエラーが発生するためバージョン修正 (#45) * jackson関連のバージョン不整合でエラーが発生するためバージョンを見直し * ProjectClient実行時のログ内容が異なるため最新化 --------- Co-authored-by: hijiri.shinya --------- Co-authored-by: kumagoro1202 <58413950+kumagoro1202@users.noreply.github.com> Co-authored-by: Shinya Hijiri Co-authored-by: hijiri.shinya --- README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cd122df..1af1160 100644 --- a/README.md +++ b/README.md @@ -75,12 +75,12 @@ Project({projectId=8, projectName=プロジェクト００８, projectType=devel Project({projectId=9, projectName=プロジェクト００９, projectType=development, projectClass=b, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=9, projectManager=田中, projectLeader=鈴木, userId=100, note=備考欄３, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) Project({projectId=10, projectName=プロジェクト０１０, projectType=maintenance, projectClass=c, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=10, projectManager=山田, projectLeader=佐藤, userId=100, note=備考欄４, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) Project({projectId=11, projectName=プロジェクト９９９, projectType=development, projectClass=s, projectStartDate=2016/01/01, projectEndDate=2016/03/31, clientId=10, projectManager=鈴木, projectLeader=佐藤, userId=null, note=備考９９９, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) -2023-02-15 17:10:49.832 -INFO- null [null] boot_proc = [] proc_sys = [rest] req_id = [null] usr_id = [null] initialized. - LOGGER = [DEV] NAME REGEX = [DEV] LEVEL = [INFO] - LOGGER = [PER] NAME REGEX = [PERFORMANCE] LEVEL = [INFO] - LOGGER = [SQL] NAME REGEX = [SQL] LEVEL = [INFO] - LOGGER = [ACC] NAME REGEX = [HTTP_ACCESS] LEVEL = [INFO] - LOGGER = [ROO] NAME REGEX = [.*] LEVEL = [DEBUG] +2023-03-24 18:07:49.742 -INFO- null [null] boot_proc = [] proc_sys = [rest] req_id = [null] usr_id = [null] initialized. + LOGGER = [DEV] NAME REGEX = [DEV] LEVEL = [INFO] + LOGGER = [PER] NAME REGEX = [PERFORMANCE] LEVEL = [INFO] + LOGGER = [SQL] NAME REGEX = [SQL] LEVEL = [INFO] + LOGGER = [ACC] NAME REGEX = [HTTP_ACCESS] LEVEL = [INFO] + LOGGER = [ROO] NAME REGEX = [.*] LEVEL = [DEBUG] update status:200 ---- projects (size: 11) ---- Project({projectId=1, projectName=プロジェクト００１, projectType=development, projectClass=s, projectStartDate=2010/09/18, projectEndDate=2015/04/09, clientId=1, projectManager=鈴木, projectLeader=佐藤, userId=100, note=備考欄, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) @@ -94,6 +94,8 @@ Project({projectId=8, projectName=プロジェクト００８, projectType=devel Project({projectId=9, projectName=プロジェクト００９, projectType=development, projectClass=b, projectStartDate=2015/04/09, projectEndDate=2015/04/09, clientId=9, projectManager=田中, projectLeader=鈴木, userId=100, note=備考欄３, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) Project({projectId=10, projectName=プロジェクト０１０, projectType=maintenance, projectClass=c, projectStartDate=2012/06/22, projectEndDate=2013/04/01, clientId=10, projectManager=山田, projectLeader=佐藤, userId=100, note=備考欄４, sales=10000, costOfGoodsSold=1000, sga=2000, allocationOfCorpExpenses=3000, client=null, systemAccount=null}) Project({projectId=11, projectName=プロジェクト８８８, projectType=development, projectClass=a, projectStartDate=2015/01/01, projectEndDate=2015/03/31, clientId=1, projectManager=佐藤, projectLeader=鈴木, userId=null, note=備考８８８, sales=20000, costOfGoodsSold=2000, sga=3000, allocationOfCorpExpenses=4000, client=null, systemAccount=null}) + +Process finished with exit code 0 ``` ### 6. テーブルのデータの初期化手順 From 015814710746f80b12b7ac224029e1e5bc7b7b67 Mon Sep 17 00:00:00 2001 From: hijiri <3445928+hiji@users.noreply.github.com> Date: Wed, 26 Jul 2023 14:57:35 +0900 Subject: [PATCH 5/8] =?UTF-8?q?Jetty=2012=E3=82=92beta3=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= =?UTF-8?q?=20(#52)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1af1160..1fa856b 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Gitを使用しない場合、最新のタグからzipをダウンロードし ### 4 アプリケーションの起動 最後にjetty-ee10-maven-pluginを実行し、ウェブサービスを起動します。以下のコマンドを実行してください。 - $mvn jetty-ee10:run + $mvn jetty:run ### 5. テスト用クライアントクラスからのアクセス diff --git a/pom.xml b/pom.xml index f7da693..b9d12ae 100644 --- a/pom.xml +++ b/pom.xml @@ -298,7 +298,7 @@ org.eclipse.jetty.ee10 jetty-ee10-maven-plugin - 12.0.0.alpha3 + 12.0.0.beta3 9080 From 6c56e642248ee04f019019e6f2e4f9586b1e0e62 Mon Sep 17 00:00:00 2001 From: hijiri <3445928+hiji@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:20:35 +0900 Subject: [PATCH 6/8] =?UTF-8?q?Jetty=2012=E3=82=92GA=E7=89=88=E3=81=AB?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=20(#53)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Jettyをバージョンアップ * Jetty 12をGA版にバージョンアップ --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9d12ae..ec6f851 100644 --- a/pom.xml +++ b/pom.xml @@ -298,7 +298,7 @@ org.eclipse.jetty.ee10 jetty-ee10-maven-plugin - 12.0.0.beta3 + 12.0.0 9080 From ba67c3227836b3f0e938c337d8f903c5fdcef93c Mon Sep 17 00:00:00 2001 From: hijiri <3445928+hiji@users.noreply.github.com> Date: Tue, 5 Dec 2023 17:47:03 +0900 Subject: [PATCH 7/8] =?UTF-8?q?Jetty=20=E3=82=92=2012.0.3=20=E3=81=AB?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=20(#57)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d5f426..8bb6248 100644 --- a/pom.xml +++ b/pom.xml @@ -298,7 +298,7 @@ org.eclipse.jetty.ee10 jetty-ee10-maven-plugin - 12.0.0 + 12.0.3 9080 From 65eeb8084200af2fb405cd0019f2fb5b66bcc671 Mon Sep 17 00:00:00 2001 From: Takayuki Uchida Date: Fri, 15 Dec 2023 19:59:59 +0900 Subject: [PATCH 8/8] create-release-branch --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8bb6248..75a4628 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.nablarch.example nablarch-example-rest - 6-NEXT-SNAPSHOT + 6 war @@ -39,7 +39,7 @@ com.nablarch.profile nablarch-bom - 6-NEXT-SNAPSHOT + 6 pom import @@ -226,7 +226,7 @@ jp.co.tis.gsp gsp-dba-maven-plugin - 5.0.0-SNAPSHOT + 5.0.0 src/main/resources/entity/data-model.edm