Skip to content

Commit 7666c62

Browse files
cherylkingcherylking
authored
Merge pull request #1920 from cherylking/fixCompileJspForJakarta
Fix compile jsp for jakarta
2 parents 25c7339 + 008ee62 commit 7666c62

File tree

15 files changed

+421
-46
lines changed

15 files changed

+421
-46
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
matrix:
2323
# test against latest update of each major Java version, as well as specific updates of LTS versions:
2424
RUNTIME: [ol, wlp]
25-
RUNTIME_VERSION: [25.0.0.3]
25+
RUNTIME_VERSION: [25.0.0.6]
2626
java: [21, 17, 11, 8]
2727
exclude:
2828
- java: 8
@@ -80,7 +80,7 @@ jobs:
8080
matrix:
8181
# test against latest update of each major Java version, as well as specific updates of LTS versions:
8282
RUNTIME: [ol, wlp]
83-
RUNTIME_VERSION: [25.0.0.3]
83+
RUNTIME_VERSION: [25.0.0.6]
8484
java: [21, 17, 11, 8]
8585
exclude:
8686
- java: 8

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ If you are using a snapshot version of Liberty Maven Plugin then you will also n
7373
<pluginRepositories>
7474
<!-- Configure Sonatype OSS Maven snapshots repository -->
7575
<pluginRepository>
76-
<id>sonatype-nexus-snapshots</id>
77-
<name>Sonatype Nexus Snapshots</name>
78-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
76+
<id>central-portal-snapshots</id>
77+
<name>Central Portal Snapshots</name>
78+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
7979
<snapshots>
8080
<enabled>true</enabled>
8181
</snapshots>

‎liberty-maven-app-parent/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@
3030
<description>Liberty Maven Plugin Parent</description>
3131
<url>https://github.com/OpenLiberty/ci.maven</url>
3232

33-
<licenses>
34-
<license>
35-
<name>The Apache Software License, Version 2.0</name>
36-
<url>https://raw.github.com/OpenLiberty/ci.maven/main/LICENSE</url>
37-
<distribution>repo</distribution>
38-
</license>
39-
</licenses>
40-
4133
<build>
4234
<pluginManagement>
4335
<plugins>

‎liberty-maven-plugin/pom.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<packaging>maven-plugin</packaging>
1414
<name>liberty-maven-plugin</name>
1515
<description>Liberty Maven Plugin : Install, Start/Stop, Package, Create Server, Deploy/Undeploy applications</description>
16+
<url>https://github.com/OpenLiberty/ci.maven</url>
1617

1718
<prerequisites>
1819
<maven>${maven.version}</maven>
@@ -21,9 +22,9 @@
2122
<repositories>
2223
<!-- Configure Sonatype OSS Maven snapshots repository -->
2324
<repository>
24-
<id>sonatype-nexus-snapshots</id>
25-
<name>Sonatype Nexus Snapshots</name>
26-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
25+
<id>central-portal-snapshots</id>
26+
<name>Central Portal Snapshots</name>
27+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
2728
<snapshots>
2829
<enabled>true</enabled>
2930
</snapshots>
@@ -37,7 +38,7 @@
3738
<dependency>
3839
<groupId>io.openliberty.tools</groupId>
3940
<artifactId>liberty-ant-tasks</artifactId>
40-
<version>1.9.16</version>
41+
<version>1.9.17-SNAPSHOT</version>
4142
</dependency>
4243
<dependency>
4344
<groupId>org.apache.maven</groupId>
@@ -88,7 +89,7 @@
8889
<dependency>
8990
<groupId>io.openliberty.tools</groupId>
9091
<artifactId>ci.common</artifactId>
91-
<version>1.8.38</version>
92+
<version>1.8.39-SNAPSHOT</version>
9293
</dependency>
9394
<dependency>
9495
<groupId>org.apache.commons</groupId>
@@ -231,6 +232,7 @@
231232
<pomExclude>springboot-3-tests/pom.xml</pomExclude>
232233
<pomExclude>dev-container-it/pom.xml</pomExclude>
233234
<pomExclude>compile-jsp-source-17-it/pom.xml</pomExclude>
235+
<pomExclude>compile-jsp-source-17-jakarta-it/pom.xml</pomExclude>
234236
</pomExcludes>
235237
</configuration>
236238
</plugin>
@@ -273,6 +275,7 @@
273275
<pomExclude>springboot-3-tests/pom.xml</pomExclude>
274276
<pomExclude>dev-container-it/pom.xml</pomExclude>
275277
<pomExclude>compile-jsp-source-17-it/pom.xml</pomExclude>
278+
<pomExclude>compile-jsp-source-17-jakarta-it/pom.xml</pomExclude>
276279
</pomExcludes>
277280
</configuration>
278281
</plugin>
@@ -314,6 +317,7 @@
314317
<pomExclude>binary-scanner-it/pom.xml</pomExclude>
315318
<pomExclude>springboot-3-tests/pom.xml</pomExclude>
316319
<pomExclude>compile-jsp-source-17-it/pom.xml</pomExclude>
320+
<pomExclude>compile-jsp-source-17-jakarta-it/pom.xml</pomExclude>
317321
</pomExcludes>
318322
</configuration>
319323
</plugin>
@@ -360,6 +364,7 @@
360364
<pomExclude>binary-scanner-it/pom.xml</pomExclude>
361365
<pomExclude>springboot-3-tests/pom.xml</pomExclude>
362366
<pomExclude>compile-jsp-source-17-it/pom.xml</pomExclude>
367+
<pomExclude>compile-jsp-source-17-jakarta-it/pom.xml</pomExclude>
363368
</pomExcludes>
364369
</configuration>
365370
</plugin>

‎liberty-maven-plugin/src/it/arquillian-tests/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<pluginRepositories>
1818
<!-- Configure Sonatype OSS Maven snapshots repository -->
1919
<pluginRepository>
20-
<id>sonatype-nexus-snapshots</id>
21-
<name>Sonatype Nexus Snapshots</name>
22-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
20+
<id>central-portal-snapshots</id>
21+
<name>Central Portal Snapshots</name>
22+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
2323
<snapshots>
2424
<enabled>true</enabled>
2525
</snapshots>
@@ -32,9 +32,9 @@
3232
<repositories>
3333
<!-- Configure Sonatype OSS Maven snapshots repository -->
3434
<repository>
35-
<id>sonatype-nexus-snapshots</id>
36-
<name>Sonatype Nexus Snapshots</name>
37-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
35+
<id>central-portal-snapshots</id>
36+
<name>Central Portal Snapshots</name>
37+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
3838
<snapshots>
3939
<enabled>true</enabled>
4040
</snapshots>

‎liberty-maven-plugin/src/it/compile-jsp-source-17-jakarta-it/pom.xml‎

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<parent>
7+
<groupId>io.openliberty.tools.it</groupId>
8+
<artifactId>tests</artifactId>
9+
<version>1.0-SNAPSHOT</version>
10+
</parent>
11+
12+
<artifactId>compile-jsp-source-17-jakarta-it</artifactId>
13+
<packaging>war</packaging>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>commons-logging</groupId>
18+
<artifactId>commons-logging</artifactId>
19+
<version>1.0.4</version>
20+
<scope>test</scope>
21+
</dependency>
22+
<dependency>
23+
<groupId>junit</groupId>
24+
<artifactId>junit</artifactId>
25+
<version>4.13.1</version>
26+
<scope>test</scope>
27+
</dependency>
28+
</dependencies>
29+
30+
<properties>
31+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
33+
<maven.compiler.release>17</maven.compiler.release>
34+
</properties>
35+
36+
<build>
37+
<pluginManagement>
38+
<plugins>
39+
<plugin>
40+
<groupId>org.apache.maven.plugins</groupId>
41+
<artifactId>maven-war-plugin</artifactId>
42+
<version>3.4.0</version>
43+
</plugin>
44+
<plugin>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<artifactId>maven-failsafe-plugin</artifactId>
47+
<version>3.1.2</version>
48+
</plugin>
49+
<plugin>
50+
<groupId>org.apache.maven.plugins</groupId>
51+
<artifactId>maven-surefire-plugin</artifactId>
52+
<version>3.1.2</version>
53+
</plugin>
54+
</plugins>
55+
</pluginManagement>
56+
<plugins>
57+
<plugin>
58+
<artifactId>maven-war-plugin</artifactId>
59+
<configuration>
60+
<failOnMissingWebXml>false</failOnMissingWebXml>
61+
</configuration>
62+
</plugin>
63+
<plugin>
64+
<groupId>io.openliberty.tools</groupId>
65+
<artifactId>liberty-maven-plugin</artifactId>
66+
<version>@pom.version@</version>
67+
<extensions>true</extensions>
68+
<configuration>
69+
<stripVersion>true</stripVersion>
70+
<serverName>test</serverName>
71+
<serverXmlFile>src/test/resources/server.xml</serverXmlFile>
72+
<deployPackages>project</deployPackages>
73+
<looseApplication>false</looseApplication>
74+
</configuration>
75+
<executions>
76+
<execution>
77+
<id>install-liberty</id>
78+
<phase>package</phase>
79+
<goals>
80+
<goal>install-server</goal>
81+
</goals>
82+
</execution>
83+
<execution>
84+
<id>create-liberty-server</id>
85+
<phase>package</phase>
86+
<goals>
87+
<goal>create</goal>
88+
</goals>
89+
</execution>
90+
<execution>
91+
<id>install-artifact</id>
92+
<phase>package</phase>
93+
<goals>
94+
<goal>deploy</goal>
95+
</goals>
96+
<configuration>
97+
<stripVersion>true</stripVersion>
98+
</configuration>
99+
</execution>
100+
<execution>
101+
<id>start-liberty-server</id>
102+
<phase>pre-integration-test</phase>
103+
<goals>
104+
<goal>install-feature</goal>
105+
<goal>start</goal>
106+
<goal>compile-jsp</goal>
107+
</goals>
108+
<configuration>
109+
<features>
110+
<acceptLicense>true</acceptLicense>
111+
<feature>mongodb-2.0</feature>
112+
<feature>enterpriseBeansLite-4.0</feature>
113+
</features>
114+
<background>true</background>
115+
<verifyTimeout>40</verifyTimeout>
116+
</configuration>
117+
</execution>
118+
<execution>
119+
<id>check-liberty-server</id>
120+
<phase>pre-integration-test</phase>
121+
<goals>
122+
<goal>status</goal>
123+
</goals>
124+
</execution>
125+
<execution>
126+
<id>stop-liberty-server</id>
127+
<phase>post-integration-test</phase>
128+
<goals>
129+
<goal>stop</goal>
130+
</goals>
131+
</execution>
132+
<execution>
133+
<id>clean-server</id>
134+
<phase>post-integration-test</phase>
135+
<goals>
136+
<goal>clean</goal>
137+
</goals>
138+
<configuration>
139+
<cleanDropins>false</cleanDropins>
140+
<cleanApps>false</cleanApps>
141+
<cleanLogs>false</cleanLogs>
142+
<cleanWorkarea>false</cleanWorkarea>
143+
</configuration>
144+
</execution>
145+
</executions>
146+
</plugin>
147+
<plugin>
148+
<groupId>org.apache.maven.plugins</groupId>
149+
<artifactId>maven-failsafe-plugin</artifactId>
150+
<configuration>
151+
<redirectTestOutputToFile>true</redirectTestOutputToFile>
152+
<forkMode>once</forkMode>
153+
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
154+
<argLine>-enableassertions</argLine>
155+
<workingDirectory>${project.build.directory}</workingDirectory>
156+
<includes>
157+
<include>**/*CompileJSPTest.java</include>
158+
</includes>
159+
</configuration>
160+
<executions>
161+
<execution>
162+
<id>integration-test</id>
163+
<goals>
164+
<goal>integration-test</goal>
165+
</goals>
166+
</execution>
167+
<execution>
168+
<id>verify</id>
169+
<phase>verify</phase>
170+
<goals>
171+
<goal>verify</goal>
172+
</goals>
173+
</execution>
174+
</executions>
175+
</plugin>
176+
<plugin>
177+
<groupId>org.apache.maven.plugins</groupId>
178+
<artifactId>maven-surefire-plugin</artifactId>
179+
<configuration>
180+
<skip>true</skip>
181+
</configuration>
182+
</plugin>
183+
</plugins>
184+
</build>
185+
</project>

0 commit comments

Comments
 (0)