Skip to content
This repository has been archived by the owner on Mar 12, 2021. It is now read-only.

Commit

Permalink
Merge pull request #364 from Pandrex247/FISH-464-Revert
Browse files Browse the repository at this point in the history
FISH-464 Revert
  • Loading branch information
MattGill98 authored Feb 5, 2021
2 parents 5bb06bb + 4bd227a commit 971805a
Show file tree
Hide file tree
Showing 486 changed files with 5,441 additions and 168 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e8ab5075f0b76f26a8d6b58d893bddfc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
316c8d4e128301e2305d997a563042f3d01ad39a
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
886b3199fb02640898ab76d793bb8755
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
13c91fed83789804f6033f5214a87ce75754e306
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1c173f025bbfe67417eb0ce72cdabaed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
06a64ea89552292304fbb245e4daadfa8f420267
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2012, 2017 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
http://www.eclipse.org/legal/epl-2.0.
This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
version 2 with the GNU Classpath Exception, which is available at
https://www.gnu.org/software/classpath/license.html.
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>2.4.4.payara-p6</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connection-pool</artifactId>
<packaging>bundle</packaging>
<version>2.4.4.payara-p6</version>
<name>connection-pool</name>
<build>
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Import-Package>
org.glassfish.grizzly*;version=${project.version},
*,
</Import-Package>
<Export-Package>
org.glassfish.grizzly.connectionpool.*;version=${project.version},
</Export-Package>
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<linkXRef>false</linkXRef>
</configuration>
</plugin>
</plugins>
</reporting>
<dependencies>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-framework</artifactId>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d1d601dd9ed843c629954261e81b708e
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
be8eba9bbb2ae8ad88c31525369ea775d996f1fd
5 changes: 3 additions & 2 deletions org/glassfish/grizzly/connection-pool/maven-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>org.glassfish.grizzly</groupId>
<artifactId>connection-pool</artifactId>
<versioning>
<release>2.4.4.payara-p5</release>
<release>2.4.4.payara-p6</release>
<versions>
<version>2.3.18-SNAPSHOT</version>
<version>2.4.3.payara-p1</version>
Expand All @@ -25,7 +25,8 @@
<version>2.4.4.payara-p3</version>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5</version>
<version>2.4.4.payara-p6</version>
</versions>
<lastUpdated>20210129165114</lastUpdated>
<lastUpdated>20210205155324</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
335a6d7e66a6a312448237ad38d16332
4b8db353e3701072b0bdf9a5755c89b8
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f1cafc3a11cd01d37be5d27f640e5ad3851f41ec
94818e96c1290b213961aba4173d674fb1eda20b
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2007, 2017 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
http://www.eclipse.org/legal/epl-2.0.
This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
version 2 with the GNU Classpath Exception, which is available at
https://www.gnu.org/software/classpath/license.html.
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>net.java</groupId>
<artifactId>jvnet-parent</artifactId>
<version>3</version>
<relativePath />
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-bom</artifactId>
<packaging>pom</packaging>
<name>grizzly-bom</name>
<version>2.4.4.payara-p6</version>

<description>Grizzly Bill of Materials (BOM)</description>

<build>
<pluginManagement>
<plugins>
<plugin>
<inherited>true</inherited>
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId>
<version>1.40</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.13</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
</plugin>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>${cobertura.version}</version>
</plugin>
-->
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
<version>1.39</version>
<configuration>
<scm>git</scm>
<scmOnly>true</scmOnly>
<warn>false</warn>
</configuration>
</plugin>
</plugins>
</build>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-framework</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-compression</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-servlet</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-portunif</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-ajp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-websockets</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-comet</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server-multipart</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server-jaxws</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-servlet-extras</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>tls-sni</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly.osgi</groupId>
<artifactId>grizzly-httpservice</artifactId>
<version>${project.version}</version>
</dependency>
<!-- JMX monitoring modules -->
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-framework-monitoring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-monitoring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server-monitoring</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Bundles -->
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-all</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-servlet-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-websockets-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-comet-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly.osgi</groupId>
<artifactId>grizzly-httpservice-bundle</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e52b837c51911508b8bc3052d811aa98
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e0bf3037497370de0f4ca8e8a1f18f9ba8263652
5 changes: 3 additions & 2 deletions org/glassfish/grizzly/grizzly-bom/maven-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-bom</artifactId>
<versioning>
<release>2.4.4.payara-p5</release>
<release>2.4.4.payara-p6</release>
<versions>
<version>2.3.18-SNAPSHOT</version>
<version>2.4.3.payara-p1</version>
Expand All @@ -25,7 +25,8 @@
<version>2.4.4.payara-p3</version>
<version>2.4.4.payara-p4</version>
<version>2.4.4.payara-p5</version>
<version>2.4.4.payara-p6</version>
</versions>
<lastUpdated>20210129164937</lastUpdated>
<lastUpdated>20210205155249</lastUpdated>
</versioning>
</metadata>
2 changes: 1 addition & 1 deletion org/glassfish/grizzly/grizzly-bom/maven-metadata.xml.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
49863e87c95c1caa35cb4cbe6d4079a2
29572e7a03400db988457f304100ecaa
Loading

0 comments on commit 971805a

Please sign in to comment.