Fix conflicts

fedora-jboss-as · Sep 12, 2013 · 600acea · 600acea
1 parent da06228
commit 600acea
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/jsf/multi-jsf-installer/pom.xml b/jsf/multi-jsf-installer/pom.xml
@@ -45,6 +45,19 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-jsf-injection</artifactId>
+            <version>${version.jboss.as}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-core-jsf</artifactId>
+            <version>${version.weld.core}</version>
+        </dependency>
+    </dependencies>
+
     <profiles>
         <profile>
             <id>mojarra-2.x</id>
@@ -121,7 +134,6 @@
         <plugins>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.3</version>
                 <executions>
                     <execution>
                         <id>make-jsf-instller</id>

diff --git a/jsf/multi-jsf-installer/src/main/resources/injection-module.xml b/jsf/multi-jsf-installer/src/main/resources/injection-module.xml
@@ -28,8 +28,8 @@
     </properties>
 
     <resources>
-        <resource-root path="../../../../../system/layers/base/org/jboss/as/jsf-injection/main/wildfly-jsf-injection-${version.jboss.as}.jar"/>
-        <resource-root path="../../../../../system/layers/base/org/jboss/as/jsf-injection/main/weld-core-jsf-${version.weld.core}.jar"/>
+        <resource-root path="wildfly-jsf-injection-${version.jboss.as}.jar"/>
+        <resource-root path="weld-core-jsf-${version.weld.core}.jar"/>
         <!-- Insert resources here -->
     </resources>
 

diff --git a/jsf/multi-jsf-installer/src/main/resources/mojarra-deploy.scr b/jsf/multi-jsf-installer/src/main/resources/mojarra-deploy.scr
@@ -1,3 +1,3 @@
 module add --name=javax.faces.api --slot=mojarra-${jsf-version} --resources=jsf-api-${jsf-version}.jar --module-xml=mojarra-api-module.xml
 module add --name=com.sun.jsf-impl --slot=mojarra-${jsf-version} --resources=jsf-impl-${jsf-version}.jar --module-xml=mojarra-impl-module.xml
-module add --name=org.jboss.as.jsf-injection --slot=mojarra-${jsf-version} --module-xml=injection-module.xml
+module add --name=org.jboss.as.jsf-injection --slot=mojarra-${jsf-version} --resources=weld-core-jsf-${version.weld.core}.jar:wildfly-jsf-injection-${version.jboss.as}.jar --resourceDelimiter=: --module-xml=injection-module.xml
diff --git a/jsf/multi-jsf-installer/src/main/resources/myfaces-deploy.scr b/jsf/multi-jsf-installer/src/main/resources/myfaces-deploy.scr
@@ -1,4 +1,4 @@
 module add --name=javax.faces.api --slot=myfaces-${jsf-version} --resources=myfaces-api-${jsf-version}.jar --module-xml=myfaces-api-module.xml
 module add --name=com.sun.jsf-impl --slot=myfaces-${jsf-version} --resources=myfaces-impl-${jsf-version}.jar --module-xml=myfaces-impl-module.xml
-module add --name=org.jboss.as.jsf-injection --slot=myfaces-${jsf-version} --module-xml=injection-module.xml
+module add --name=org.jboss.as.jsf-injection --slot=myfaces-${jsf-version} --resources=weld-core-jsf-${version.weld.core}.jar:wildfly-jsf-injection-${version.jboss.as}.jar --resourceDelimiter=: --module-xml=injection-module.xml
 module add --name=org.apache.commons.digester --slot=main --resources=commons-digester-1.8.jar --module-xml=myfaces-digester-module.xml