Feature ETP-3396: Resolve merge conflict

Author: Emi-Polliotti

.gitignore

@@ -5,6 +5,7 @@ gradle.properties
 \${env.CATALINA_HOME}
 
 .backup
+.template-backups
 .classpath
 .settings
 !.settings/org.eclipse.core.resources.prefs

LICENSE.md

@@ -1,6 +1,6 @@
 ## ETENDO LICENSE OVERVIEW
 
-### Copyright © 2025 FUTIT SERVICES, S.L.
+### Copyright © 2026 FUTIT SERVICES, S.L.
 
 ---
 

artifacts.list.COMPILATION.gradle

@@ -1,100 +1,146 @@
 List<String> _dependenciesListCOMPILATION = [
+  // Authentication and Security Libraries
   'com.auth0:java-jwt:4.4.0',
-  'com.etendoerp:yuiant:1.0', 
-  'com.etendoerp:ant-nodeps:1.0.0', 
-  'com.etendoerp:antlr:2.7.7', 
-  'com.etendoerp:catalina-ant:1.0.0', 
-  'com.etendoerp:dbsm:1.1.0',
-  'com.etendoerp:jettison:1.3', 
-  'com.etendoerp:rhino-engine:1.7.13', 
-  'com.etendoerp:slf4j-api:1.7.25', 
-  'com.etendoerp:wstx-asl:3.0.2', 
-  'com.etendoerp:yuicompressor:2.4.2', 
-  'com.fasterxml.jackson.core:jackson-annotations:2.11.2', 
-  'com.fasterxml.jackson.core:jackson-core:2.11.2', 
-  'com.fasterxml.jackson.core:jackson-databind:2.11.2', 
-  'com.fasterxml:classmate:1.3.4', 
+
+  // Etendo Core and Internal Components
+  'com.etendoerp:dbsm:1.2.0',
+  'com.etendoerp:font.bitstreamverasans:1.0.0',
+  'com.etendoerp:YUIAnt:1.0.0',
+  'com.etendoerp:yuicompressor:2.4.2',
+
+  // JSON and Serialization Libraries
+  'com.fasterxml.jackson.core:jackson-annotations:2.11.2',
+  'com.fasterxml.jackson.core:jackson-core:2.11.2',
+  'com.fasterxml.jackson.core:jackson-databind:2.11.2',
+  'com.fasterxml:classmate:1.3.4',
+  'org.codehaus.jettison:jettison:1.3',
+
+  // Utility and Core Data Structures
   'com.google.guava:guava:21.0',
-  'com.lowagie:itext:2.1.7',
-  'com.oracle.database.jdbc:ojdbc8:19.8.0.0',
-  'com.sun.activation:javax.activation:1.2.0', 
-  'com.sun.istack:istack-commons-runtime:4.2.0',
-  'com.sun.mail:javax.mail:1.6.1', 
-  'com.sun.xml.fastinfoset:FastInfoset:1.2.15',
   'commons-beanutils:commons-beanutils:1.9.4',
-  'commons-betwixt:commons-betwixt:0.8', 
+  'commons-betwixt:commons-betwixt:0.8',
   'commons-codec:commons-codec:1.17.1',
-  'commons-collections:commons-collections:3.2.2', 
-  'commons-dbcp:commons-dbcp:1.4', 
+  'commons-collections:commons-collections:3.2.2',
+  'commons-dbcp:commons-dbcp:1.4',
   'commons-digester:commons-digester:2.1',
   'commons-fileupload:commons-fileupload:1.5',
   'commons-io:commons-io:2.16.1',
-  'commons-logging:commons-logging:1.2', 
-  'commons-pool:commons-pool:1.5.6', 
-  'cz.jirutka.rsql:rsql-parser:2.1.0', 
-  'javax.enterprise:cdi-api:2.0.SP1', 
-  'javax.inject:javax.inject:1',
-  'javax.persistence:javax.persistence-api:2.2', 
-  'javax.xml.bind:jaxb-api:2.3.1', 
-  'jfree:jfreechart:1.0.12', 
-  'nekohtml:nekohtml:0.9.5', 
-  'net.bytebuddy:byte-buddy:1.15.3',
-  'net.sf.jasperreports:jasperreports-fonts:6.17.0', 
-  'net.sf.jasperreports:jasperreports:6.17.0', 
-  'org.apache.ant:ant-launcher:1.9.2', 
-  'org.apache.ant:ant:1.9.2', 
-  'org.apache.commons:commons-collections4:4.4', 
-  'org.apache.commons:commons-lang3:3.17.0', 
-  'org.apache.commons:commons-math3:3.6.1', 
-  'org.apache.commons:commons-text:1.10.0', 
-  'org.apache.httpcomponents:httpclient:4.5.5', 
-  'org.apache.httpcomponents:httpcore:4.4.9', 
-  'org.apache.httpcomponents:httpmime:4.5.5', 
-  'org.apache.logging.log4j:log4j-1.2-api:2.16.0', 
-  'org.apache.logging.log4j:log4j-api:2.16.0', 
-  'org.apache.logging.log4j:log4j-core:2.16.0', 
-  'org.apache.logging.log4j:log4j-slf4j-impl:2.16.0', 
-  'org.apache.logging.log4j:log4j-web:2.16.0', 
-  'org.apache.poi:poi:5.4.0', 
-  'org.apache.poi:poi-ooxml:5.4.0',
-  'org.apache.poi:poi-ooxml-lite:5.4.0',
+  'commons-logging:commons-logging:1.2',
+  'commons-pool:commons-pool:1.5.6',
+  'org.apache.commons:commons-collections4:4.4',
+  'org.apache.commons:commons-lang3:3.17.0',
+  'org.apache.commons:commons-math3:3.6.1',
+  'org.apache.commons:commons-text:1.10.0',
+
+  // Reporting and Document Generation
+  'com.lowagie:itext:2.1.7',
+  'jfree:jfreechart:1.0.12',
+  'net.sf.jasperreports:jasperreports:6.17.0',
+  'net.sf.jasperreports:jasperreports-fonts:6.17.0',
+
+  // Database Drivers and Persistence Connectors
+  'com.oracle.database.jdbc:ojdbc8:19.8.0.0',
+  'org.postgresql:postgresql:42.7.8',
+
+  // Mail and Activation APIs
+  'com.sun.activation:javax.activation:1.2.0',
+  'com.sun.istack:istack-commons-runtime:4.2.0',
+  'com.sun.mail:javax.mail:1.6.1',
+
+  // XML and Data Processing Libraries
+  'com.sun.xml.fastinfoset:FastInfoset:1.2.15',
+  'nekohtml:nekohtml:0.9.5',
   'org.apache.xmlbeans:xmlbeans:5.1.1',
-  'org.apache.commons:commons-compress:1.27.1',
-  'org.apache.tika:tika-core:0.9', 
-  'org.apache.tomcat:tomcat-jdbc:9.0.37', 
-  'org.apache.tomcat:tomcat-juli:9.0.37', 
-  'org.apache.tomcat:tomcat-servlet-api:8.5.47',
   'org.codehaus.castor:castor-core:1.4.1',
   'org.codehaus.castor:castor-xml:1.4.1',
-  'org.dom4j:dom4j:2.1.3', 
-  'org.eclipse.jdt:ecj:3.23.0', 
-  'org.freemarker:freemarker:2.3.16', 
-  'org.glassfish.jaxb:jaxb-runtime:2.3.1', 
-  'org.glassfish.jaxb:txw2:2.3.1', 
+  'org.codehaus.woodstox:wstx-asl:4.0.6',
+  'org.dom4j:dom4j:2.1.3',
+  'xerces:xercesImpl:2.9.0',
+
+  // Parsing, Query, and Expression Engines
+  'cz.jirutka.rsql:rsql-parser:2.1.0',
+  'org.antlr:antlr-complete:3.5.3',
+
+  // Java EE and Dependency Injection APIs
+  'javax.enterprise:cdi-api:2.0.SP1',
+  'javax.inject:javax.inject:1',
+  'javax.persistence:javax.persistence-api:2.2',
+  'javax.xml.bind:jaxb-api:2.3.1',
+
+  // Bytecode and Compilation Tools
+  'net.bytebuddy:byte-buddy:1.15.3',
+  'org.javassist:javassist:3.24.0-GA',
+
+  // ORM and Persistence Frameworks
   'org.hibernate.common:hibernate-commons-annotations:5.1.2.Final',
   'org.hibernate:hibernate-core:5.6.15.Final',
-  'org.javassist:javassist:3.24.0-GA', 
-  'org.jboss.classfilewriter:jboss-classfilewriter:1.2.4.Final', 
-  'org.jboss.logging:jboss-logging:3.3.2.Final', 
-  'org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:1.0.0.Final', 
-  'org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec:1.0.0.Final', 
-  'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final', 
-  'org.jboss.weld.environment:weld-environment-common:3.1.1.Final', 
-  'org.jboss.weld.module:weld-jsf:3.1.1.Final', 
-  'org.jboss.weld.module:weld-web:3.1.1.Final', 
-  'org.jboss.weld.servlet:weld-servlet-core:3.1.1.Final', 
-  'org.jboss.weld:weld-api:3.1.Final', 
-  'org.jboss.weld:weld-core-impl:3.1.1.Final', 
-  'org.jboss.weld:weld-spi:3.1.Final', 
-  'org.jboss:jandex:2.0.5.Final', 
-  'org.jvnet.staxex:stax-ex:1.8', 
-  'org.mozilla:rhino:1.7.13', 
-  'org.postgresql:postgresql:42.5.4',
-  'org.quartz-scheduler:quartz:2.3.2', 
-  'org.redisson:redisson:3.15.4', 
-  'oro:oro:2.0.8', 
-  'xerces:xercesImpl:2.9.0',
-  'com.etendoerp:font.bitstreamverasans:1.0.0'
+
+  // JBoss and Weld CDI Implementation
+  'org.jboss.classfilewriter:jboss-classfilewriter:1.2.4.Final',
+  'org.jboss.logging:jboss-logging:3.3.2.Final',
+  'org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:1.0.0.Final',
+  'org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec:1.0.0.Final',
+  'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final',
+  'org.jboss.weld.environment:weld-environment-common:3.1.1.Final',
+  'org.jboss.weld.module:weld-jsf:3.1.1.Final',
+  'org.jboss.weld.module:weld-web:3.1.1.Final',
+  'org.jboss.weld.servlet:weld-servlet-core:3.1.1.Final',
+  'org.jboss.weld:weld-api:3.1.Final',
+  'org.jboss.weld:weld-core-impl:3.1.1.Final',
+  'org.jboss.weld:weld-spi:3.1.Final',
+  'org.jboss:jandex:2.0.5.Final',
+
+  // Apache Ant and Tomcat Runtime
+  'org.apache.ant:ant:1.9.2',
+  'org.apache.ant:ant-launcher:1.9.2',
+  'org.apache.tomcat:tomcat-jdbc:9.0.37',
+  'org.apache.tomcat:tomcat-juli:9.0.37',
+  'org.apache.tomcat:tomcat-servlet-api:8.5.47',
+
+  // Logging Frameworks
+  'org.apache.logging.log4j:log4j-1.2-api:2.16.0',
+  'org.apache.logging.log4j:log4j-api:2.16.0',
+  'org.apache.logging.log4j:log4j-core:2.16.0',
+  'org.apache.logging.log4j:log4j-slf4j-impl:2.16.0',
+  'org.apache.logging.log4j:log4j-web:2.16.0',
+  'org.slf4j:slf4j-api:1.7.25',
+
+  // HTTP and Networking Libraries
+  'org.apache.httpcomponents:httpclient:4.5.5',
+  'org.apache.httpcomponents:httpcore:4.4.9',
+  'org.apache.httpcomponents:httpmime:4.5.5',
+
+  // Office and Document Processing
+  'org.apache.poi:poi:5.4.0',
+  'org.apache.poi:poi-ooxml:5.4.0',
+  'org.apache.poi:poi-ooxml-lite:5.4.0',
+
+  // File and Content Analysis
+  'org.apache.tika:tika-core:0.9',
+
+  // XML Binding and StAX Processing
+  'org.glassfish.jaxb:jaxb-runtime:2.3.1',
+  'org.glassfish.jaxb:txw2:2.3.1',
+  'org.jvnet.staxex:stax-ex:1.8',
+
+  // Template and Scripting Engines
+  'org.freemarker:freemarker:2.3.16',
+  'org.mozilla:rhino:1.8.0',
+  'org.mozilla:rhino-engine:1.8.0',
+
+  // Scheduling and Distributed Systems
+  'org.quartz-scheduler:quartz:2.3.2',
+  'org.redisson:redisson:3.15.4',
+
+  // Miscellaneous Utilities
+  'oro:oro:2.0.8',
+
+  // Testing Libraries
+  'org.hamcrest:hamcrest-all:1.3',
+  'junit:junit:4.12',
+
+  // Analytcs
+  'com.etendoerp:analytics.exporter:3.2.0'
 ]
 
 ext {

build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'idea'
     id 'groovy'
     id 'jacoco'
-    id 'com.etendoerp.gradleplugin' version '2.2.1'
+    id 'com.etendoerp.gradleplugin' version '2.3.0'
     id 'com.etendoerp.testing.gradleplugin' version '2.1.0'
 }
 compileJava.options.encoding = "UTF-8"

build.xml

@@ -850,9 +850,17 @@ export.database: exports database structure and data to xml files.
     <ant dir="${base.src}" target="translate" inheritAll="true" inheritRefs="true" />
   </target>
 
+  <target name="generate.sws.keys" depends="init, core.lib">
+    <taskdef name="generateSWSKeys" classname="org.openbravo.service.security.GenerateSWSKeysTask">
+      <classpath refid="project.class.path" />
+    </taskdef>
+    <generateSWSKeys propertiesFile="${base.config}/Openbravo.properties" />
+  </target>
+
   <target name="install.source" depends="init, cleanSubfolders, create.database, wad.lib, trl.lib, compile.complete.deploy">
     <echo message="applying modules" />
     <antcall inheritall="true" inheritrefs="true" target="apply.module" />
+    <antcall inheritall="true" target="generate.sws.keys" />
     <antcall inheritall="true" target="import.sample.data" />
     <updatesystemstatus v="RB51"/>
     <ant dir="${base.db}" target="setApplied" inheritAll="true" inheritRefs="true" />

legal/Etendo_license.txt

@@ -175,4 +175,4 @@ _________
 
 Spain.
 
-Copyright © 2025 FUTIT SERVICES, S.L.
+Copyright © 2026 FUTIT SERVICES, S.L.