Weld SVN: r6656 - in core/trunk: bom and 9 other directories.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-14 19:47:49 -0400 (Wed, 14 Jul 2010)
New Revision: 6656
Modified:
core/trunk/bom/pom.xml
core/trunk/impl/pom.xml
core/trunk/inject-tck-runner/pom.xml
core/trunk/jboss-as/pom.xml
core/trunk/jboss-tck-runner/pom.xml
core/trunk/osgi-bundle/pom.xml
core/trunk/parent/pom.xml
core/trunk/pom.xml
core/trunk/porting-package/pom.xml
core/trunk/tests-arquillian/pom.xml
core/trunk/tests/pom.xml
Log:
update version number to 1.1
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2010-07-14 23:40:08 UTC (rev 6655)
+++ core/trunk/bom/pom.xml 2010-07-14 23:47:49 UTC (rev 6656)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
<packaging>pom</packaging>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -33,7 +33,7 @@
</developers>
<properties>
- <weld.api.version>1.0-SNAPSHOT</weld.api.version>
+ <weld.api.version>1.1-SNAPSHOT</weld.api.version>
<!-- Override the API and compile with more recent EL API -->
<google.collections.version>1.0</google.collections.version>
<javassist.version>3.11.0.GA</javassist.version>
Modified: core/trunk/impl/pom.xml
===================================================================
--- core/trunk/impl/pom.xml 2010-07-14 23:40:08 UTC (rev 6655)
+++ core/trunk/impl/pom.xml 2010-07-14 23:47:49 UTC (rev 6656)
@@ -3,7 +3,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/inject-tck-runner/pom.xml
===================================================================
--- core/trunk/inject-tck-runner/pom.xml 2010-07-14 23:40:08 UTC (rev 6655)
+++ core/trunk/inject-tck-runner/pom.xml 2010-07-14 23:47:49 UTC (rev 6656)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/jboss-as/pom.xml
===================================================================
--- core/trunk/jboss-as/pom.xml 2010-07-14 23:40:08 UTC (rev 6655)
+++ core/trunk/jboss-as/pom.xml 2010-07-14 23:47:49 UTC (rev 6656)
@@ -4,12 +4,12 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-jboss-as-updater</artifactId>
<packaging>pom</packaging>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jboss-tck-runner/pom.xml
===================================================================
--- core/trunk/jboss-tck-runner/pom.xml 2010-07-14 23:40:08 UTC (rev 6655)
+++ core/trunk/jboss-tck-runner/pom.xml 2010-07-14 23:47:49 UTC (rev 6656)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/osgi-bundle/pom.xml
===================================================================
--- core/trunk/osgi-bundle/pom.xml 2010-07-14 23:40:08 UTC (rev 6655)
+++ core/trunk/osgi-bundle/pom.xml 2010-07-14 23:47:49 UTC (rev 6656)
@@ -16,7 +16,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-07-14 23:40:08 UTC (rev 6655)
+++ core/trunk/parent/pom.xml 2010-07-14 23:47:49 UTC (rev 6656)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../bom/pom.xml</relativePath>
</parent>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-07-14 23:40:08 UTC (rev 6655)
+++ core/trunk/pom.xml 2010-07-14 23:47:49 UTC (rev 6656)
@@ -4,7 +4,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-bom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<type>pom</type>
</dependency>
</dependencies>
Modified: core/trunk/porting-package/pom.xml
===================================================================
--- core/trunk/porting-package/pom.xml 2010-07-14 23:40:08 UTC (rev 6655)
+++ core/trunk/porting-package/pom.xml 2010-07-14 23:47:49 UTC (rev 6656)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/tests/pom.xml
===================================================================
--- core/trunk/tests/pom.xml 2010-07-14 23:40:08 UTC (rev 6655)
+++ core/trunk/tests/pom.xml 2010-07-14 23:47:49 UTC (rev 6656)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/trunk/tests-arquillian/pom.xml
===================================================================
--- core/trunk/tests-arquillian/pom.xml 2010-07-14 23:40:08 UTC (rev 6655)
+++ core/trunk/tests-arquillian/pom.xml 2010-07-14 23:47:49 UTC (rev 6656)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
15 years, 9 months
Weld SVN: r6655 - core/trunk.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-14 19:40:08 -0400 (Wed, 14 Jul 2010)
New Revision: 6655
Removed:
core/trunk/embedded-tck-runner/
Log:
cleanup
15 years, 9 months
Weld SVN: r6654 - cdi-api/trunk/trunk.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-14 19:08:04 -0400 (Wed, 14 Jul 2010)
New Revision: 6654
Modified:
cdi-api/trunk/trunk/
Log:
ignores
Property changes on: cdi-api/trunk/trunk
___________________________________________________________________
Name: svn:ignore
+ .settings
.classpath
target
.project
15 years, 9 months
Weld SVN: r6653 - cdi-api/trunk/trunk.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-14 19:06:22 -0400 (Wed, 14 Jul 2010)
New Revision: 6653
Modified:
cdi-api/trunk/trunk/pom.xml
Log:
fix pom
Modified: cdi-api/trunk/trunk/pom.xml
===================================================================
--- cdi-api/trunk/trunk/pom.xml 2010-07-14 22:54:19 UTC (rev 6652)
+++ cdi-api/trunk/trunk/pom.xml 2010-07-14 23:06:22 UTC (rev 6653)
@@ -4,14 +4,14 @@
<parent>
<groupId>org.jboss.weld</groupId>
- <artifactId>weld-api-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>weld-parent</artifactId>
+ <version>12</version>
</parent>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
<name>CDI APIs</name>
<description>APIs for JSR-299: Contexts and Dependency Injection for Java EE</description>
@@ -25,74 +25,6 @@
</license>
</licenses>
-
- <dependencies>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.interceptor</groupId>
- <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk/cdi</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk/cdi</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/api/trunk/cdi</url>
- </scm>
-
-
-</project>
-<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-api-bom</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../bom/pom.xml</relativePath>
- </parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api-parent</artifactId>
- <packaging>pom</packaging>
-
- <name>Weld and CDI APIs Parent</name>
-
-
- <!-- Full project metadata -->
- <url>http://www.seamframework.org/Weld</url>
-
- <description>
- APIs for CDI and Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE
- </description>
-
<ciManagement>
<system>Hudson</system>
<url>http://hudson.jboss.org</url>
@@ -102,21 +34,14 @@
<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>
-
<developers>
<developer>
<name>Pete Muir</name>
@@ -136,194 +61,50 @@
<developer>
<name>David Allen</name>
</developer>
-
+
<developer>
<name>Nicklas Karlsson</name>
</developer>
</developers>
-
- <!-- Configure non-API dependencies (e.g. testing)-->
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.10</version>
- <classifier>jdk15</classifier>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk/parent</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk/parent</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/api/trunk/parent</url>
- </scm>
-
-</project>
-<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-api-bom</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>12</version>
- </parent>
-
- <name>Weld and CDI APIs BOM</name>
-
- <!-- Minimal project metadata, for more see parent/pom.xml -->
-
- <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>
-
- <url>http://www.seamframework.org/Weld</url>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <distribution>repo</distribution>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- </license>
- </licenses>
-
- <developers>
- <developer>
- <name>Weld committers</name>
- </developer>
- </developers>
-
- <!-- 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>
- <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>
-
+
<properties>
<atinject.api.version>1</atinject.api.version>
<ejb.api.version>3.1.0</ejb.api.version>
<jsr250.api.version>1.0</jsr250.api.version>
- <jpa.api.version>1.0</jpa.api.version>
- <validation.api.version>1.0.0.GA</validation.api.version>
- <servlet.api.version>2.5</servlet.api.version>
- <jsp.api.version>2.1</jsp.api.version>
- <jstl.api.version>1.2</jstl.api.version>
- <jta.api.version>1.1</jta.api.version>
- <jms.api.version>1.1</jms.api.version>
<uel.api.version>2.2</uel.api.version>
- <!-- Stick with JSF API 1.2 to preserve backwards compatibility with JSF 1.2 - we don't need any JSF 2 features -->
- <jsf.api.version>1.2_13</jsf.api.version>
- <jaxws.api.version>2.1</jaxws.api.version>
<interceptor.api.version>1.0.0.Beta1</interceptor.api.version>
</properties>
+ <!-- Configure all dependencies (e.g. testing)-->
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.10</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
<groupId>javax.annotation</groupId>
<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>
<version>${atinject.api.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${jsp.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>${jstl.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>${jta.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- <version>${jms.api.version}</version>
- </dependency>
-
- <dependency>
<groupId>javax.el</groupId>
<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
@@ -358,43 +139,80 @@
<version>${interceptor.api.version}</version>
</dependency>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${project.version}</version>
- </dependency>
+ </dependencies>
+ </dependencyManagement>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <optional>true</optional>
+ </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-spi</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <optional>true</optional>
+ </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${jaxws.api.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk/bom</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk/bom</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/api/trunk/bom</url>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-api/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/cdi-api/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/cdi-api/trunk</url>
</scm>
+
+
+ <!-- Dependency management, including extra repositories if needed -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Release Repository</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>oss.sonatype.org/snapshots</id>
+ <name>OSS Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
</project>
15 years, 9 months
Weld SVN: r6652 - in api/trunk: bom and 3 other directories.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-14 18:54:19 -0400 (Wed, 14 Jul 2010)
New Revision: 6652
Removed:
api/trunk/cdi/
Modified:
api/trunk/bom/pom.xml
api/trunk/parent/pom.xml
api/trunk/pom.xml
api/trunk/weld-spi/pom.xml
api/trunk/weld/pom.xml
Log:
remove CDI API from Weld APIs, and bump version to 1.1
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2010-07-14 22:44:37 UTC (rev 6651)
+++ api/trunk/bom/pom.xml 2010-07-14 22:54:19 UTC (rev 6652)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-bom</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -11,11 +11,11 @@
<version>12</version>
</parent>
- <name>Weld and CDI APIs BOM</name>
+ <name>Weld APIs BOM</name>
<!-- Minimal project metadata, for more see parent/pom.xml -->
- <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>
+ <description>Weld 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>
<url>http://www.seamframework.org/Weld</url>
<licenses>
@@ -73,6 +73,7 @@
<properties>
<atinject.api.version>1</atinject.api.version>
+ <cdi.api.version>1.0-SP1</cdi.api.version>
<ejb.api.version>3.1.0</ejb.api.version>
<jsr250.api.version>1.0</jsr250.api.version>
<jpa.api.version>1.0</jpa.api.version>
@@ -195,7 +196,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${project.version}</version>
+ <version>${cdi.api.version}</version>
</dependency>
<dependency>
Modified: api/trunk/parent/pom.xml
===================================================================
--- api/trunk/parent/pom.xml 2010-07-14 22:44:37 UTC (rev 6651)
+++ api/trunk/parent/pom.xml 2010-07-14 22:54:19 UTC (rev 6652)
@@ -3,21 +3,21 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-bom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../bom/pom.xml</relativePath>
</parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-parent</artifactId>
<packaging>pom</packaging>
- <name>Weld and CDI APIs Parent</name>
+ <name>Weld APIs Parent</name>
<!-- Full project metadata -->
<url>http://www.seamframework.org/Weld</url>
<description>
- APIs for CDI and Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE
+ APIs for Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE
</description>
<ciManagement>
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2010-07-14 22:44:37 UTC (rev 6651)
+++ api/trunk/pom.xml 2010-07-14 22:54:19 UTC (rev 6652)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -11,10 +11,10 @@
<version>12</version>
</parent>
- <name>Weld and CDI APIs Build Aggregator</name>
+ <name>Weld APIs Build Aggregator</name>
<!-- Minimal project metadata, for more see parent/pom.xml -->
- <description>The build aggregator for Weld and the CDI APIs, which takes care of calling the modules which make up Weld and CDI APIs</description>
+ <description>The build aggregator for Weld APIs, which takes care of calling the modules which make up Weld APIs</description>
<!-- SCM and Distribution management -->
<scm>
@@ -26,7 +26,6 @@
<modules>
<module>bom</module>
<module>parent</module>
- <module>cdi</module>
<module>weld</module>
<module>weld-spi</module>
</modules>
Modified: api/trunk/weld/pom.xml
===================================================================
--- api/trunk/weld/pom.xml 2010-07-14 22:44:37 UTC (rev 6651)
+++ api/trunk/weld/pom.xml 2010-07-14 22:54:19 UTC (rev 6652)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: api/trunk/weld-spi/pom.xml
===================================================================
--- api/trunk/weld-spi/pom.xml 2010-07-14 22:44:37 UTC (rev 6651)
+++ api/trunk/weld-spi/pom.xml 2010-07-14 22:54:19 UTC (rev 6652)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
15 years, 9 months
Weld SVN: r6651 - cdi-api/trunk/trunk.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-14 18:44:37 -0400 (Wed, 14 Jul 2010)
New Revision: 6651
Added:
cdi-api/trunk/trunk/src/
Removed:
cdi-api/trunk/trunk/bom/
cdi-api/trunk/trunk/cdi/
cdi-api/trunk/trunk/parent/
Modified:
cdi-api/trunk/trunk/pom.xml
Log:
flatten out structure
Modified: cdi-api/trunk/trunk/pom.xml
===================================================================
--- cdi-api/trunk/trunk/pom.xml 2010-07-14 22:42:31 UTC (rev 6650)
+++ cdi-api/trunk/trunk/pom.xml 2010-07-14 22:44:37 UTC (rev 6651)
@@ -1,8 +1,174 @@
+<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-api-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <packaging>jar</packaging>
+
+ <name>CDI APIs</name>
+ <description>APIs for JSR-299: Contexts and Dependency Injection for Java EE</description>
+
+ <url>http://www.seamframework.org/Weld</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk/cdi</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk/cdi</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/api/trunk/cdi</url>
+ </scm>
+
+
+</project>
<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-api-bom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../bom/pom.xml</relativePath>
+ </parent>
<groupId>org.jboss.weld</groupId>
- <artifactId>weld-api-build-aggregator</artifactId>
+ <artifactId>weld-api-parent</artifactId>
<packaging>pom</packaging>
+
+ <name>Weld and CDI APIs Parent</name>
+
+
+ <!-- Full project metadata -->
+ <url>http://www.seamframework.org/Weld</url>
+
+ <description>
+ APIs for CDI and Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE
+ </description>
+
+ <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>
+
+ <developers>
+ <developer>
+ <name>Pete Muir</name>
+ <id>pmuir</id>
+ <organization>Red Hat Inc.</organization>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
+ <email>pmuir(a)redhat.com</email>
+ </developer>
+
+ <developer>
+ <name>Shane Bryzak</name>
+ <organization>Red Hat Inc.</organization>
+ </developer>
+
+ <developer>
+ <name>David Allen</name>
+ </developer>
+
+ <developer>
+ <name>Nicklas Karlsson</name>
+ </developer>
+ </developers>
+
+ <!-- Configure non-API dependencies (e.g. testing)-->
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.10</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk/parent</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk/parent</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/api/trunk/parent</url>
+ </scm>
+
+
+</project>
+<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-api-bom</artifactId>
+ <packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<parent>
@@ -11,44 +177,224 @@
<version>12</version>
</parent>
- <name>Weld and CDI APIs Build Aggregator</name>
+ <name>Weld and CDI APIs BOM</name>
<!-- Minimal project metadata, for more see parent/pom.xml -->
- <description>The build aggregator for Weld and the CDI APIs, which takes care of calling the modules which make up Weld and CDI APIs</description>
- <!-- SCM and Distribution management -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/Weld</url>
- </scm>
+ <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>
- <modules>
- <module>bom</module>
- <module>parent</module>
- <module>cdi</module>
- <module>weld</module>
- <module>weld-spi</module>
- </modules>
+ <url>http://www.seamframework.org/Weld</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
- <!-- Minimal build configuration -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/weld/api/tags</tagBase>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <developers>
+ <developer>
+ <name>Weld committers</name>
+ </developer>
+ </developers>
+ <!-- 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>
+ <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>
+
+ <properties>
+ <atinject.api.version>1</atinject.api.version>
+ <ejb.api.version>3.1.0</ejb.api.version>
+ <jsr250.api.version>1.0</jsr250.api.version>
+ <jpa.api.version>1.0</jpa.api.version>
+ <validation.api.version>1.0.0.GA</validation.api.version>
+ <servlet.api.version>2.5</servlet.api.version>
+ <jsp.api.version>2.1</jsp.api.version>
+ <jstl.api.version>1.2</jstl.api.version>
+ <jta.api.version>1.1</jta.api.version>
+ <jms.api.version>1.1</jms.api.version>
+ <uel.api.version>2.2</uel.api.version>
+ <!-- Stick with JSF API 1.2 to preserve backwards compatibility with JSF 1.2 - we don't need any JSF 2 features -->
+ <jsf.api.version>1.2_13</jsf.api.version>
+ <jaxws.api.version>2.1</jaxws.api.version>
+ <interceptor.api.version>1.0.0.Beta1</interceptor.api.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <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>
+ <version>${atinject.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>${jsp.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${jstl.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>${jta.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ <version>${jms.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <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
+ -->
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <version>${ejb.api.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-jaxrpc</artifactId>
+ <groupId>jbossws</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-transaction-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-jaxrpc</artifactId>
+ <groupId>jboss.jbossws</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!--
+ TODO replace with javax.interceptor:interceptor-api:3.1 once
+ the JCP/Sun publish this
+ -->
+ <dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ <version>${interceptor.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ <version>${project.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>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk/bom</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk/bom</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/api/trunk/bom</url>
+ </scm>
+
</project>
Copied: cdi-api/trunk/trunk/src (from rev 6649, cdi-api/trunk/trunk/cdi/src)
15 years, 9 months
Weld SVN: r6650 - cdi-api/trunk/trunk.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-14 18:42:31 -0400 (Wed, 14 Jul 2010)
New Revision: 6650
Removed:
cdi-api/trunk/trunk/weld-spi/
cdi-api/trunk/trunk/weld/
Log:
remove weld stuff
15 years, 9 months
Weld SVN: r6649 - cdi-api/trunk.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-14 18:23:40 -0400 (Wed, 14 Jul 2010)
New Revision: 6649
Added:
cdi-api/trunk/trunk/
Log:
copy api in prep for weld-api 1.1 and cdi-api 1.0 split
Copied: cdi-api/trunk/trunk (from rev 6648, api/trunk)
15 years, 9 months
Weld SVN: r6648 - cdi-api and 1 other directory.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-14 18:18:40 -0400 (Wed, 14 Jul 2010)
New Revision: 6648
Added:
cdi-api/
cdi-api/branches/
cdi-api/tags/
cdi-api/trunk/
Log:
Add cdi-api in prep for weld-api and cdi-api split
15 years, 9 months
Weld SVN: r6647 - servlet/trunk.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-07-13 12:56:48 -0400 (Tue, 13 Jul 2010)
New Revision: 6647
Modified:
servlet/trunk/pom.xml
Log:
update to use parent
Modified: servlet/trunk/pom.xml
===================================================================
--- servlet/trunk/pom.xml 2010-07-13 16:53:23 UTC (rev 6646)
+++ servlet/trunk/pom.xml 2010-07-13 16:56:48 UTC (rev 6647)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>10</version>
+ <version>12</version>
</parent>
<name>Weld Servlet support build aggregator</name>
15 years, 9 months