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

Add a Default Exception Mapper test. #1234

Closed
wants to merge 21 commits into from
Closed

Add a Default Exception Mapper test. #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3f159cc
Bump version to 3.2.0-SNAPSHOT
jamezp Jan 23, 2024
50dcf98
Update the CI to build on branch 3.2.0-SNAPSHOT and some other minor …
jamezp Jan 23, 2024
7c5bdea
Merge pull request #1205 from jamezp/version-bump
jim-krueger Jan 24, 2024
df42edf
Deprecate both @Context and @Suspended
jim-krueger Jan 24, 2024
f6dbe89
fix typo in yml file
jim-krueger Jan 24, 2024
ece5f07
Merge pull request #1210 from jim-krueger/1209-deprecate_@Context_@Su…
jim-krueger Jan 24, 2024
25b4084
Cleanup of pom files to use dependency management and dependency plug…
jamezp Jan 25, 2024
f2009de
Remove @ManagedBean annotation
jim-krueger Feb 9, 2024
a7f5a0c
Merge pull request #1211 from jamezp/cleanup
jim-krueger Feb 13, 2024
4e712dc
Add changes from release-3.1.x TCK to release-3.2
jim-krueger Feb 13, 2024
bfa7ba6
Removed changes from PR 863 since it requires a full release
jim-krueger Feb 13, 2024
4a45c41
Missed change from PR 1173
jim-krueger Feb 13, 2024
1638122
Remove excludes from issue 1199
jim-krueger Feb 15, 2024
c692a89
Pull in 4.0 changes from PR 1146
jim-krueger Feb 19, 2024
56bf06b
Add 4.0 change from PR 1164
jim-krueger Feb 19, 2024
fb0a564
pull in changes from 4.0 for PR's 1172 and 1182
jim-krueger Feb 19, 2024
2859761
Fix exclude list
jim-krueger Feb 19, 2024
adc363b
Add changes from 4.0 PR 863
jim-krueger Feb 20, 2024
86b4c96
Merge pull request #1220 from jim-krueger/move-3.1.x-tck-to-3.2
jim-krueger Feb 20, 2024
e5994e3
Merge pull request #1217 from jim-krueger/1216-Remove_ManagedBean_Ann…
jim-krueger Feb 20, 2024
c8aa779
Add a TCK test to verify that the default ExceptionMapper can be over…
WhiteCat22 Mar 12, 2024
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
13 changes: 7 additions & 6 deletions .github/workflows/maven-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,25 @@ name: Jakarta REST CI

on:
push:
branches: [ master, 4.0-SNAPSHOT ]
branches: [ 'release-3.2' ]
pull_request:
branches: [ master, 4.0-SNAPSHOT ]
branches: [ 'release-3.2' ]

jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
java: [ '11', '17' ]
java: ['17', '21' ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
cache: 'maven'
- name: Build with Maven
run: mvn -B verify
run: mvn -B -ntp clean verify -Djaxrs.all.build
1 change: 0 additions & 1 deletion etc/config/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
<!-- See http://checkstyle.sf.net/config_javadoc.html -->

<module name="JavadocMethod">
<property name="accessModifiers" value="protected"/>
<property name="validateThrows" value="false"/>
</module>

Expand Down
203 changes: 2 additions & 201 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,198 +22,14 @@
<parent>
<groupId>jakarta.ws.rs</groupId>
<artifactId>all</artifactId>
<version>3.1.0</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<url>https://github.com/jax-rs/api</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>11</maven.compiler.release>
<microprofile.config.version>3.0-RC1</microprofile.config.version>
<microprofile.config.version>3.0.3</microprofile.config.version>
</properties>

<organization>
<name>Eclipse Foundation</name>
<url>https://www.eclipse.org/org/foundation/</url>
</organization>

<issueManagement>
<system>Github</system>
<url>https://github.com/jax-rs/api/issues</url>
</issueManagement>

<mailingLists>
<mailingList>
<name>JAX-RS Discussion Group </name>
<archive>[email protected]</archive>
</mailingList>
</mailingLists>

<licenses>
<license>
<name>EDL 1.0</name>
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<connection>scm:git:https://github.com/jax-rs/api.git</connection>
<developerConnection>scm:git:ssh://[email protected]:jax-rs/api.git</developerConnection>
<url>https://github.com/jax-rs/api</url>
</scm>

<developers>
<developer>
<id>developers</id>
<name>JAX-RS API Developers</name>
<email>[email protected]</email>
<url>https://github.com/jakartaee/rest/graphs/contributors</url>
</developer>
</developers>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<!-- This plugin generates the buildNumber property used in maven-bundle-plugin -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
<configuration>
<format>{0,date,MM/dd/yyyy hh:mm aa}</format>
<items>
<item>timestamp</item>
</items>
</configuration>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<doctitle>JAX-RS ${project.version} API Specification</doctitle>
<bottom>
<![CDATA[Copyright &#169; 1996-2014,
<a href="http://www.oracle.com">Oracle</a>
and/or its affiliates. All Rights Reserved.
]]>
</bottom>
<!--javaApiLinks>
<property>
<name>api_1.3</name>
<value>http://download.oracle.com/javase/1.3/docs/api/</value>
</property>
<property>
<name>api_1.4</name>
<value>http://download.oracle.com/javase/1.4.2/docs/api/</value>
</property>
<property>
<name>api_1.5</name>
<value>http://download.oracle.com/javase/1.5.0/docs/api/</value>
</property>
<property>
<name>api_1.6</name>
<value>http://download.oracle.com/javase/6/docs/api/</value>
</property>
</javaApiLinks-->
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<goals>
<goal>jxr</goal>
</goals>
<phase>validate</phase>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.2</version>
<configuration>
<outputDirectory>${project.build.directory}/checkstyle</outputDirectory>
<outputFile>${project.build.directory}/checkstyle/checkstyle-result.xml</outputFile>
<configLocation>${basedir}/../etc/config/checkstyle.xml</configLocation>
<failsOnError>true</failsOnError>
</configuration>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.44</version>
</dependency>
</dependencies>
<executions>
<execution>
<goals>
<goal>checkstyle</goal>
</goals>
<phase>validate</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
<version>1.39</version>
<configuration>
<excludeFile>${basedir}/../etc/config/copyright-exclude</excludeFile>
<!--svn|mercurial|git - defaults to svn-->
<scm>git</scm>
<!-- turn on/off debugging -->
<debug>false</debug>
<!-- skip files not under SCM-->
<scmOnly>true</scmOnly>
<!-- turn off warnings -->
<warn>true</warn>
<!-- for use with repair -->
<update>false</update>
<!-- check that year is correct -->
<ignoreYear>false</ignoreYear>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down Expand Up @@ -248,34 +64,19 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>3.0.1</version>
</dependency>

<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>3.0.0</version>
</dependency>

<dependency>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent-api</artifactId>
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
<version>4.0.0</version>
</dependency>

<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.0</version>
</dependency>

<dependency>
Expand Down
43 changes: 0 additions & 43 deletions examples/src/main/java/jaxrs/examples/async/LongRunningEjbResource.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions examples/src/main/java/jaxrs/examples/client/BasicExamples.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import jakarta.ws.rs.ext.ReaderInterceptorContext;
import jakarta.ws.rs.ext.WriterInterceptor;
import jakarta.ws.rs.ext.WriterInterceptorContext;
import jakarta.xml.bind.annotation.XmlRootElement;
import jaxrs.examples.client.custom.ThrottledClient;

import static jakarta.ws.rs.client.Entity.form;
Expand All @@ -59,7 +58,6 @@ public class BasicExamples {
/**
* Customer bean.
*/
@XmlRootElement
public static class Customer {

private final String name;
Expand Down
2 changes: 0 additions & 2 deletions examples/src/main/java/jaxrs/examples/client/spec/SpecExamples.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import jakarta.ws.rs.core.Response;
import static jakarta.ws.rs.client.Entity.entity;

import jakarta.xml.bind.annotation.XmlRootElement;
import jaxrs.examples.client.custom.ThrottledClient;

/**
Expand All @@ -33,7 +32,6 @@ public class SpecExamples {
/**
* Customer bean.
*/
@XmlRootElement
public static class Customer {

private final String name;
Expand Down
3 changes: 0 additions & 3 deletions examples/src/main/java/jaxrs/examples/link/clusterservice/Cluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,11 @@
import java.util.ArrayList;
import java.util.List;

import jakarta.xml.bind.annotation.XmlRootElement;

/**
* Cluster class.
*
* @author [email protected]
*/
@XmlRootElement
public class Cluster {

enum Status {
Expand Down
3 changes: 0 additions & 3 deletions examples/src/main/java/jaxrs/examples/link/clusterservice/Machine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,11 @@

package jaxrs.examples.link.clusterservice;

import jakarta.xml.bind.annotation.XmlRootElement;

/**
* Machine class.
*
* @author [email protected]
*/
@XmlRootElement
public class Machine {

enum Status {
Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/java/jaxrs/examples/sse/ServerSentEventsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2024 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
Loading