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

Fix jersey examples #4438

Merged
merged 17 commits into from
May 11, 2020
Merged

Fix jersey examples #4438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3ca6161
Fix example helloworld-cdi2-se
tvallin Apr 7, 2020
64781d3
Fix example helloworld-pure-jax-rs
tvallin Apr 7, 2020
d21e7e5
Fix example helloworld-spring-annotations
tvallin Apr 8, 2020
0813d24
Fix example helloworld-weld
tvallin Apr 8, 2020
40847c5
Fix example http-patch + dependency added to main pom
tvallin Apr 8, 2020
c44de3c
Fix example json-jettison
tvallin Apr 8, 2020
2e08462
Fix example json-moxy
tvallin Apr 8, 2020
a304d64
Fix example server-sent-events-jaxrs
tvallin Apr 8, 2020
c9c80d7
Fix example server-sent-events-jersey
tvallin Apr 8, 2020
15dbc88
Update copyright
tvallin Apr 8, 2020
0af9096
Fix cdi2-se example
tvallin Apr 14, 2020
feaf8ac
Update WELD version
tvallin Apr 15, 2020
0611e07
Include dependency into jdk11+ profile
tvallin Apr 15, 2020
6f2fe0a
Remove istack dependency from main pom
tvallin Apr 15, 2020
7b0abee
Add istack version
tvallin Apr 15, 2020
449f35f
Some clean up
tvallin Apr 15, 2020
5ee3428
Fix weld dependency version
tvallin Apr 15, 2020
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
16 changes: 15 additions & 1 deletion examples/helloworld-cdi2-se/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) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -81,6 +81,20 @@
</plugins>
</build>
</profile>

<profile>
<id>jdk11</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<version>3.1.1.Final</version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this shall be taken from dependenciesManagement, or is there some reason why it's not in dependenciesManagement?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the weld version in dependenciesManagement is updated to 3.1.1.Final, the build fails in other modules.
Update the version into the example pom make it fails as well, which is why I have decided to do it this way where it does not produce any failing tests in Jersey and make helloworld-cdi2-se run with jdk11.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CQ #21928 created to allow related weld-se-core to be used in the project

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CQ is approved

</dependency>
</dependencies>
</profile>
</profiles>

</project>
4 changes: 2 additions & 2 deletions ...loworld-pure-jax-rs/src/main/java/org/glassfish/jersey/examples/helloworld/jaxrs/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -62,7 +62,7 @@ public static void main(String[] args) throws IOException, InterruptedException

System.out.println("Application started.\n"
+ "Try accessing " + getBaseURI() + "helloworld in the browser.\n"
+ "Hit enter to stop the application...");
+ "CTRL + C to stop the application...\n");

Thread.currentThread().join();
}
Expand Down
7 changes: 6 additions & 1 deletion examples/helloworld-spring-annotations/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) 2014, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -51,6 +51,11 @@
<artifactId>jersey-test-framework-provider-inmemory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
</dependency>
</dependencies>

<build>
Expand Down
4 changes: 2 additions & 2 deletions examples/helloworld-weld/README.MD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[//]: # " Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. "
[//]: # " Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved. "
[//]: # " "
[//]: # " This program and the accompanying materials are made available under the "
[//]: # " terms of the Eclipse Distribution License v. 1.0, which is available at "
Expand Down Expand Up @@ -37,4 +37,4 @@ Run the example as follows:

This deploys the example using [Grizzly](http://grizzly.java.net/) container. You can access the application at:

- <http://localhost:8080/weld>
- <http://localhost:8080/weld/application.wadl>
13 changes: 12 additions & 1 deletion examples/helloworld-weld/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) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -57,6 +57,17 @@
<groupId>org.glassfish.jersey.ext.cdi</groupId>
<artifactId>jersey-cdi1x</artifactId>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>

<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<version>${istack.commons.runtime.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
11 changes: 10 additions & 1 deletion examples/http-patch/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) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -67,6 +67,15 @@
<artifactId>jersey-grizzly-connector</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<version>${istack.commons.runtime.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
13 changes: 12 additions & 1 deletion examples/json-jettison/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) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -72,6 +72,17 @@
<artifactId>jaxb-osgi</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>

<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<version>${istack.commons.runtime.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
Expand Down
13 changes: 12 additions & 1 deletion examples/json-moxy/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) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -46,6 +46,17 @@
<type>pom</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>

<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<version>${istack.commons.runtime.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
4 changes: 2 additions & 2 deletions examples/server-sent-events-jaxrs/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) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -54,7 +54,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<mainClass>App</mainClass>
<mainClass>org.glassfish.jersey.examples.sse.jaxrs.App</mainClass>
</configuration>
</plugin>
</plugins>
Expand Down
4 changes: 2 additions & 2 deletions examples/server-sent-events-jersey/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) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -54,7 +54,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<mainClass>App</mainClass>
<mainClass>org.glassfish.jersey.examples.sse.jersey.App</mainClass>
</configuration>
</plugin>
</plugins>
Expand Down