hotfix: saxon bug in eno lib (#143)

* fix: exclude xalan library from lunatic-model * ci(docker): target the right eno and lunatic-model versions * build: bump eno version Including a fix on saxon dependency. * chore: bump version * ci: update other workflows
InseeFr · Nov 6, 2023 · f7205e2 · f7205e2
1 parent 4e83854
commit f7205e2
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
@@ -3,8 +3,8 @@ name: Build docker
 on: workflow_dispatch
 
 env:
-  ENOBRANCH: main
-  LUNATICBRANCH: develop
+  ENO_BRANCH: 'lunatic-v1-main-last-version'
+  LUNATIC_MODEL_TAG: '2.2.10'
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 1
-          ref: ${{ env.ENOBRANCH }}
+          ref: ${{ env.ENO_BRANCH }}
           repository: InseeFr/Eno
           path: Eno
 
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 1
-          ref: ${{ env.LUNATICBRANCH }}
+          ref: ${{ env.LUNATIC_MODEL_TAG }}
           repository: InseeFr/Lunatic-model
           path: Lunatic-model
 

diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml
@@ -5,6 +5,10 @@ on:
     tags: 
       - '*.*.*'
 
+env:
+  ENO_BRANCH: 'lunatic-v1-main-last-version'
+  LUNATIC_MODEL_TAG: '2.2.10'
+
 jobs:
 
   test:
@@ -22,7 +26,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 1
-          ref: main
+          ref: ${{ env.ENO_BRANCH }}
           repository: InseeFr/Eno
           path: Eno
 
@@ -34,7 +38,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 1
-          ref: develop
+          ref: ${{ env.LUNATIC_MODEL_TAG }}
           repository: InseeFr/Lunatic-model
           path: Lunatic-model
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,13 +5,15 @@ on:
     branches:
       - "**"
 
+env:
+  ENO_BRANCH: 'lunatic-v1-main-last-version'
+  LUNATIC_MODEL_TAG: '2.2.10'
+
 jobs:
 
   test:
     runs-on: ubuntu-latest
-    env:
-      ENOBRANCH: main
-      LUNATICBRANCH: develop
+
     steps:
       - uses: actions/checkout@v2
         with:
@@ -25,7 +27,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 1
-          ref: ${{ env.ENOBRANCH }}
+          ref: ${{ env.ENO_BRANCH }}
           repository: InseeFr/Eno
           path: Eno
 
@@ -37,7 +39,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 1
-          ref: ${{ env.LUNATICBRANCH }}
+          ref: ${{ env.LUNATIC_MODEL_TAG }}
           repository: InseeFr/Lunatic-model
           path: Lunatic-model
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>eno-ws</artifactId>
 	<packaging>war</packaging>
 
-	<version>1.5.2</version>
+	<version>1.5.3</version>
 
 	<name>Eno-Web-Service</name>
 
@@ -21,7 +21,7 @@
 
 		<javax.activation.version>1.2.0</javax.activation.version>
 
-		<eno.version>2.3.12</eno.version>
+		<eno.version>2.3.13</eno.version>
 
 		<log4j2.version>2.17.0</log4j2.version>
 
@@ -118,6 +118,12 @@
 			<groupId>fr.insee.lunatic</groupId>
 			<artifactId>lunatic-model</artifactId>
 			<version>${lunatic-model.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>xalan</groupId>
+					<artifactId>xalan</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- apache fop -->