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

fast track: Update main with missing commits #1225

Merged
merged 13 commits into from
Feb 28, 2024
Merged

fast track: Update main with missing commits #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4cf558b
Bump version to 4.0.0-SNAPSHOT
jamezp Jan 23, 2024
2f837b7
Cleanup of pom files to use dependency management and dependency plug…
jamezp Jan 25, 2024
dbe3fa0
Fix CI job. Remove the unknown branch 4.0.0-SNAPSHOT and update the
jamezp Feb 21, 2024
da38d72
Remove @ManagedBean annotation
jim-krueger Feb 9, 2024
2678855
Add changes from release-3.1.x TCK to release-3.2
jim-krueger Feb 13, 2024
ca1af99
Missed change from PR 1173
jim-krueger Feb 13, 2024
9505cd9
Remove excludes from issue 1199
jim-krueger Feb 15, 2024
4f825df
Pull in 4.0 changes from PR 1146
jim-krueger Feb 19, 2024
4397943
Add 4.0 change from PR 1164
jim-krueger Feb 19, 2024
d5f43a4
pull in changes from 4.0 for PR's 1172 and 1182
jim-krueger Feb 19, 2024
80a43af
Fix exclude list
jim-krueger Feb 19, 2024
3ab4d70
Update the signature test generation plugin and the signature test fi…
jamezp Feb 22, 2024
954c314
Add missing 2024 copyright year to changed files.
jamezp Feb 26, 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
12 changes: 6 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,24 @@ name: Jakarta REST CI

on:
push:
branches: [ master, 4.0-SNAPSHOT ]
branches: [ main ]
pull_request:
branches: [ master, 4.0-SNAPSHOT ]
branches: [ main ]

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'
- name: Build with Maven
run: mvn -B verify
run: mvn -B -ntp clean verify -Djaxrs.all.build
3 changes: 1 addition & 2 deletions etc/config/checkstyle.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, 2017 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2011, 2024 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 @@ -92,7 +92,6 @@
<!-- See http://checkstyle.sf.net/config_javadoc.html -->

<module name="JavadocMethod">
jamezp marked this conversation as resolved.
Show resolved Hide resolved
<property name="accessModifiers" value="protected"/>
<property name="validateThrows" value="false"/>
</module>

Expand Down
205 changes: 3 additions & 202 deletions examples/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, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2011, 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 All @@ -22,198 +22,14 @@
<parent>
<groupId>jakarta.ws.rs</groupId>
<artifactId>all</artifactId>
jamezp marked this conversation as resolved.
Show resolved Hide resolved
<version>3.1.0</version>
<version>4.0.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.

4 changes: 1 addition & 3 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
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 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 Expand Up @@ -41,7 +41,6 @@
import jakarta.ws.rs.ext.ReaderInterceptorContext;
import jakarta.ws.rs.ext.WriterInterceptor;
import jakarta.ws.rs.ext.WriterInterceptorContext;
jamezp marked this conversation as resolved.
Show resolved Hide resolved
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
4 changes: 1 addition & 3 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
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 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 All @@ -21,7 +21,6 @@
import jakarta.ws.rs.core.Response;
import static jakarta.ws.rs.client.Entity.entity;

jamezp marked this conversation as resolved.
Show resolved Hide resolved
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
Loading