You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/01/29 19:55:08 UTC

svn commit: r738959 - in /incubator/openwebbeans/trunk: distribution/pom.xml pom.xml samples/guess/pom.xml samples/pom.xml webbeans-api/pom.xml webbeans-impl/pom.xml

Author: gerdogdu
Date: Thu Jan 29 18:55:08 2009
New Revision: 738959

URL: http://svn.apache.org/viewvc?rev=738959&view=rev
Log:
Pom updates for M1 release

Modified:
    incubator/openwebbeans/trunk/distribution/pom.xml
    incubator/openwebbeans/trunk/pom.xml
    incubator/openwebbeans/trunk/samples/guess/pom.xml
    incubator/openwebbeans/trunk/samples/pom.xml
    incubator/openwebbeans/trunk/webbeans-api/pom.xml
    incubator/openwebbeans/trunk/webbeans-impl/pom.xml

Modified: incubator/openwebbeans/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/distribution/pom.xml?rev=738959&r1=738958&r2=738959&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/distribution/pom.xml (original)
+++ incubator/openwebbeans/trunk/distribution/pom.xml Thu Jan 29 18:55:08 2009
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.openwebbeans</groupId>
         <artifactId>openwebbeans</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0-incubating-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -76,7 +76,9 @@
 	      </plugin>
         </plugins>
     </build>
-
+    <properties>
+      <siteId>distribution/directory</siteId>
+    </properties>
     <!--
         The assemblies work off of dependency sets since the stuff to be
         aggregated is no longer sub-modules after moving assembly itself

Modified: incubator/openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/pom.xml?rev=738959&r1=738958&r2=738959&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/pom.xml (original)
+++ incubator/openwebbeans/trunk/pom.xml Thu Jan 29 18:55:08 2009
@@ -26,7 +26,7 @@
 	<artifactId>openwebbeans</artifactId>
 	<name>OpenWebBeans</name>
 	<packaging>pom</packaging>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.0-incubating-SNAPSHOT</version>
 
 	<description> 
         Apache OpenWebBeans is an open source implementation of
@@ -137,35 +137,35 @@
 	
     <build>
 	 <pluginManagement>
-		    <plugins>
-		       <plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-remote-resources-plugin</artifactId>
-			    <version>1.0</version>
-			    <executions>
-			        <execution>
-			            <goals>
-			                <goal>process</goal>
-			            </goals>
-			            <configuration>
-			                <resourceBundles>
-			                    <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-			                </resourceBundles>
-			            </configuration>
-			        </execution>
-			    </executions>
-			</plugin>
-            <plugin>
+	    <plugins>
+	       <plugin>
+		    <groupId>org.apache.maven.plugins</groupId>
+		    <artifactId>maven-remote-resources-plugin</artifactId>
+		    <version>1.0</version>
+		    <executions>
+		        <execution>
+		            <goals>
+		                <goal>process</goal>
+		            </goals>
+		            <configuration>
+		                <resourceBundles>
+		                    <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+		                </resourceBundles>
+		            </configuration>
+		        </execution>
+		    </executions>
+		</plugin>
+             
+	     <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
                 <version>2.0-beta-7</version>
-            </plugin>
-        </plugins>
-	</pluginManagement>
+             </plugin>
+          </plugins>
+       </pluginManagement>
 
 	<plugins>
-
-		  <plugin>
+	      <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
                     <version>2.0.2</version>
@@ -205,62 +205,45 @@
 		            </archive>
 
                     </configuration>
-                </plugin>
+             </plugin>
 
-		 <plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-jar-plugin</artifactId>
-		        <configuration>
-		            <archive>
-		                <manifestEntries>
-		                    <Specification-Title>${project.name}</Specification-Title>
-		                    <Specification-Version>${project.version}</Specification-Version>
-		                    <Specification-Vendor>${project.organization.name}</Specification-Vendor>
-		                    <Implementation-Title>${project.name}</Implementation-Title>
-		                    <Implementation-Version>${project.version}</Implementation-Version>
-		                    <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
-		                    <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-		                </manifestEntries>
-		            </archive>
-		        </configuration>
-              </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Specification-Title>${project.name}</Specification-Title>
-                            <Specification-Version>${project.version}</Specification-Version>
-                            <Specification-Vendor>${project.organization.name}</Specification-Vendor>
-                            <Implementation-Title>${project.name}</Implementation-Title>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                            <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
-                            <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
+	     <plugin>
+	        <groupId>org.apache.maven.plugins</groupId>
+	        <artifactId>maven-jar-plugin</artifactId>
+	        <configuration>
+	            <archive>
+	                <manifestEntries>
+	                    <Specification-Title>${project.name}</Specification-Title>
+	                    <Specification-Version>${project.version}</Specification-Version>
+	                    <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+	                    <Implementation-Title>${project.name}</Implementation-Title>
+	                    <Implementation-Version>${project.version}</Implementation-Version>
+	                    <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+	                    <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+	                </manifestEntries>
+	            </archive>
+	        </configuration>
             </plugin>
-
-           <plugin>
+           
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-remote-resources-plugin</artifactId>
-            </plugin>
+             </plugin>
 
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.4.3</version>
-				<executions>
-				</executions>
-			</plugin>
+	     <plugin>
+		<artifactId>maven-compiler-plugin</artifactId>
+		<configuration>
+			<source>1.5</source>
+			<target>1.5</target>
+		</configuration>
+	     </plugin>
+	     <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-surefire-plugin</artifactId>
+		<version>2.4.3</version>
+		<executions>
+		</executions>
+	    </plugin>
             <!-- force generating a *-sources.jar when building a jar, e.g. for a snapshot release -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -334,6 +317,7 @@
 			<layout>legacy</layout>
 		</repository>
 	</repositories>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -342,16 +326,6 @@
 				<version>1.2.14</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.openwebbeans</groupId>
-				<artifactId>openwebbeans-api</artifactId>
-				<version>1.0.0-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.openwebbeans</groupId>
-				<artifactId>openwebbeans-impl</artifactId>
-				<version>1.0.0-SNAPSHOT</version>
-			</dependency>
-			<dependency>
 			    <groupId>org.apache.geronimo.specs</groupId>
 			    <artifactId>geronimo-jaxws_2.1_spec</artifactId>
 			    <version>1.0</version>
@@ -446,7 +420,8 @@
     </distributionManagement>
       
 	<properties>
-		<openwebbeans.version>1.0.0-SNAPSHOT</openwebbeans.version>
+          <openwebbeans.version>1.0.0-incubating-SNAPSHOT</openwebbeans.version>
+	  <siteId>plugins/directory</siteId>
 	</properties>
 
     <profiles>
@@ -455,6 +430,17 @@
             <id>release</id>
             <build>
                 <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-release-plugin</artifactId>
+                        <configuration>
+                            <useReleaseProfile>false</useReleaseProfile>
+                            <goals>deploy</goals>
+                            <arguments>-Prelease</arguments>
+                        </configuration>
+                    </plugin>
+
                 <!-- We want to deploy the artifact to a staging location for perusal -->
                     <plugin>
                         <inherited>true</inherited>
@@ -496,7 +482,5 @@
             </build>
         </profile>  
         <!-- END release profile -->
-        
     </profiles>
-
 </project>

Modified: incubator/openwebbeans/trunk/samples/guess/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/pom.xml?rev=738959&r1=738958&r2=738959&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/guess/pom.xml Thu Jan 29 18:55:08 2009
@@ -3,13 +3,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.apache.openwebbeans</groupId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0-incubating-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>guess</artifactId>
 	<packaging>war</packaging>
 	<name>OpenWebBeans :: Sample Application</name>
-	<version>1.0.0-SNAPSHOT</version>
 	<description>Simple login application</description>
 	<build>
 		<finalName>guess</finalName>
@@ -45,13 +44,13 @@
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-api</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.0-incubating-SNAPSHOT</version>
 <!--			<scope>provided</scope>-->
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-impl</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.0-incubating-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

Modified: incubator/openwebbeans/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/pom.xml?rev=738959&r1=738958&r2=738959&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/pom.xml Thu Jan 29 18:55:08 2009
@@ -5,14 +5,13 @@
 	<parent>
 		<groupId>org.apache.openwebbeans</groupId>
 		<artifactId>openwebbeans</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0-incubating-SNAPSHOT</version>
 	</parent>
 	<artifactId>samples</artifactId>
 	<packaging>pom</packaging>
 	<name>OpenWebBeans :: Samples</name>
-	<version>1.0.0-SNAPSHOT</version>
 	<description>Contains samples project for openwebbeans.</description>
 	<modules>
 		<module>guess</module>
 	</modules>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openwebbeans/trunk/webbeans-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-api/pom.xml?rev=738959&r1=738958&r2=738959&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-api/pom.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-api/pom.xml Thu Jan 29 18:55:08 2009
@@ -22,11 +22,10 @@
 	<parent>
 		<groupId>org.apache.openwebbeans</groupId>
 		<artifactId>openwebbeans</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0-incubating-SNAPSHOT</version>
 	</parent>
 	<artifactId>openwebbeans-api</artifactId>
 	<name>OpenWebBeans :: WebBeans-API</name>
 	<packaging>jar</packaging>
-	<version>1.0.0-SNAPSHOT</version>
 	<description>JSR-299 Application Programming Interface</description>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openwebbeans/trunk/webbeans-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/pom.xml?rev=738959&r1=738958&r2=738959&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/pom.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/pom.xml Thu Jan 29 18:55:08 2009
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.openwebbeans</groupId>
 		<artifactId>openwebbeans</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0-incubating-SNAPSHOT</version>
 	</parent>
 	<artifactId>openwebbeans-impl</artifactId>
 	<name>OpenWebBeans :: WebBeans-Impl</name>