Compare commits
5 Commits
b0d23a0003
...
a28279ad7f
| Author | SHA1 | Date | |
|---|---|---|---|
| a28279ad7f | |||
| f1053c442e | |||
| c6622981cf | |||
| c95f5f1560 | |||
|
d9349049bb |
76
.gitea/workflows/ci.yml
Normal file
76
.gitea/workflows/ci.yml
Normal file
@@ -0,0 +1,76 @@
|
||||
# ============================================================================
|
||||
# Template — .gitea/workflows/ci.yml
|
||||
# Drop this file into each app repo (adjust LIONS_JAVA_VERSION +
|
||||
# LIONS_APP_NAME + optional --deploy-repo-url). It runs inside the
|
||||
# registry.lions.dev/lionsdev/lionsctl-ci:latest image, so lionsctl,
|
||||
# kubectl, helm, docker CLI, JDK 17+21 and Maven are all pre-installed.
|
||||
#
|
||||
# Required Gitea repo secrets:
|
||||
# LIONS_REGISTRY_USERNAME (typically "lionsregistry")
|
||||
# LIONS_REGISTRY_PASSWORD
|
||||
# LIONS_GIT_USERNAME (typically "lionsdev")
|
||||
# LIONS_GIT_ACCESS_TOKEN (Gitea PAT with write:repository, write:package)
|
||||
# LIONS_GIT_PASSWORD (Gitea password for same user — Helm mode)
|
||||
# SMTP_HOST SMTP_PORT SMTP_USERNAME SMTP_PASSWORD SMTP_FROM
|
||||
# ============================================================================
|
||||
name: CI/CD Pipeline
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ main ]
|
||||
workflow_dispatch: {}
|
||||
|
||||
env:
|
||||
# Adjust per repo:
|
||||
# - unionflow-server-impl-quarkus -> 21
|
||||
# - all others -> 17
|
||||
LIONS_JAVA_VERSION: "17"
|
||||
LIONS_CLUSTER: "k1"
|
||||
|
||||
jobs:
|
||||
pipeline:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: registry.lions.dev/lionsdev/lionsctl-ci:latest
|
||||
credentials:
|
||||
username: ${{ secrets.LIONS_REGISTRY_USERNAME }}
|
||||
password: ${{ secrets.LIONS_REGISTRY_PASSWORD }}
|
||||
# Mount the host docker socket so `docker build/push` inside the
|
||||
# container hits the runner's daemon (DinD-free).
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
|
||||
steps:
|
||||
- name: Show tooling
|
||||
run: |
|
||||
lionsctl --version || true
|
||||
docker --version
|
||||
kubectl version --client=true
|
||||
helm version --short
|
||||
mvn --version | head -n2
|
||||
|
||||
- name: Pipeline deploy
|
||||
env:
|
||||
LIONS_REGISTRY_USERNAME: ${{ secrets.LIONS_REGISTRY_USERNAME }}
|
||||
LIONS_REGISTRY_PASSWORD: ${{ secrets.LIONS_REGISTRY_PASSWORD }}
|
||||
LIONS_GIT_USERNAME: ${{ secrets.LIONS_GIT_USERNAME }}
|
||||
LIONS_GIT_ACCESS_TOKEN: ${{ secrets.LIONS_GIT_ACCESS_TOKEN }}
|
||||
LIONS_GIT_PASSWORD: ${{ secrets.LIONS_GIT_PASSWORD }}
|
||||
SMTP_HOST: ${{ secrets.SMTP_HOST }}
|
||||
SMTP_PORT: ${{ secrets.SMTP_PORT }}
|
||||
SMTP_USERNAME: ${{ secrets.SMTP_USERNAME }}
|
||||
SMTP_PASSWORD: ${{ secrets.SMTP_PASSWORD }}
|
||||
SMTP_FROM: ${{ secrets.SMTP_FROM }}
|
||||
# No actions/checkout — lionsctl clones internally using git_access_token.
|
||||
run: |
|
||||
# For btpxpress-backend add: --deploy-repo-url https://git.lions.dev/lionsdev/btpxpress-server-k1
|
||||
# For btpxpress-frontend add: --deploy-repo-url https://git.lions.dev/lionsdev/btpxpress-client-k1
|
||||
lionsctl pipeline \
|
||||
-u ${{ gitea.server_url }}/${{ gitea.repository }} \
|
||||
-b ${{ gitea.ref_name }} \
|
||||
-j ${{ env.LIONS_JAVA_VERSION }} \
|
||||
-e production \
|
||||
-c ${{ env.LIONS_CLUSTER }} \
|
||||
-p prod \
|
||||
--deploy-repo-url https://git.lions.dev/lionsdev/unionflow-client-quarkus-primefaces-freya-k1 \
|
||||
-m admin@lions.dev
|
||||
@@ -1,60 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd" version="2.0">
|
||||
<namespace>http://primefaces.org/freya</namespace>
|
||||
<tag>
|
||||
<description><![CDATA[Menu is a navigation component for Freya Layout.]]></description>
|
||||
<tag-name>menu</tag-name>
|
||||
<component>
|
||||
<component-type>org.primefaces.component.FreyaMenu</component-type>
|
||||
<renderer-type>org.primefaces.component.FreyaMenuRenderer</renderer-type>
|
||||
</component>
|
||||
<attribute>
|
||||
<description><![CDATA[Unique identifier of the component in a namingContainer.]]></description>
|
||||
<name>id</name>
|
||||
<required>false</required>
|
||||
<type>java.lang.String</type>
|
||||
</attribute>
|
||||
<attribute>
|
||||
<description><![CDATA[Boolean value to specify the rendering of the component, when set to false component will not be rendered.]]></description>
|
||||
<name>rendered</name>
|
||||
<required>false</required>
|
||||
<type>java.lang.Boolean</type>
|
||||
</attribute>
|
||||
<attribute>
|
||||
<description><![CDATA[An el expression referring to a server side UIComponent instance in a backing bean.]]></description>
|
||||
<name>binding</name>
|
||||
<required>false</required>
|
||||
<type>jakarta.faces.component.UIComponent</type>
|
||||
</attribute>
|
||||
<attribute>
|
||||
<description><![CDATA[Name of the client side widget.]]></description>
|
||||
<name>widgetVar</name>
|
||||
<required>false</required>
|
||||
<type>java.lang.String</type>
|
||||
</attribute>
|
||||
<attribute>
|
||||
<description><![CDATA[A menu model instance to create menu programmatically.]]></description>
|
||||
<name>model</name>
|
||||
<required>false</required>
|
||||
<type>org.primefaces.model.menu.MenuModel</type>
|
||||
</attribute>
|
||||
<attribute>
|
||||
<description><![CDATA[Inline style of the main container element.]]></description>
|
||||
<name>style</name>
|
||||
<required>false</required>
|
||||
<type>java.lang.String</type>
|
||||
</attribute>
|
||||
<attribute>
|
||||
<description><![CDATA[Style class of the main container element.]]></description>
|
||||
<name>styleClass</name>
|
||||
<required>false</required>
|
||||
<type>java.lang.String</type>
|
||||
</attribute>
|
||||
<attribute>
|
||||
<description><![CDATA[Delay to wait in milliseconds before closing menu on mouse leave. Default is 250.]]></description>
|
||||
<name>closeDelay</name>
|
||||
<required>false</required>
|
||||
<type>java.lang.Integer</type>
|
||||
</attribute>
|
||||
</tag>
|
||||
</facelet-taglib>
|
||||
29
pom.xml
29
pom.xml
@@ -4,9 +4,14 @@
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>dev.lions.unionflow</groupId>
|
||||
<parent>
|
||||
<groupId>dev.lions.unionflow</groupId>
|
||||
<artifactId>unionflow-parent</artifactId>
|
||||
<version>1.0.6</version>
|
||||
<relativePath/> <!-- Force resolution from Maven repo (Gitea); enables standalone clones -->
|
||||
</parent>
|
||||
|
||||
<artifactId>unionflow-client-quarkus-primefaces-freya</artifactId>
|
||||
<version>1.0.7</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>UnionFlow Client (Quarkus + PrimeFaces Freya)</name>
|
||||
@@ -18,16 +23,12 @@
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
|
||||
<quarkus.platform.version>3.27.3</quarkus.platform.version>
|
||||
<quarkus.platform.version>3.15.1</quarkus.platform.version>
|
||||
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
|
||||
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
|
||||
<quarkus-primefaces.version>3.13.3</quarkus-primefaces.version>
|
||||
<primefaces.version>14.0.5</primefaces.version>
|
||||
<omnifaces.version>4.4.1</omnifaces.version>
|
||||
<lombok.version>1.18.38</lombok.version>
|
||||
<!-- Overrides BOM : Docker Desktop 29.x compat -->
|
||||
<testcontainers.version>1.21.4</testcontainers.version>
|
||||
<docker-java.version>3.4.2</docker-java.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
@@ -39,20 +40,6 @@
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.testcontainers</groupId>
|
||||
<artifactId>testcontainers-bom</artifactId>
|
||||
<version>${testcontainers.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<!-- Lombok : pas dans Quarkus BOM -->
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>${lombok.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
|
||||
@@ -88,6 +88,7 @@ public class OrganisationDetailBean implements Serializable {
|
||||
if (organisation != null) {
|
||||
String libelle = typeCatalogueService.resolveLibelle(organisation.getTypeOrganisation());
|
||||
organisation.setTypeOrganisationLibelle(libelle);
|
||||
organisation.setTypeLibelle(libelle);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
LOG.errorf(e, "Erreur lors du chargement de l'organisation");
|
||||
@@ -131,6 +132,7 @@ public class OrganisationDetailBean implements Serializable {
|
||||
if (organisation != null) {
|
||||
String libelle = typeCatalogueService.resolveLibelle(organisation.getTypeOrganisation());
|
||||
organisation.setTypeOrganisationLibelle(libelle);
|
||||
organisation.setTypeLibelle(libelle);
|
||||
}
|
||||
modeEdition = false;
|
||||
errorHandler.showSuccess("Succès", "Organisation modifiée avec succès.");
|
||||
|
||||
@@ -46,7 +46,7 @@ quarkus.http.enable-compression=true
|
||||
quarkus.http.compression-level=6
|
||||
|
||||
# Configuration logging - Production
|
||||
quarkus.log.console.enabled=true
|
||||
quarkus.log.console.enable=true
|
||||
quarkus.log.console.level=INFO
|
||||
quarkus.log.console.format=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{2.}] (%t) %s%e%n
|
||||
quarkus.log.category."dev.lions.unionflow".level=INFO
|
||||
|
||||
@@ -11,7 +11,7 @@ quarkus.http.tcp-quick-ack=true
|
||||
quarkus.http.tcp-cork=true
|
||||
|
||||
# Configuration logging
|
||||
quarkus.log.console.enabled=true
|
||||
quarkus.log.console.enable=true
|
||||
quarkus.log.console.level=INFO
|
||||
quarkus.log.console.format=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{2.}] (%t) %s%e%n
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 MiB |
Reference in New Issue
Block a user