Author: pete.muir(a)jboss.org Date: 2009-10-12 10:41:53 -0400 (Mon, 12 Oct 2009) New Revision: 3956 Modified: examples/trunk/jsf/numberguess/pom.xml examples/trunk/jsf/translator/ejb/pom.xml examples/trunk/pom.xml Log: switch to new structure build Modified: examples/trunk/jsf/numberguess/pom.xml =================================================================== --- examples/trunk/jsf/numberguess/pom.xml 2009-10-12 14:41:46 UTC (rev 3955) +++ examples/trunk/jsf/numberguess/pom.xml 2009-10-12 14:41:53 UTC (rev 3956) @@ -54,6 +54,9 @@ <profiles> <profile> <id>jboss5</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> <dependencies> <dependency> Modified: examples/trunk/jsf/translator/ejb/pom.xml =================================================================== --- examples/trunk/jsf/translator/ejb/pom.xml 2009-10-12 14:41:46 UTC (rev 3955) +++ examples/trunk/jsf/translator/ejb/pom.xml 2009-10-12 14:41:53 UTC (rev 3956) @@ -38,8 +38,8 @@ </dependency> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> <scope>provided</scope> </dependency> Modified: examples/trunk/pom.xml =================================================================== --- examples/trunk/pom.xml 2009-10-12 14:41:46 UTC (rev 3955) +++ examples/trunk/pom.xml 2009-10-12 14:41:53 UTC (rev 3956) @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.weld</groupId> - <artifactId>weld-version-matrix</artifactId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>weld-parent</artifactId> + <version>1-SNAPSHOT</version> </parent> <groupId>org.jboss.weld.examples</groupId> <artifactId>weld-examples-parent</artifactId> @@ -13,36 +14,10 @@ <name>Weld Examples</name> <description> - Examples for the reference implementation of JSR 299: Weld + Examples for Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE </description> - + <url>http://www.seamframework.org/Weld</url> - - <repositories> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Repository</name> - <url>http://repository.jboss.org/maven2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshots Repository</name> - <url>http://snapshots.jboss.org/maven2</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> <developers> <developer> @@ -63,13 +38,44 @@ <developer> <name>David Allen</name> </developer> - + <developer> <name>Nicklas Karlsson</name> </developer> + + <developer> + <name>Clint Popetz</name> + </developer> + + <developer> + <name>Pete Royle</name> + </developer> + </developers> - - + <ciManagement> + <system>Hudson</system> + <url>http://hudson.jboss.org</url> + </ciManagement> + + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/browse/WELD</url> + </issueManagement> + + <organization> + <name>Seam Framework</name> + <url>http://seamframework.org</url> + </organization> + + <inceptionYear>2008</inceptionYear> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> + </licenses> + <modules> <module>jsf/numberguess</module> <module>jsf/translator</module> @@ -78,21 +84,101 @@ <module>se/hello-world</module> <module>wicket/numberguess</module> </modules> - + + <properties> + <jsf.version>2.0.0-RC</jsf.version> + <weld.api.version>1.0-SNAPSHOT</weld.api.version> + <weld.core.version>1.0.0-SNAPSHOT</weld.core.version> + <weld.extensions.version>1.0.0-SNAPSHOT</weld.extensions.version> + <!-- Testing deps --> + <testng.version>5.9</testng.version> + </properties> + + <!-- Dependency management, including any extra repositories needed --> + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Release Repository</name> + <url>http://repository.jboss.org/maven2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + <repository> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</u... + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> + <dependencyManagement> <dependencies> - + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.0-RC</version> + <version>${jsf.version}</version> </dependency> - + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.0-RC</version> + <version>${jsf.version}</version> </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>${weld.api.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-bom</artifactId> + <version>${weld.core.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions-bom</artifactId> + <version>${weld.extensions.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>${testng.version}</version> + <classifier>jdk15</classifier> + </dependency> + </dependencies> </dependencyManagement> @@ -100,70 +186,19 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <tagBase>https://svn.jboss.org/repos/weld/examples/tags</tagBase> + <autoVersionSubmodules>true</autoVersionSubmodules> + </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-8</version> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/examples/tags</tagBase> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> + </plugins> - <defaultGoal>package</defaultGoal> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <metadataFile>../target/coverage.em</metadataFile> - <outputDirectory>${project.build.directory}/generated-classes</outputDirectory> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> </plugin> <plugin> @@ -176,30 +211,7 @@ </plugins> </pluginManagement> </build> - - <ciManagement> - <system>Hudson</system> - <url /> - </ciManagement> - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/browse/WELD</url> - </issueManagement> - - <inceptionYear>2008</inceptionYear> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - </license> - <license> - <name>Lesser Gnu Public License, Version 2.1</name> - <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> - </license> - </licenses> - <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/examples</co... <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/examples&... @@ -207,37 +219,17 @@ </scm> <distributionManagement> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Releases Repository</name> - <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</ur... + <repository> + <id>oss.sonatype.org/jboss-staging</id> + <name>JBoss (Nexus) Release Staging Repository</name> + <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</ur... </repository> <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</u... </snapshotRepository> </distributionManagement> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <configuration> - <formats> - <format>html</format> - <format>xml</format> - </formats> - <instrumentation> - <ignores> - <ignore>javax.weld.*</ignore> - </ignores> - </instrumentation> - </configuration> - </plugin> - </plugins> - </reporting> - </project>