Merge pull request #29609 from pnicolucci/MYFACES-4666

MYFACES-4666
OpenLiberty · Sep 12, 2024 · 6345656 · 6345656
2 parents d3f1f9c + 9d90dc7
commit 6345656
Show file tree

Hide file tree

Showing 5 changed files with 1,422 additions and 12 deletions.
diff --git a/dev/io.openliberty.jakarta.faces.4.1/.classpath b/dev/io.openliberty.jakarta.faces.4.1/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+    <classpathentry kind="src" path="src"/>
     <classpathentry kind="con" path="aQute.bnd.classpath.container"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
     <classpathentry kind="output" path="bin"/>

diff --git a/dev/io.openliberty.jakarta.faces.4.1/bnd.bnd b/dev/io.openliberty.jakarta.faces.4.1/bnd.bnd
@@ -20,29 +20,30 @@ Bundle-Description:  Jakarta Faces, MyFaces 4.1 API
 Implementation-Version: 4.1.0
 
 Export-Package: \
-  jakarta.faces.*; version=${Implementation-Version}, \
-  org.apache.myfaces.core.api.shared.*; version=${Implementation-Version}
+    jakarta.faces.*; version=${Implementation-Version}, \
+    org.apache.myfaces.core.api.shared.*; version=${Implementation-Version}
 
 DynamicImport-Package: \
-  io.openliberty.faces40.internal.spi, \
-  com.ibm.ws.managedobject, \
-  org.apache.myfaces.cdi.util, \
-  org.apache.myfaces.spi
+    io.openliberty.faces40.internal.spi, \
+    com.ibm.ws.managedobject, \
+    org.apache.myfaces.cdi.util, \
+    org.apache.myfaces.spi
 
 # Use this format (4.1.0.RC#)  once we have an official release and not an RC Version
 -includeresource: \
-	@${repo;org.apache.myfaces.core:myfaces-api;4.1.0.RC2;EXACT}!/!(META-INF/maven/*|module-info.class), \
-	META-INF=@src/META-INF
+    @${repo;org.apache.myfaces.core:myfaces-api;4.1.0.RC2;EXACT}!/!(META-INF/maven/*|module-info.class), \
+    META-INF=@src/META-INF, \
+    org/apache/myfaces=${bin}/org/apache/myfaces
 
 instrument.disabled: true
 
 publish.wlp.jar.suffix: dev/api/spec
 
 # Use this format (4.1.0.RC#) once we have an official release and not an RC Version
 -buildpath: \
-    org.apache.myfaces.core:myfaces-api;strategy=exact;version=4.1.0.RC2
+    org.apache.myfaces.core:myfaces-api;strategy=exact;version=4.1.0.RC2,\
+    io.openliberty.jakarta.expressionLanguage.6.0;version=latest
     # org.apache.myfaces.buildtools:myfaces-builder-annotations;version=1.0.9;strategy=exact, \
-    # io.openliberty.jakarta.expressionLanguage.5.0;version=latest, \
-    # io.openliberty.jakarta.servlet.6.0;version=latest, \
-    # io.openliberty.jakarta.cdi.4.0;version=latest
+    # io.openliberty.jakarta.servlet.6.1;version=latest, \
+    # io.openliberty.jakarta.cdi.4.1;version=latest