[weld-commits] Weld SVN: r3935 - in api/trunk: bom and 4 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Sun Oct 11 15:24:34 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-10-11 15:24:34 -0400 (Sun, 11 Oct 2009)
New Revision: 3935
Modified:
api/trunk/bom/pom.xml
api/trunk/cdi/pom.xml
api/trunk/parent/pom.xml
api/trunk/pom.xml
api/trunk/weld-spi/pom.xml
api/trunk/weld/pom.xml
Log:
minor modifications
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-10-11 18:39:35 UTC (rev 3934)
+++ api/trunk/bom/pom.xml 2009-10-11 19:24:34 UTC (rev 3935)
@@ -6,7 +6,7 @@
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Weld & CDI APIs BOM</name>
+ <name>Weld and CDI APIs BOM</name>
<!-- Minimal project metadata, for more see parent/pom.xml -->
<url>http://www.seamframework.org/Weld</url>
@@ -41,7 +41,19 @@
</snapshots>
</repository>
<repository>
- <id>oss.sonatype.org</id>
+ <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>
@@ -69,7 +81,7 @@
<jstl.api.version>1.2</jstl.api.version>
<jta.api.version>1.0.1B</jta.api.version>
<jms.api.version>1.1</jms.api.version>
- <uel.api.version>2.1.2-b05</uel.api.version>
+ <uel.api.version>2.1.2-b04</uel.api.version>
<jsf.api.version>1.2_13</jsf.api.version>
<jaxws.api.version>2.1</jaxws.api.version>
<interceptor.api.version>3.1.0-SNAPSHOT</interceptor.api.version>
@@ -202,11 +214,49 @@
</dependencies>
</dependencyManagement>
+
+ <!-- The release profile -->
+ <profiles>
+ <profile>
+ <id>release</id>
+ <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>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
- <!-- SCM info-->
+ <!-- SCM info and distribution management-->
<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>
</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</url>
+ </repository>
+ <snapshotRepository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>Sonatype Nexus Snapshot Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
</project>
Modified: api/trunk/cdi/pom.xml
===================================================================
--- api/trunk/cdi/pom.xml 2009-10-11 18:39:35 UTC (rev 3934)
+++ api/trunk/cdi/pom.xml 2009-10-11 19:24:34 UTC (rev 3935)
@@ -5,14 +5,15 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-parent</artifactId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<packaging>jar</packaging>
- <name>CDI API</name>
- <description>API for JSR-299: Contexts and Dependency Injection for Java EE</description>
+ <name>CDI APIs</name>
+ <description>APIs for JSR-299: Contexts and Dependency Injection for Java EE</description>
<dependencies>
<dependency>
@@ -22,8 +23,8 @@
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
<optional>true</optional>
</dependency>
Modified: api/trunk/parent/pom.xml
===================================================================
--- api/trunk/parent/pom.xml 2009-10-11 18:39:35 UTC (rev 3934)
+++ api/trunk/parent/pom.xml 2009-10-11 19:24:34 UTC (rev 3935)
@@ -1,12 +1,17 @@
<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</relativePath>
+ </parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Weld & CDI APIs Parent</name>
+ <name>Weld and CDI APIs Parent</name>
<!-- Full project metadata -->
@@ -65,15 +70,20 @@
</developer>
</developers>
- <!-- Import the BOM -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api-bom</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- </dependency>
- </dependencies>
+ <!-- Configure non-API dependencies (e.g. testing)-->
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.9</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
<!-- Configure the build -->
<build>
@@ -95,14 +105,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/weld/api/tags</tagBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
</plugins>
<defaultGoal>package</defaultGoal>
@@ -166,6 +168,11 @@
</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>
@@ -284,6 +291,32 @@
</plugins>
</pluginManagement>
</build>
+
+ <!-- The release profile -->
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
<!-- Configure the SCM connection -->
<scm>
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2009-10-11 18:39:35 UTC (rev 3934)
+++ api/trunk/pom.xml 2009-10-11 19:24:34 UTC (rev 3935)
@@ -6,7 +6,7 @@
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Weld & CDI APIs Build Aggregator</name>
+ <name>Weld and CDI 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>
@@ -42,12 +42,12 @@
<distributionManagement>
<repository>
- <id>jboss-releases</id>
+ <id>oss.sonatype.org/jboss-releases</id>
<name>Sonatype Nexus Maven Repository</name>
<url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
<snapshotRepository>
- <id>jboss-snapshots</id>
+ <id>oss.sonatype.org/jboss-snapshots</id>
<name>Sonatype Nexus Snapshot Repository</name>
<url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
</snapshotRepository>
@@ -56,22 +56,50 @@
<modules>
<module>bom</module>
<module>parent</module>
- <module>cdi-api</module>
- <module>spi</module>
- <module>weld-api</module>
+ <module>cdi</module>
+ <module>weld</module>
+ <module>weld-spi</module>
</modules>
<!-- Minimal build configuration -->
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
- </plugin>
- </plugins>
- </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-9</version>
+ <configuration>
+ <goals>deploy</goals>
+ <arguments>-Prelease</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <tagBase>https://svn.jboss.org/repos/weld/api/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
-
+
+ <!-- The release profile -->
+ <profiles>
+ <profile>
+ <id>release</id>
+ <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>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: api/trunk/weld/pom.xml
===================================================================
--- api/trunk/weld/pom.xml 2009-10-11 18:39:35 UTC (rev 3934)
+++ api/trunk/weld/pom.xml 2009-10-11 19:24:34 UTC (rev 3935)
@@ -1,14 +1,15 @@
<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">
<parent>
- <artifactId>weld-parent</artifactId>
+ <artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <name>Weld Core API</name>
+ <name>Weld APIs</name>
+ <description>Weld specifc extensions to the CDI API</description>
<dependencies>
<dependency>
@@ -18,7 +19,4 @@
</dependencies>
- <build>
- <defaultGoal>install</defaultGoal>
- </build>
</project>
Modified: api/trunk/weld-spi/pom.xml
===================================================================
--- api/trunk/weld-spi/pom.xml 2009-10-11 18:39:35 UTC (rev 3934)
+++ api/trunk/weld-spi/pom.xml 2009-10-11 19:24:34 UTC (rev 3935)
@@ -1,14 +1,14 @@
<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">
<parent>
- <artifactId>weld-parent</artifactId>
+ <artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-spi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <name>Weld Service Provider Interfaces</name>
+ <name>Weld SPIs for container integration</name>
<dependencies>
<dependency>
@@ -66,8 +66,8 @@
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
<optional>true</optional>
</dependency>
@@ -79,7 +79,4 @@
</dependencies>
- <build>
- <defaultGoal>install</defaultGoal>
- </build>
</project>
More information about the weld-commits
mailing list