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

Issue #2217 "Enhances line terminator for chunk-size in Chunked Transfer Coding #2218

Closed
wants to merge 21 commits into from
Closed

Issue #2217 "Enhances line terminator for chunk-size in Chunked Transfer Coding #2218

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
0b1ab0d
Next version is 4.0.1
arjantijms Sep 27, 2023
688c974
Merge pull request #2188 from arjantijms/update_version
arjantijms Sep 27, 2023
f3b5d70
Update versions in poms and adjust pom where needed for that
arjantijms Sep 28, 2023
e07faf5
Merge pull request #2189 from arjantijms/update_poms
arjantijms Sep 28, 2023
52ca254
Create empty SSL parameters in protected ctor
arjantijms Sep 28, 2023
575340a
Merge pull request #2190 from arjantijms/set_ssl_params
arjantijms Sep 28, 2023
5f3a412
Fix generation of javadoc
arjantijms Sep 29, 2023
e4c7d9d
Merge pull request #2191 from arjantijms/fix_javadoc
arjantijms Sep 29, 2023
17f5896
Prepare release org.glassfish.grizzly:grizzly-project:4.0.1
Sep 29, 2023
4bb259c
Prepare next development cycle for 4.0.2-SNAPSHOT
Sep 29, 2023
1c2d0d2
Fixes #2192 - Grizzly 2.4.4/4.0.0 missing Content-Type in response
mnriem Oct 13, 2023
3d3bcb6
Merge pull request #2195 from mnriem/issue-2912-main
arjantijms Nov 1, 2023
49e48dc
Merge remote-tracking branch 'origin/master' into main
arjantijms Dec 18, 2023
75d2599
Merge pull request #2202 from arjantijms/main
arjantijms Dec 18, 2023
42342bf
Merge pull request #2203 from eclipse-ee4j/4.0.1
arjantijms Dec 19, 2023
ce35c04
Next version is 4.1.0 with Jakarta EE 11 dependencies
arjantijms May 27, 2024
62b6110
Updates for Servlet 6.1 compatibility
arjantijms May 27, 2024
fb38f79
Update maven.yml
arjantijms May 27, 2024
76e4051
Merge pull request #2209 from arjantijms/41_update_versions
arjantijms May 27, 2024
582420d
Issue #2217 "Enhances line terminator for chunk-size in Chunked Trans…
carryel Dec 16, 2024
7161e12
Merge branch 'main' into feature/strict-CRLF-for-chunked-transfer-coding
carryel Dec 24, 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
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

strategy:
matrix:
java_version: [ 11 ]
java_version: [ 17 ]

steps:
- name: Checkout for build
Expand All @@ -47,7 +47,7 @@ jobs:

strategy:
matrix:
java_version: [ 11 ]
java_version: [ 17 ]

steps:
- name: Checkout for build
Expand Down
26 changes: 13 additions & 13 deletions boms/bom/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 2021 Contributors to the Eclipse Foundation.
Copyright 2021, 2024 Contributors to the Eclipse Foundation.
Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand All @@ -24,13 +24,13 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.9</version>
<relativePath />
</parent>

<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-bom</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>grizzly-bom</name>
Expand Down Expand Up @@ -172,37 +172,37 @@
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.0</version>
<version>3.6.3</version>
<configuration>
<additionalOptions>
<additionalOption>-Xdoclint:none</additionalOption>
</additionalOptions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<!--
Can not use 3.3.0, which triggers:

Presumably you have configured maven-source-plugn to execute twice times in your build. You have to configure a classifier for at least on of them.

-->
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.6.0</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand Down
77 changes: 35 additions & 42 deletions extras/bundles/grizzly-httpservice-bundle/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 2021 Contributors to the Eclipse Foundation.
Copyright 2021, 2023 Contributors to the Eclipse Foundation.
Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand All @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -71,9 +71,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.2</version>
<configuration>
<filesets>
<!-- Make sure we remove the fake source directory. -->
Expand All @@ -83,6 +82,34 @@
</filesets>
</configuration>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<executions>
<execution>
<id>src-dependencies</id>
<phase>generate-sources</phase>
<goals>
<!-- use copy-dependencies instead if you don't want to explode the sources -->
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<excludeScope>provided</excludeScope>
<excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
<excludes>module-info.java</excludes>
<!-- fudge an actual source hierarchy so that the source
plugin can actually do something useful. Otherwise,
you'll end up with an empty source jar -->
<outputDirectory>${basedir}/src/main/java</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Expand All @@ -91,6 +118,7 @@
</excludes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down Expand Up @@ -129,17 +157,7 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<sourcepath>
${basedir}/../../grizzly-httpservice/src/main/java;
${basedir}/../../../modules/bundles/http-servlet/src/main/java;
</sourcepath>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand All @@ -150,6 +168,7 @@
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
Expand All @@ -167,33 +186,7 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
<executions>
<execution>
<id>src-dependencies</id>
<phase>generate-sources</phase>
<goals>
<!-- use copy-dependencies instead if you don't want to explode the sources -->
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<excludeScope>provided</excludeScope>
<excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
<excludes>module-info.java</excludes>
<!-- fudge an actual source hierarchy so that the source
plugin can actually do something useful. Otherwise,
you'll end up with an empty source jar -->
<outputDirectory>${basedir}/src/main/java</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion extras/bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions extras/connection-pool/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 2021 Contributors to the Eclipse Foundation.
Copyright 2021, 2023 Contributors to the Eclipse Foundation.
Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand All @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -47,7 +47,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
<reuseForks>false</reuseForks>
</configuration>
</plugin>
<plugin>
Expand Down
7 changes: 3 additions & 4 deletions extras/grizzly-httpservice/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 2021 Contributors to the Eclipse Foundation.
Copyright 2021, 2023 Contributors to the Eclipse Foundation.
Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand All @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -137,9 +137,8 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
<version>3.6.1</version>
<executions>
<execution>
<id>unpack_osgi_compendium_sources</id>
Expand Down
15 changes: 6 additions & 9 deletions extras/http-server-jaxws/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 2021 Contributors to the Eclipse Foundation.
Copyright 2021, 2023 Contributors to the Eclipse Foundation.
Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand All @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -41,24 +41,24 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>3.0.2</version>
<version>4.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>3.0.1</version>
<version>4.0.2</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>3.0.2</version>
<version>4.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.metro</groupId>
<artifactId>webservices-osgi</artifactId>
<version>3.0.2</version>
<version>4.0.3</version>
<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -69,9 +69,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Expand Down
6 changes: 3 additions & 3 deletions extras/http-server-multipart/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 2021 Contributors to the Eclipse Foundation.
Copyright 2021, 2023 Contributors to the Eclipse Foundation.
Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand All @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>4.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -53,7 +53,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
<reuseForks>false</reuseForks>
</configuration>
</plugin>
<plugin>
Expand Down
Loading
Loading