[weld-commits] Weld SVN: r3933 - in api/trunk: bom and 2 other directories.

weld-commits at lists.jboss.org weld-commits at lists.jboss.org
Sun Oct 11 14:36:53 EDT 2009


Author: pete.muir at jboss.org
Date: 2009-10-11 14:36:53 -0400 (Sun, 11 Oct 2009)
New Revision: 3933

Added:
   api/trunk/bom/
   api/trunk/bom/pom.xml
   api/trunk/parent/
   api/trunk/parent/pom.xml
   api/trunk/pom.xml
   api/trunk/weld/
Removed:
   api/trunk/weld-api/
Modified:
   api/trunk/cdi/pom.xml
Log:
rename

Copied: api/trunk/bom/pom.xml (from rev 3930, core/trunk/version-matrix/pom.xml)
===================================================================
--- api/trunk/bom/pom.xml	                        (rev 0)
+++ api/trunk/bom/pom.xml	2009-10-11 18:36:53 UTC (rev 3933)
@@ -0,0 +1,212 @@
+<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>
+
+   <name>Weld & 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>
+         <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>oss.sonatype.org</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>
+      <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>
+      <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.0.1B</jta.api.version>
+      <jms.api.version>1.1</jms.api.version>
+      <uel.api.version>2.1.2-b05</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>
+   </properties>
+   
+   <dependencyManagement>
+      <dependencies>
+      
+         <dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket</artifactId>
+            <version>${wicket.version}</version>
+         </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 -->
+         <dependency>
+            <groupId>org.jboss.ejb3</groupId>
+            <artifactId>jboss-ejb3-api</artifactId>
+            <version>${ejb.api.version}</version>
+         </dependency>
+         
+         <!-- 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>
+            <version>${weld.api.version}</version>
+         </dependency>
+
+         <dependency>
+            <groupId>org.jboss.weld</groupId>
+            <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>
+         </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 info-->
+   <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>
+
+</project>

Modified: api/trunk/cdi/pom.xml
===================================================================
--- api/trunk/cdi/pom.xml	2009-10-11 18:34:50 UTC (rev 3932)
+++ api/trunk/cdi/pom.xml	2009-10-11 18:36:53 UTC (rev 3933)
@@ -3,21 +3,22 @@
 
 	<parent>
 		<groupId>org.jboss.weld</groupId>
-		<artifactId>weld-parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<artifactId>weld-api-parent</artifactId>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>javax.enterprise</groupId>
 	<artifactId>cdi-api</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<name>CDI API</name>
-	<url>http://www.seamframework.org/Weld</url>
+	
+   <name>CDI API</name>
+	<description>API for JSR-299: Contexts and Dependency Injection for Java EE</description>
 
 	<dependencies>
 		<dependency>
 			<groupId>javax.el</groupId>
 			<artifactId>el-api</artifactId>
+         <optional>true</optional>
 		</dependency>
       
 		<dependency>

Copied: api/trunk/parent/pom.xml (from rev 3930, core/trunk/parent/pom.xml)
===================================================================
--- api/trunk/parent/pom.xml	                        (rev 0)
+++ api/trunk/parent/pom.xml	2009-10-11 18:36:53 UTC (rev 3933)
@@ -0,0 +1,295 @@
+<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-parent</artifactId>
+   <packaging>pom</packaging>
+   <version>1.0-SNAPSHOT</version>
+
+   <name>Weld & CDI APIs Parent</name>
+   
+
+   <!-- Full project metadata -->
+   <url>http://www.seamframework.org/Weld</url>
+   
+   <description>
+      The reference implementation of JSR 299: Weld
+   </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 at 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>
+
+   <!-- 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 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>
+         <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>
+
+      <!-- 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>
+               <version>2.1</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-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>
+
+   <!-- Configure the SCM connection -->
+   <scm>
+      <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/ri/trunk/parent</connection>
+      <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/ri/trunk/parent</developerConnection>
+      <url>http://fisheye.jboss.org/browse/Weld/ri</url>
+   </scm>
+   
+</project>

Copied: api/trunk/pom.xml (from rev 3930, core/trunk/pom.xml)
===================================================================
--- api/trunk/pom.xml	                        (rev 0)
+++ api/trunk/pom.xml	2009-10-11 18:36:53 UTC (rev 3933)
@@ -0,0 +1,77 @@
+<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-build-aggregator</artifactId>
+   <packaging>pom</packaging>
+   <version>1.0-SNAPSHOT</version>
+
+   <name>Weld & 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>
+
+   <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>Pete Muir</name>
+         <id>pmuir</id>
+         <organization>Red Hat Inc.</organization>
+         <roles>
+            <role>Project Lead</role>
+         </roles>
+         <email>pmuir at redhat.com</email>
+      </developer>
+   </developers>
+
+   <!-- 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>
+
+   <distributionManagement>
+      <repository>
+         <id>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>
+         <name>Sonatype Nexus Snapshot Repository</name>
+         <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
+      </snapshotRepository>
+   </distributionManagement>
+
+   <modules>
+      <module>bom</module>
+      <module>parent</module>
+      <module>cdi-api</module>
+      <module>spi</module>
+      <module>weld-api</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>
+   </build>
+
+</project>

Copied: api/trunk/weld (from rev 3932, api/trunk/weld-api)



More information about the weld-commits mailing list