Skip to content

Commit

Permalink
Fixes #3749 - Move Commons FileUpload version into its Piranha Extens…
Browse files Browse the repository at this point in the history
…ion module (#3754)
  • Loading branch information
mnriem committed Jun 15, 2024
1 parent bbfa882 commit 14acf66
Show file tree
Hide file tree
Showing 7 changed files with 163 additions and 36 deletions.
22 changes: 12 additions & 10 deletions COMPONENTS.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# Components

| Name | Version |
|-----------------------|---------------|
| Eclipse Grizzly | 4.0.2 |
| Eclipse Grizzly NPN | 2.0.0 |
| Eclipse Mojarra | 4.1.0 . |
| Eclipse Yasson | 3.0.3 |
| Netty | 4.1.108.Final |
| Project CRaC | 0.1.3 |
| RedHat Undertow | 2.3.12.Final |
| RedHat Weld | 6.0.0.Alpha1 |
| Name | Version |
|--------------------------|---------------|
| Eclipse Angus Activation | 2.0.2 |
| Eclipse Angus Mail | 2.0.3 |
| Eclipse Grizzly | 4.0.2 |
| Eclipse Grizzly NPN | 2.0.0 |
| Eclipse Mojarra | 4.1.0 |
| Eclipse Yasson | 3.0.3 |
| Netty | 4.1.108.Final |
| Project CRaC | 0.1.3 |
| RedHat Undertow | 2.3.12.Final |
| RedHat Weld | 6.0.0.Alpha1 |
46 changes: 46 additions & 0 deletions extension/eclipse-angus/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>

<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cloud.piranha.extension</groupId>
<artifactId>project</artifactId>
<version>24.6.99-SNAPSHOT</version>
</parent>
<artifactId>piranha-extension-eclipse-angus</artifactId>
<packaging>jar</packaging>
<name>Piranha - Extension - Eclipse Angus</name>
<properties>
<angus.activation.version>2.0.2</angus.activation.version>
<angus.mail.version>2.0.3</angus.mail.version>
</properties>
<dependencies>
<!-- compile -->
<dependency>
<groupId>cloud.piranha.core</groupId>
<artifactId>piranha-core-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<!-- provided -->
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-scinitializer</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<!-- runtime -->
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
<version>${angus.mail.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
<version>${angus.activation.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
* Copyright (c) 2002-2024 Manorrock.com. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package cloud.piranha.extension.angus;

import cloud.piranha.core.api.WebApplication;
import cloud.piranha.core.api.WebApplicationExtension;
import java.lang.System.Logger;
import static java.lang.System.Logger.Level.TRACE;

/**
* The extension that delivers Eclipse Angus Mail to Piranha.
*
* @author Manfred Riem (mriem@manorrock.com)
*/
public class AngusExtension implements WebApplicationExtension {

/**
* Stores the logger.
*/
private static final Logger LOGGER = System.getLogger(AngusExtension.class.getName());

/**
* Configure the extension.
*
* @param webApplication the web application.
*/
@Override
public void configure(WebApplication webApplication) {
LOGGER.log(TRACE, "Configuring Angus extension");
}
}
42 changes: 42 additions & 0 deletions extension/eclipse-angus/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* Copyright (c) 2002-2024 Manorrock.com. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/

/**
* This module delivers the Eclipse Angus integration extension.
*
* <p>
* This extension integrates Eclipse Angus Mail into Piranha.
* </p>
*
* @author Manfred Riem (mriem@manorrock.com)
*/
module cloud.piranha.extension.angus {

requires cloud.piranha.core.api;
requires static cloud.piranha.extension.scinitializer;
}
18 changes: 6 additions & 12 deletions extension/micro/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
<artifactId>piranha-extension-apache-fileupload</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-eclipse-angus</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-eclipse-expressly</artifactId>
Expand Down Expand Up @@ -183,18 +188,7 @@
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</dependency>

<!-- Jakarta Mail implementation -->
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
</dependency>



<!-- Jakarta WebSocket implementation -->
<dependency>
<groupId>org.glassfish.tyrus</groupId>
Expand Down
1 change: 1 addition & 0 deletions extension/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<module>compat-tomcat10x</module>
<module>coreprofile</module>
<module>default-datasource</module>
<module>eclipse-angus</module>
<module>eclipse-concurro</module>
<module>eclipse-epicyro</module>
<module>eclipse-exousia</module>
Expand Down
14 changes: 0 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@

<properties>
<!-- dependencies -->
<angus.activation.version>2.0.2</angus.activation.version>
<angus.mail.version>2.0.3</angus.mail.version>
<arquillian.version>1.8.0.Final</arquillian.version>
<bcel.version>6.8.2</bcel.version>
<checkstyle.version>10.14.2</checkstyle.version>
Expand Down Expand Up @@ -167,18 +165,6 @@
<version>${maven-plugin-tools-annotations.version}</version>
</dependency>

<!-- Eclipse Angus -->
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
<version>${angus.mail.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
<version>${angus.activation.version}</version>
</dependency>

<!-- Eclipse JAXB -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
Expand Down

0 comments on commit 14acf66

Please sign in to comment.