Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjusting Jersey archetypes #4710

Merged
merged 3 commits into from
Feb 18, 2021
Merged

Adjusting Jersey archetypes #4710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa386bc
Adjust Jersey archetypes
senivam Feb 2, 2021
9e179ce
Platform independent space
senivam Feb 11, 2021
45bbe82
Java version for archetypes set to 1.8
senivam Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -81,8 +81,6 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<!-- TODO: Remove the version when JERSEY-2743 is resolved. -->
<version>9.2.6.v20141205</version>
<configuration>
<scanIntervalSeconds>5</scanIntervalSeconds>
<stopPort>9999</stopPort>
Expand Down
8 changes: 4 additions & 4 deletions archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.8.1</version>
<inherited>true</inherited>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -106,6 +106,6 @@
<properties>
<jersey.version>${project.version}</jersey.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>9.0.6.v20130930</jetty.version>
<jetty.version>9.4.28.v20200408</jetty.version>
</properties>
</project>
2 changes: 1 addition & 1 deletion archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/system.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java.runtime.version=1.7
java.runtime.version=1.8
6 changes: 3 additions & 3 deletions archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.8.1</version>
<inherited>true</inherited>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down
6 changes: 3 additions & 3 deletions ...jersey-quickstart-grizzly2/src/main/resources/archetype-resources/src/main/java/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
public class Main {
// Base URI the Grizzly HTTP server will listen on
public static final String BASE_URI = "http://localhost:8080/myapp/";
public static final String BASE_URI = "http://localhost:8080/";

/**
* Starts Grizzly HTTP server exposing JAX-RS resources defined in this application.
Expand All @@ -36,8 +36,8 @@ public static HttpServer startServer() {
*/
public static void main(String[] args) throws IOException {
final HttpServer server = startServer();
System.out.println(String.format("Jersey app started with WADL available at "
+ "%sapplication.wadl\nHit enter to stop it...", BASE_URI));
System.out.println(String.format("Jersey app started with endpoints available at "
+ "%s%nHit Ctrl-C to stop it...", BASE_URI));
System.in.read();
server.stop();
}
Expand Down
6 changes: 3 additions & 3 deletions archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.8.1</version>
<inherited>true</inherited>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
Expand Down