Author: vdedik Date: 2012-10-30 10:44:11 -0400 (Tue, 30 Oct 2012) New Revision: 15324 Modified: branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-tests/pom.xml branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml branches/enterprise/WFK-2_1/examples/groovybooking/pom.xml branches/enterprise/WFK-2_1/examples/hibernate/hibernate-tests/pom.xml branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/pom.xml branches/enterprise/WFK-2_1/examples/hibernate/pom.xml branches/enterprise/WFK-2_1/examples/jee6/jee6-tests/pom.xml branches/enterprise/WFK-2_1/examples/jee6/jee6-web/pom.xml branches/enterprise/WFK-2_1/examples/jee6/pom.xml branches/enterprise/WFK-2_1/examples/jpa/jpa-tests/pom.xml branches/enterprise/WFK-2_1/examples/jpa/jpa-web/pom.xml branches/enterprise/WFK-2_1/examples/jpa/pom.xml Log: bugzilla 869662 #1 and 869668 #1 Modified: branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-tests/pom.xml 2012-10-30 13:06:23 UTC (rev 15323) +++ branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-tests/pom.xml 2012-10-30 14:44:11 UTC (rev 15324) @@ -17,6 +17,11 @@ <dependencies> <dependency> + <groupId>org.jboss.seam.examples.groovybooking</groupId> + <artifactId>groovybooking-web</artifactId> + <classifier>classes</classifier> + </dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> </dependency> @@ -77,25 +82,6 @@ <skip>true</skip> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - <phase>generate-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${basedir}/../hibernate-web/src/main/groovy</source> - <source>${basedir}/../hibernate-web/src/main/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> Modified: branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml 2012-10-30 13:06:23 UTC (rev 15323) +++ branches/enterprise/WFK-2_1/examples/groovybooking/groovybooking-web/pom.xml 2012-10-30 14:44:11 UTC (rev 15324) @@ -215,6 +215,7 @@ <filtering>true</filtering> </resource> </webResources> + <attachClasses>true</attachClasses> </configuration> </plugin> </plugins> Modified: branches/enterprise/WFK-2_1/examples/groovybooking/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/groovybooking/pom.xml 2012-10-30 13:06:23 UTC (rev 15323) +++ branches/enterprise/WFK-2_1/examples/groovybooking/pom.xml 2012-10-30 14:44:11 UTC (rev 15324) @@ -28,6 +28,12 @@ <version>${project.version}</version> <type>war</type> </dependency> + <dependency> + <groupId>org.jboss.seam.examples.groovybooking</groupId> + <artifactId>groovybooking-web</artifactId> + <version>${project.version}</version> + <classifier>classes</classifier> + </dependency> </dependencies> </dependencyManagement> </project> Modified: branches/enterprise/WFK-2_1/examples/hibernate/hibernate-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-tests/pom.xml 2012-10-30 13:06:23 UTC (rev 15323) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-tests/pom.xml 2012-10-30 14:44:11 UTC (rev 15324) @@ -17,6 +17,11 @@ <dependencies> <dependency> + <groupId>org.jboss.seam.examples.hibernate</groupId> + <artifactId>hibernate-web</artifactId> + <classifier>classes</classifier> + </dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> </dependency> @@ -96,24 +101,6 @@ <skip>true</skip> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - <phase>generate-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${basedir}/../hibernate-web/src/main/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> Modified: branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/pom.xml 2012-10-30 13:06:23 UTC (rev 15323) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/pom.xml 2012-10-30 14:44:11 UTC (rev 15324) @@ -29,6 +29,7 @@ <filtering>true</filtering> </resource> </webResources> + <attachClasses>true</attachClasses> </configuration> </plugin> </plugins> Modified: branches/enterprise/WFK-2_1/examples/hibernate/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/pom.xml 2012-10-30 13:06:23 UTC (rev 15323) +++ branches/enterprise/WFK-2_1/examples/hibernate/pom.xml 2012-10-30 14:44:11 UTC (rev 15324) @@ -32,6 +32,12 @@ <version>${project.version}</version> <type>war</type> </dependency> + <dependency> + <groupId>org.jboss.seam.examples.hibernate</groupId> + <artifactId>hibernate-web</artifactId> + <version>${project.version}</version> + <classifier>classes</classifier> + </dependency> </dependencies> </dependencyManagement> Modified: branches/enterprise/WFK-2_1/examples/jee6/jee6-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jee6/jee6-tests/pom.xml 2012-10-30 13:06:23 UTC (rev 15323) +++ branches/enterprise/WFK-2_1/examples/jee6/jee6-tests/pom.xml 2012-10-30 14:44:11 UTC (rev 15324) @@ -14,6 +14,11 @@ <dependencies> <dependency> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>jee6-web</artifactId> + <classifier>classes</classifier> + </dependency> + <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> @@ -109,24 +114,6 @@ <skip>true</skip> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - <phase>generate-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>../jee6-web/src/main/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> Modified: branches/enterprise/WFK-2_1/examples/jee6/jee6-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jee6/jee6-web/pom.xml 2012-10-30 13:06:23 UTC (rev 15323) +++ branches/enterprise/WFK-2_1/examples/jee6/jee6-web/pom.xml 2012-10-30 14:44:11 UTC (rev 15324) @@ -118,6 +118,7 @@ <filtering>true</filtering> </resource> </webResources> + <attachClasses>true</attachClasses> </configuration> </plugin> </plugins> @@ -148,6 +149,7 @@ <filtering>true</filtering> </resource> </webResources> + <attachClasses>true</attachClasses> </configuration> </plugin> </plugins> Modified: branches/enterprise/WFK-2_1/examples/jee6/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jee6/pom.xml 2012-10-30 13:06:23 UTC (rev 15323) +++ branches/enterprise/WFK-2_1/examples/jee6/pom.xml 2012-10-30 14:44:11 UTC (rev 15324) @@ -20,5 +20,15 @@ <module>jee6-web</module> <module>jee6-tests</module> </modules> - + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>jee6-web</artifactId> + <version>${project.version}</version> + <classifier>classes</classifier> + </dependency> + </dependencies> + </dependencyManagement> </project> Modified: branches/enterprise/WFK-2_1/examples/jpa/jpa-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-tests/pom.xml 2012-10-30 13:06:23 UTC (rev 15323) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-tests/pom.xml 2012-10-30 14:44:11 UTC (rev 15324) @@ -15,6 +15,11 @@ <dependencies> <dependency> + <groupId>org.jboss.seam.examples.jee6</groupId> + <artifactId>jpa-web</artifactId> + <classifier>classes</classifier> + </dependency> + <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> @@ -107,24 +112,6 @@ <skip>true</skip> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - <phase>generate-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${basedir}/../jpa-web/src/main/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> Modified: branches/enterprise/WFK-2_1/examples/jpa/jpa-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/pom.xml 2012-10-30 13:06:23 UTC (rev 15323) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/pom.xml 2012-10-30 14:44:11 UTC (rev 15324) @@ -99,6 +99,7 @@ <filtering>true</filtering> </resource> </webResources> + <attachClasses>true</attachClasses> </configuration> </plugin> <plugin> Modified: branches/enterprise/WFK-2_1/examples/jpa/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/pom.xml 2012-10-30 13:06:23 UTC (rev 15323) +++ branches/enterprise/WFK-2_1/examples/jpa/pom.xml 2012-10-30 14:44:11 UTC (rev 15324) @@ -28,6 +28,12 @@ <version>${project.version}</version> <type>war</type> </dependency> + <dependency> + <groupId>org.jboss.seam.examples.jee6</groupId> + <artifactId>jpa-web</artifactId> + <version>${project.version}</version> + <classifier>classes</classifier> + </dependency> </dependencies> </dependencyManagement> </project>