Skip to content

Commit e9707c8

Browse files
committed
Jakartified heroku archetype
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
1 parent c0427fa commit e9707c8

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml

+6-5
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,17 @@
6464
<plugin>
6565
<groupId>org.apache.maven.plugins</groupId>
6666
<artifactId>maven-compiler-plugin</artifactId>
67-
<version>2.5.1</version>
67+
<version>3.8.0</version>
6868
<inherited>true</inherited>
6969
<configuration>
70-
<source>1.7</source>
71-
<target>1.7</target>
70+
<source>11</source>
71+
<target>11</target>
7272
</configuration>
7373
</plugin>
7474
<plugin>
7575
<groupId>org.apache.maven.plugins</groupId>
7676
<artifactId>maven-dependency-plugin</artifactId>
77+
<version>2.8</version>
7778
<executions>
7879
<execution>
7980
<id>copy-dependencies</id>
@@ -106,6 +107,6 @@
106107
<properties>
107108
<jersey.version>${project.version}</jersey.version>
108109
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
109-
<jetty.version>9.0.6.v20130930</jetty.version>
110+
<jetty.version>11.0.0.beta3</jetty.version>
110111
</properties>
111-
</project>
112+
</project>

archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
4-
version="3.0">
2+
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee http://java.sun.com/xml/ns/javaee/web-app_5_0.xsd"
4+
version="5.0">
55

66
<servlet>
77
<servlet-name>Jersey Web Application</servlet-name>
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java.runtime.version=1.7
1+
java.runtime.version=11

0 commit comments

Comments
 (0)