Skip to content

Commit 473a788

Browse files
ishidamum-takata
ishidamu
and
m-takata
authored
Servlet6対応 (#941)
Co-authored-by: ishidamu <ishidamu@users.noreply.github.com> Co-authored-by: m-takata <34699171+m-takata@users.noreply.github.com>
1 parent 91b4396 commit 473a788

File tree

128 files changed

+54891
-53398
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+54891
-53398
lines changed

‎pom.xml‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
<properties>
6161
<java.version>1.8</java.version>
6262
<filecontrol.java.version>1.8</filecontrol.java.version>
63+
<!-- for servlet version -->
64+
<servlet.api.version>6</servlet.api.version>
6365
<compile.target>1.8</compile.target>
6466
<maven.compiler.source>${compile.target}</maven.compiler.source>
6567
<maven.compiler.target>${compile.target}</maven.compiler.target>
@@ -148,11 +150,20 @@
148150
<version>1.1</version>
149151
</dependency>
150152

153+
<!-- for servlet version
151154
<dependency>
152155
<groupId>javax.servlet</groupId>
153156
<artifactId>servlet-api</artifactId>
154157
<version>2.4-20030804.000000</version>
155158
</dependency>
159+
-->
160+
161+
<dependency>
162+
<groupId>jakarta.servlet</groupId>
163+
<artifactId>jakarta.servlet-api</artifactId>
164+
<version>6.0.0</version>
165+
<scope>provided</scope>
166+
</dependency>
156167

157168
<dependency>
158169
<groupId>log4j</groupId>
@@ -747,6 +758,19 @@
747758
</sources>
748759
</configuration>
749760
</execution>
761+
<execution>
762+
<id>add-test-source</id>
763+
<phase>generate-test-sources</phase>
764+
<goals>
765+
<goal>add-test-source</goal>
766+
</goals>
767+
<configuration>
768+
<sources>
769+
<source>${basedir}/src/test/java</source>
770+
<source>${basedir}/target/test/gen-src</source>
771+
</sources>
772+
</configuration>
773+
</execution>
750774
</executions>
751775
</plugin>
752776
<plugin>
@@ -1044,6 +1068,91 @@
10441068
</execution>
10451069
</executions>
10461070
</plugin>
1071+
<plugin>
1072+
<groupId>com.github.nimbus-org</groupId>
1073+
<artifactId>nimbus-version-filecontrol-maven-plugin</artifactId>
1074+
<version>1.0</version>
1075+
<executions>
1076+
<execution>
1077+
<id>copy</id>
1078+
<phase>generate-sources</phase>
1079+
<goals>
1080+
<goal>copy</goal>
1081+
</goals>
1082+
<configuration>
1083+
<version>${servlet.api.version}</version>
1084+
<fromDir>${basedir}/src/main/java</fromDir>
1085+
<toDir>${basedir}/target/gen-src</toDir>
1086+
<fromFileExtention>jpp_sapi</fromFileExtention>
1087+
<toFileExtention>java</toFileExtention>
1088+
<encoding>UTF-8</encoding>
1089+
<checkTarget>@SERVLET_API_VERSION@</checkTarget>
1090+
</configuration>
1091+
</execution>
1092+
<execution>
1093+
<id>copy_test</id>
1094+
<phase>generate-sources</phase>
1095+
<goals>
1096+
<goal>copy</goal>
1097+
</goals>
1098+
<configuration>
1099+
<version>${servlet.api.version}</version>
1100+
<fromDir>${basedir}/src/test/java</fromDir>
1101+
<toDir>${basedir}/target/test/gen-src</toDir>
1102+
<fromFileExtention>jpp_sapi</fromFileExtention>
1103+
<toFileExtention>java</toFileExtention>
1104+
<encoding>UTF-8</encoding>
1105+
<checkTarget>@SERVLET_API_VERSION@</checkTarget>
1106+
</configuration>
1107+
</execution>
1108+
<execution>
1109+
<id>replace</id>
1110+
<phase>generate-sources</phase>
1111+
<goals>
1112+
<goal>replace</goal>
1113+
</goals>
1114+
<configuration>
1115+
<version>${servlet.api.version}</version>
1116+
<fromDir>${basedir}/src/main/java</fromDir>
1117+
<toDir>${basedir}/target/gen-src</toDir>
1118+
<fromFileExtention>javapp_sapi</fromFileExtention>
1119+
<toFileExtention>java</toFileExtention>
1120+
<encoding>UTF-8</encoding>
1121+
<checkTargetPrefix>SERVLET_API</checkTargetPrefix>
1122+
<checkVersions>
1123+
<param>4</param>
1124+
<param>6</param>
1125+
</checkVersions>
1126+
<replaceTargetDirs>
1127+
<param>jp/ossc/nimbus/**</param>
1128+
</replaceTargetDirs>
1129+
</configuration>
1130+
</execution>
1131+
<execution>
1132+
<id>replace_test</id>
1133+
<phase>generate-sources</phase>
1134+
<goals>
1135+
<goal>replace</goal>
1136+
</goals>
1137+
<configuration>
1138+
<version>${servlet.api.version}</version>
1139+
<fromDir>${basedir}/src/test/java</fromDir>
1140+
<toDir>${basedir}/target/test/gen-src</toDir>
1141+
<fromFileExtention>javapp_sapi</fromFileExtention>
1142+
<toFileExtention>java</toFileExtention>
1143+
<encoding>UTF-8</encoding>
1144+
<checkTargetPrefix>SERVLET_API</checkTargetPrefix>
1145+
<checkVersions>
1146+
<param>4</param>
1147+
<param>6</param>
1148+
</checkVersions>
1149+
<replaceTargetDirs>
1150+
<param>jp/ossc/nimbus/**</param>
1151+
</replaceTargetDirs>
1152+
</configuration>
1153+
</execution>
1154+
</executions>
1155+
</plugin>
10471156
</plugins>
10481157
</build>
10491158
<repositories>

0 commit comments

Comments
 (0)