Skip to content

Merge 3.0.1 branch to master #2149

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

Merged
merged 16 commits into from
Dec 10, 2021
Merged

Merge 3.0.1 branch to master #2149

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4b6b549
Prepare release org.glassfish.grizzly:grizzly-project:3.0.0
Nov 23, 2020
73122c8
Prepare next development cycle for 3.0.1-SNAPSHOT
Nov 23, 2020
1b5f834
Merge pull request #2135 from eclipse-ee4j/3.0.0
arjantijms Sep 27, 2021
6aa72de
Update boms to 3.0.1-SNAPSHOT
arjantijms Sep 27, 2021
6679587
Remove tab
arjantijms Sep 27, 2021
e0cdce4
Merge pull request #2136 from arjantijms/3.0.1-prepare
arjantijms Sep 27, 2021
9a56494
Update and somewhat clean poms
arjantijms Sep 27, 2021
433294e
Merge pull request #2138 from arjantijms/3.0.1-prepare
arjantijms Sep 27, 2021
cd81972
Fix JDK 17 build by:
arjantijms Sep 28, 2021
2b2d3d9
Merge pull request #2139 from arjantijms/3.0.1-prepare
arjantijms Sep 28, 2021
658aba0
Set version on main project explicitly, even though inherited
arjantijms Sep 28, 2021
8bbc149
Merge pull request #2140 from arjantijms/3.0.1-prepare
arjantijms Sep 28, 2021
b08af6b
Prepare release org.glassfish.grizzly:grizzly-project:3.0.1
Sep 28, 2021
cd96614
Prepare next development cycle for 3.0.2-SNAPSHOT
Sep 28, 2021
99cc2ee
Fixed BOM version
dmatej Dec 8, 2021
bd4d311
Merge pull request #2150 from dmatej/fixBom
MattGill98 Dec 10, 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
8 changes: 4 additions & 4 deletions boms/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021 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 Down Expand Up @@ -29,7 +30,7 @@

<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-bom</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.1</version>
<packaging>pom</packaging>

<name>grizzly-bom</name>
Expand Down Expand Up @@ -178,13 +179,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<configuration>
<additionalOptions>
<additionalOption>-Xdoclint:none</additionalOption>
</additionalOptions>
</configuration>

</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -225,7 +225,7 @@
<plugin>
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
<version>2.3</version>
<version>2.4</version>
<configuration>
<scm>git</scm>
<scmOnly>true</scmOnly>
Expand Down
4 changes: 2 additions & 2 deletions extras/bundles/grizzly-httpservice-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021 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 @@ -23,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -95,7 +96,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-version}</version>
<configuration>
<instructions>
<Bundle-Name>Grizzly OSGi HttpService Bundle
Expand Down
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>3.0.0-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions extras/connection-pool/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021 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 @@ -23,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -52,7 +53,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
4 changes: 2 additions & 2 deletions extras/grizzly-httpservice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021 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 @@ -23,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -92,7 +93,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-version}</version>
<configuration>
<instructions>
<Bundle-Name>Grizzly OSGi HttpService</Bundle-Name>
Expand Down
43 changes: 6 additions & 37 deletions extras/http-server-jaxws/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021 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 @@ -23,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -40,24 +41,24 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>3.0.0-M3</version>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>3.0.0-RC3</version>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>3.0.0-M3</version>
<version>3.0.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.metro</groupId>
<artifactId>webservices-osgi</artifactId>
<version>3.0.0-M1</version>
<version>3.0.2</version>
<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -75,7 +76,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand All @@ -99,42 +99,11 @@
</execution>
</executions>
</plugin>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<check>
<branchRate>85</branchRate>
<lineRate>85</lineRate>
<haltOnFailure>true</haltOnFailure>
<totalBranchRate>85</totalBranchRate>
<totalLineRate>85</totalLineRate>
<packageLineRate>85</packageLineRate>
<packageBranchRate>85</packageBranchRate>
</check>
</configuration>
<executions>
<execution>
<goals>
<goal>clean</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
-->
</plugins>
</build>

<reporting>
<plugins>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions extras/http-server-multipart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021 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 @@ -23,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -58,7 +59,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
4 changes: 2 additions & 2 deletions extras/http-servlet-extras/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021 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 @@ -23,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -62,7 +63,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
4 changes: 2 additions & 2 deletions extras/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021 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 @@ -23,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -41,5 +42,4 @@
<module>connection-pool</module>
<module>tls-sni</module>
</modules>

</project>
4 changes: 2 additions & 2 deletions extras/tls-sni/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021 Contributors to the Eclipse Foundation.
Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.

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

Expand Down Expand Up @@ -52,7 +53,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/comet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021 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 @@ -23,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand All @@ -49,7 +50,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-version}</version>
<configuration>
<instructions>
<Import-Package>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021 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 @@ -23,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand All @@ -49,7 +50,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-version}</version>
<configuration>
<instructions>
<Import-Package>
Expand Down
4 changes: 2 additions & 2 deletions modules/bundles/http-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2021 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 @@ -23,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -61,7 +62,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-version}</version>
<configuration>
<instructions>
<Import-Package>
Expand Down
Loading