Skip to content

Commit

Permalink
Fixes piranhacloud#4155 - Revert to Epicyro 3.0.0 because 3.1.0 is br…
Browse files Browse the repository at this point in the history
  • Loading branch information
mnriem authored Nov 2, 2024
1 parent 2146496 commit 012be4f
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 14 deletions.
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<!-- dependencies -->
<jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
<jakarta.authentication-api.version>3.1.0</jakarta.authentication-api.version>
<jakarta.authentication-api.version>3.0.0</jakarta.authentication-api.version>
<jakarta.authorization-api.version>3.0.0</jakarta.authorization-api.version>
<jakarta.enterprise.concurrent-api.version>3.1.1</jakarta.enterprise.concurrent-api.version>
<jakarta.ejb-api.version>4.0.1</jakarta.ejb-api.version>
Expand Down
9 changes: 2 additions & 7 deletions extension/eclipse-epicyro/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,8 @@
*/

/**
* This module delivers the Eclipse Epicyro integration extension.
*
* <p>
* This extension integrates Eclipse Epicyro into Piranha. See
* https://github.com/eclipse-ee4j/epicyro for more information about its project.
* </p>
* This module integrates Epicyro into Piranha. See
* https://github.com/eclipse-ee4j/epicyro for more information.
*
* @author Manfred Riem ([email protected])
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* 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.epicyro;

import cloud.piranha.core.impl.DefaultWebApplication;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

/**
* The JUnit test for the AuthenticationInitializer class.
*
* @author Manfred Riem ([email protected])
*/
public class AuthenticationInitializerTest {

/**
* Test onStartup method.
*/
@Disabled
@Test
public void testOnStartup() throws Exception {
DefaultWebApplication webApplication = new DefaultWebApplication();
AuthenticationInitializer initializer = new AuthenticationInitializer();
initializer.onStartup(null, webApplication);
}
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<commons-fileupload2-jakarta-servlet6.version>2.0.0-M2</commons-fileupload2-jakarta-servlet6.version>
<crac.version>0.1.3</crac.version>
<eclipselink.version>5.0.0-B02</eclipselink.version>
<epicyro.version>3.1.0</epicyro.version>
<epicyro.version>3.0.0</epicyro.version>
<exousia.version>3.0.0-M1.1</exousia.version>
<expressly.version>6.0.0-M2</expressly.version>
<free-port-finder.version>1.1.1</free-port-finder.version>
Expand Down
10 changes: 5 additions & 5 deletions test/coreprofile/pom.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<?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">
<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.test</groupId>
<artifactId>project</artifactId>
<version>24.11.0-SNAPSHOT</version>
</parent>

<groupId>cloud.piranha.test.coreprofile</groupId>
<artifactId>project</artifactId>
<packaging>pom</packaging>

<name>Piranha - Test - Core Profile - Project</name>
<dependencies>
<!--
Make sure the Piranha Core Profile distribution is available before
attempting to build any of the modules.
attempting to build any of the test modules.
-->
<dependency>
Expand Down

0 comments on commit 012be4f

Please sign in to comment.