[weld-commits] Weld SVN: r6020 - in extensions/trunk: core and 11 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Tue Mar 9 13:46:45 EST 2010
Author: pete.muir at jboss.org
Date: 2010-03-09 13:46:45 -0500 (Tue, 09 Mar 2010)
New Revision: 6020
Added:
extensions/trunk/core/src/main/java/org/jboss/weld/extensions/genericbeans/
extensions/trunk/core/src/main/resources/META-INF/services/
extensions/trunk/core/src/test/java/org/jboss/weld/extensions/
extensions/trunk/core/src/test/java/org/jboss/weld/extensions/genericbeans/
extensions/trunk/core/src/test/java/org/jboss/weld/extensions/genericbeans/test/
extensions/trunk/core/src/test/resources/META-INF/beans.xml
Removed:
extensions/trunk/genericbeans/src/main/java/org/jboss/weld/extensions/genericbeans/
extensions/trunk/genericbeans/src/main/resources/META-INF/services/
extensions/trunk/genericbeans/src/test/java/org/jboss/weld/extensions/genericbeans/test/
extensions/trunk/genericbeans/src/test/resources/META-INF/beans.xml
Modified:
extensions/trunk/bom/pom.xml
extensions/trunk/core/pom.xml
extensions/trunk/parent/pom.xml
Log:
start to merge down the projects to flat
Modified: extensions/trunk/bom/pom.xml
===================================================================
--- extensions/trunk/bom/pom.xml 2010-03-09 17:19:49 UTC (rev 6019)
+++ extensions/trunk/bom/pom.xml 2010-03-09 18:46:45 UTC (rev 6020)
@@ -1,10 +1,11 @@
-<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>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-extensions-bom</artifactId>
<packaging>pom</packaging>
<version>1.0.1-SNAPSHOT</version>
-
+
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
@@ -14,9 +15,13 @@
<name>Weld Extensions BOM</name>
<url>http://www.seamframework.org/Weld</url>
- <!-- Minimal project metadata, for more see parent/pom.xml -->
- <description>Weld Extensions "bill of materials" which can be imported by any project using the Weld Extensions. It provides dependency management for the extensions.</description>
+ <description>Portable extensions for CDI</description>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://jira.jboss.org/jira/browse/WELDX/component/12312756</url>
+ </issueManagement>
+
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -25,58 +30,58 @@
</license>
</licenses>
+
<developers>
+
<developer>
- <name>Weld committers</name>
+ <name>Pete Muir</name>
+ <email>pete.muir at jboss.org</email>
+ <organization>Red Hat Inc.</organization>
+ <url>http://in.relation.to/Bloggers/Pete</url>
</developer>
+
+ <developer>
+ <name>Stuart Douglas</name>
+ </developer>
+
</developers>
- <properties>
- <weld.api.version>1.0</weld.api.version>
+ <inceptionYear>2008</inceptionYear>
+
+ <organization>
+ <name>Seam Framework</name>
+ <url>http://seamframework.org</url>
+ </organization>
+
+ <ciManagement>
+ <system>Hudson</system>
+ <url />
+ </ciManagement>
+
+ <properties>
+ <weld.api.version>1.0-SP1</weld.api.version>
<weld.core.version>1.0.1-Final</weld.core.version>
<slf4j.version>1.5.10</slf4j.version>
- <jta.version>1.1</jta.version>
+ <testng.version>5.10</testng.version>
+ <jboss.test.harness.version>1.1.0-CR3</jboss.test.harness.version>
</properties>
-
+
<!-- Dependency management, including extra repositories if needed -->
<repositories>
<repository>
- <id>repository.jboss.org</id>
- <name>JBoss Release Repository</name>
- <url>http://repository.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</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</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
</repositories>
-
+
<!-- Import the BOMs -->
<dependencyManagement>
<dependencies>
@@ -105,16 +110,92 @@
<artifactId>weld-extensions</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- Override bad dep in api -->
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>${jta.version}</version>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <version>${jboss.test.harness.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-jboss-as-50</artifactId>
+ <version>${jboss.test.harness.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-jboss-as-52</artifactId>
+ <version>${jboss.test.harness.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-jboss-embedded</artifactId>
+ <version>${jboss.test.harness.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-tomcat</artifactId>
+ <version>${jboss.test.harness.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ <exclusions>
+ <exclusion>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-se</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions/trunk/bom</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions/trunk/bom</developerConnection>
Modified: extensions/trunk/core/pom.xml
===================================================================
--- extensions/trunk/core/pom.xml 2010-03-09 17:19:49 UTC (rev 6019)
+++ extensions/trunk/core/pom.xml 2010-03-09 18:46:45 UTC (rev 6020)
@@ -20,61 +20,12 @@
</contributor>
</contributors>
- <issueManagement>
- <system>JIRA</system>
- <url>https://jira.jboss.org/jira/browse/WELDX/component/12312756</url>
- </issueManagement>
+
<dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- <classifier>jdk15</classifier>
- <exclusions>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<scm>
Copied: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/genericbeans (from rev 6019, extensions/trunk/genericbeans/src/main/java/org/jboss/weld/extensions/genericbeans)
Copied: extensions/trunk/core/src/main/resources/META-INF/services (from rev 6019, extensions/trunk/genericbeans/src/main/resources/META-INF/services)
Copied: extensions/trunk/core/src/test/java/org/jboss/weld/extensions/genericbeans/test (from rev 6019, extensions/trunk/genericbeans/src/test/java/org/jboss/weld/extensions/genericbeans/test)
Copied: extensions/trunk/core/src/test/resources/META-INF/beans.xml (from rev 6019, extensions/trunk/genericbeans/src/test/resources/META-INF/beans.xml)
===================================================================
--- extensions/trunk/core/src/test/resources/META-INF/beans.xml (rev 0)
+++ extensions/trunk/core/src/test/resources/META-INF/beans.xml 2010-03-09 18:46:45 UTC (rev 6020)
@@ -0,0 +1,5 @@
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+</beans>
Deleted: extensions/trunk/genericbeans/src/test/resources/META-INF/beans.xml
===================================================================
--- extensions/trunk/genericbeans/src/test/resources/META-INF/beans.xml 2010-03-09 17:19:49 UTC (rev 6019)
+++ extensions/trunk/genericbeans/src/test/resources/META-INF/beans.xml 2010-03-09 18:46:45 UTC (rev 6020)
@@ -1,5 +0,0 @@
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-
-</beans>
Modified: extensions/trunk/parent/pom.xml
===================================================================
--- extensions/trunk/parent/pom.xml 2010-03-09 17:19:49 UTC (rev 6019)
+++ extensions/trunk/parent/pom.xml 2010-03-09 18:46:45 UTC (rev 6020)
@@ -55,46 +55,14 @@
<properties>
<!-- Testing deps -->
- <testng.version>5.10</testng.version>
- <jboss.test.harness.version>1.1.0-CR3</jboss.test.harness.version>
- <apache.httpclient.version>3.1</apache.httpclient.version>
- <junit.version>4.7</junit.version>
- <htmlunit.version>2.4</htmlunit.version>
+
</properties>
<!-- Set up local dependecies -->
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-as-50</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-as-52</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-embedded</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-tomcat</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
More information about the weld-commits
mailing list