Author: pete.muir(a)jboss.org Date: 2009-10-12 08:57:35 -0400 (Mon, 12 Oct 2009) New Revision: 3947 Modified: api/trunk/bom/pom.xml api/trunk/parent/pom.xml Log: use parent pom Modified: api/trunk/bom/pom.xml =================================================================== --- api/trunk/bom/pom.xml 2009-10-12 12:57:12 UTC (rev 3946) +++ api/trunk/bom/pom.xml 2009-10-12 12:57:35 UTC (rev 3947) @@ -6,13 +6,19 @@ <packaging>pom</packaging> <version>1.0-SNAPSHOT</version> + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> + <name>Weld and CDI APIs BOM</name> - + <!-- Minimal project metadata, for more see parent/pom.xml --> <url>http://www.seamframework.org/Weld</url> <description>Weld and CDI APIs "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the developer APIs and SPIs, as well as container integrator SPIs</description> - + <licenses> <license> <name>Apache License, Version 2.0</name> @@ -26,7 +32,7 @@ <name>Weld committers</name> </developer> </developers> - + <!-- Dependency management, including extra repositories if needed --> <repositories> <repository> @@ -53,25 +59,23 @@ </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> + <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> - + <properties> <cdi.api.version>${project.version}</cdi.api.version> <weld.api.version>${project.version}</weld.api.version> - <weld.wicket.version>1.0.0-SNAPSHOT</weld.wicket.version> <atinject.api.version>1.0-PFD-1</atinject.api.version> - <wicket.version>[1.4.1, 1.5)</wicket.version> <ejb.api.version>3.1.0-Alpha1</ejb.api.version> <jsr250.api.version>1.0</jsr250.api.version> <jpa.api.version>1.0</jpa.api.version> @@ -86,10 +90,10 @@ <jaxws.api.version>2.1</jaxws.api.version> <interceptor.api.version>3.1.0-SNAPSHOT</interceptor.api.version> </properties> - + <dependencyManagement> <dependencies> - + <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket</artifactId> @@ -101,19 +105,19 @@ <artifactId>jsr250-api</artifactId> <version>${jsr250.api.version}</version> </dependency> - + <dependency> <groupId>javax.persistence</groupId> <artifactId>persistence-api</artifactId> <version>${jpa.api.version}</version> </dependency> - + <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> <version>${validation.api.version}</version> </dependency> - + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> @@ -131,7 +135,7 @@ <artifactId>jsp-api</artifactId> <version>${jsp.api.version}</version> </dependency> - + <dependency> <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> @@ -155,14 +159,17 @@ <artifactId>el-api</artifactId> <version>${uel.api.version}</version> </dependency> - + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <version>${jsf.api.version}</version> </dependency> - - <!-- TODO replace with javax.ejb:ejb-api:3.1 once the JCP/Sun publish this --> + + <!-- + TODO replace with javax.ejb:ejb-api:3.1 once the JCP/Sun + publish this + --> <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-api</artifactId> @@ -182,20 +189,23 @@ </exclusion> </exclusions> </dependency> - - <!-- TODO replace with javax.interceptor:interceptor-api:3.1 once the JCP/Sun publish this --> + + <!-- + TODO replace with javax.interceptor:interceptor-api:3.1 once + the JCP/Sun publish this + --> <dependency> <groupId>org.jboss.interceptor</groupId> <artifactId>jboss-interceptor-api</artifactId> <version>${interceptor.api.version}</version> </dependency> - + <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> <version>${cdi.api.version}</version> </dependency> - + <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-api</artifactId> @@ -207,28 +217,22 @@ <artifactId>weld-spi</artifactId> <version>${weld.api.version}</version> </dependency> - + <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-wicket</artifactId> - <version>${weld.wicket.version}</version> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>${jaxws.api.version}</version> </dependency> - + <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>${jaxws.api.version}</version> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> </dependency> - + </dependencies> </dependencyManagement> - + <!-- The release profile --> <profiles> <profile> @@ -236,18 +240,18 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>1.0.0-alpha-4</version> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.0.0-alpha-4</version> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> </plugin> </plugins> </build> @@ -259,7 +263,7 @@ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk/bom&l... <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk... </scm> - + <distributionManagement> <repository> <id>oss.sonatype.org/jboss-staging</id> Modified: api/trunk/parent/pom.xml =================================================================== --- api/trunk/parent/pom.xml 2009-10-12 12:57:12 UTC (rev 3946) +++ api/trunk/parent/pom.xml 2009-10-12 12:57:35 UTC (rev 3947) @@ -89,211 +89,17 @@ </dependencies> </dependencyManagement> - - <!-- Configure the build --> <build> - <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> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - </plugins> - <defaultGoal>package</defaultGoal> - - <!-- Configure all plugins, including versions to use in the build --> <pluginManagement> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-9</version> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.4.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>2.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <!-- Stick with 2.0.4, 2.1 has a bug with handling projects with no src/main/resources --> - <version>2.0.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.4.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>1.0-alpha-4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <executions> - <execution> - <id>enforce</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireMavenVersion> - <version>2.0.9</version> - </requireMavenVersion> - <requirePluginVersions> - <unCheckedPlugins> - <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin> - </unCheckedPlugins> - </requirePluginVersions> - </rules> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>1.2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <artifactId>maven-release-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <tagBase>https://svn.jboss.org/repos/weld/api/tags</tagBase> + <autoVersionSubmodules>true</autoVersionSubmodules> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> - </manifest> - <manifestEntries> - <Implementation-URL>${pom.url}</Implementation-URL> - </manifestEntries> - <manifestSections> - <manifestSection> - <name>Build-Information</name> - <manifestEntries> - <Maven-Version>${maven.version}</Maven-Version> - <Java-Version>${java.version}</Java-Version> - <Java-Vendor>${java.vendor}</Java-Vendor> - <Os-Name>${os.name}</Os-Name> - <Os-Arch>${os.arch}</Os-Arch> - <Os-Version>${os.version}</Os-Version> - <Scm-Revision>${buildNumber}</Scm-Revision> - <Build-Time>${timestamp}</Build-Time> - </manifestEntries> - </manifestSection> - </manifestSections> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.4</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>maven-version</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <configuration> - <classpathContainers> - <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer> - </classpathContainers> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.0-beta-3</version> - <executions> - <execution> - <id>set-build-properties</id> - <goals> - <goal>create</goal> - </goals> - <phase>validate</phase> - </execution> - </executions> - <inherited>true</inherited> - <configuration> - <!-- If the plugin fails to get the scm revision, set it to "unavailable" --> - <getRevisionOnlyOnce>true</getRevisionOnlyOnce> - <revisionOnScmFailure>unavailable</revisionOnScmFailure> - <timestampFormat>{0, date, long} {0, time, long}</timestampFormat> - </configuration> - </plugin> </plugins> </pluginManagement> </build>