Author: pete.muir(a)jboss.org Date: 2009-10-12 09:24:04 -0400 (Mon, 12 Oct 2009) New Revision: 3950 Modified: core/trunk/bom/pom.xml core/trunk/impl/pom.xml core/trunk/parent/pom.xml Log: use parent pom and workaround WELD-198 Modified: core/trunk/bom/pom.xml =================================================================== --- core/trunk/bom/pom.xml 2009-10-12 13:06:22 UTC (rev 3949) +++ core/trunk/bom/pom.xml 2009-10-12 13:24:04 UTC (rev 3950) @@ -5,6 +5,12 @@ <artifactId>weld-core-bom</artifactId> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> <name>Weld Core BOM</name> <url>http://www.seamframework.org/Weld</url> Modified: core/trunk/impl/pom.xml =================================================================== --- core/trunk/impl/pom.xml 2009-10-12 13:06:22 UTC (rev 3949) +++ core/trunk/impl/pom.xml 2009-10-12 13:24:04 UTC (rev 3950) @@ -99,14 +99,16 @@ <dependency> <groupId>org.jboss.interceptor</groupId> <artifactId>jboss-interceptor-api</artifactId> - <optional>true</optional> + <!-- WELD-198 --> +<!-- <optional>true</optional>--> </dependency> <dependency> <groupId>org.jboss.interceptor</groupId> <artifactId>jboss-interceptor</artifactId> - <optional>true</optional> + <!-- WELD-198 --> +<!-- <optional>true</optional>--> </dependency> </dependencies> Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2009-10-12 13:06:22 UTC (rev 3949) +++ core/trunk/parent/pom.xml 2009-10-12 13:24:04 UTC (rev 3950) @@ -163,243 +163,4 @@ </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> - <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> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/extensions/tags</tagBase> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </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> - <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.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.0.0</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> - <configuration> - <source>1.5</source> - <target>1.5</target> - </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> - - <!-- SCM and Distribution Management --> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions</... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extension... - <url>http://fisheye.jboss.org/browse/Weld/extensions</url> - </scm> - - <distributionManagement> - <repository> - <id>oss.sonatype.org/jboss-staging</id> - <name>Sonatype Nexus Maven Repository</name> - <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</ur... - </repository> - <snapshotRepository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>Sonatype Nexus Snapshot Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</u... - </snapshotRepository> - </distributionManagement> - </project>