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.

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

Fixes #3642 - Rename Exousia Maven module to eclipse-exousia #3643

Merged
merged 1 commit into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<version>24.2.0-SNAPSHOT</version>
</parent>

<artifactId>piranha-extension-exousia</artifactId>
<artifactId>piranha-extension-eclipse-exousia</artifactId>
<packaging>jar</packaging>

<name>Piranha - Extension - Eclipse Exousia</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
requires cloud.piranha.core.api;
requires cloud.piranha.core.impl;
requires jakarta.security.jacc;
requires org.glassfish.exousia;
requires jakarta.servlet;
requires transitive org.glassfish.exousia;
}
2 changes: 1 addition & 1 deletion extension/eclipse-expressly/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@
module cloud.piranha.extension.expressly {

requires cloud.piranha.core.api;
requires org.glassfish.expressly;
requires transitive org.glassfish.expressly;
}
2 changes: 1 addition & 1 deletion extension/eclipse-wasp/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@
opens cloud.piranha.extension.wasp;
requires cloud.piranha.core.impl;
requires jakarta.servlet.jsp;
requires org.glassfish.wasp;
requires transitive org.glassfish.wasp;
}
2 changes: 1 addition & 1 deletion extension/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<module>bytesstreamhandler</module>
<module>coreprofile</module>
<module>default-datasource</module>
<module>eclipse-exousia</module>
<module>eclipse-expressly</module>
<module>eclipse-wasp</module>
<module>eclipselink</module>
<module>eleos</module>
<module>exousia</module>
<module>hazelcast</module>
<module>micro</module>
<module>microprofile</module>
Expand Down
2 changes: 0 additions & 2 deletions extension/security-jakarta/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,9 @@
requires cloud.piranha.core.api;
requires cloud.piranha.core.impl;
requires cloud.piranha.extension.eleos;
requires cloud.piranha.extension.exousia;
requires cloud.piranha.extension.security.servlet;
requires cloud.piranha.extension.soteria;
requires cloud.piranha.extension.weld;
requires java.naming;
requires org.glassfish.eleos;
requires org.glassfish.exousia;
}
12 changes: 6 additions & 6 deletions extension/security-servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-eclipse-exousia</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-eleos</artifactId>
Expand All @@ -34,12 +40,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-exousia</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<!-- test -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
5 changes: 1 addition & 4 deletions extension/security-servlet/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,11 @@
module cloud.piranha.extension.security.servlet {

exports cloud.piranha.extension.security.servlet;

opens cloud.piranha.extension.security.servlet;

requires cloud.piranha.core.api;
requires cloud.piranha.core.impl;
requires cloud.piranha.extension.eleos;
requires cloud.piranha.extension.exousia;
requires transitive cloud.piranha.extension.exousia;
requires java.naming;
requires org.glassfish.eleos;
requires org.glassfish.exousia;
}
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -240,26 +240,26 @@
<artifactId>org.eclipse.persistence.json</artifactId>
<version>${eclipselink.version}</version>
</dependency>

<!-- Eclipse EL -->

<!-- Eclipse Exousia -->
<dependency>
<groupId>org.glassfish.exousia</groupId>
<artifactId>exousia</artifactId>
<version>${exousia.version}</version>
</dependency>
<!-- Eclipse Expressly (EL) -->
<dependency>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<version>${expressly.version}</version>
</dependency>
<!-- Eclipse WaSP -->
<!-- Eclipse WaSP (Pages) -->
<dependency>
<groupId>org.glassfish.wasp</groupId>
<artifactId>wasp</artifactId>
<version>${wasp.version}</version>
</dependency>

<!-- Eclipse Exousia -->
<dependency>
<groupId>org.glassfish.exousia</groupId>
<artifactId>exousia</artifactId>
<version>${exousia.version}</version>
</dependency>

<!-- Eclipse Grizzly -->
<dependency>
Expand Down
22 changes: 5 additions & 17 deletions test/debug/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,27 +68,27 @@

<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-eclipse-expressly</artifactId>
<artifactId>piranha-extension-eclipse-exousia</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-eclipse-wasp</artifactId>
<artifactId>piranha-extension-eclipse-expressly</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-eleos</artifactId>
<artifactId>piranha-extension-eclipse-wasp</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-exousia</artifactId>
<artifactId>piranha-extension-eleos</artifactId>
<version>${project.version}</version>
</dependency>


<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-hazelcast</artifactId>
Expand Down Expand Up @@ -413,18 +413,6 @@
<artifactId>org.eclipse.persistence.jpa</artifactId>
</dependency>

<!-- Eclipse EL -->
<dependency>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
</dependency>

<!-- Eclipse Exousia -->
<dependency>
<groupId>org.glassfish.exousia</groupId>
<artifactId>exousia</artifactId>
</dependency>

<!-- Eclipse Grizzly -->
<dependency>
<groupId>org.glassfish.grizzly</groupId>
Expand Down
2 changes: 1 addition & 1 deletion test/embedded/soteria-basic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-exousia</artifactId>
<artifactId>piranha-extension-eclipse-exousia</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion test/embedded/soteria-form/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-exousia</artifactId>
<artifactId>piranha-extension-eclipse-exousia</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
Loading