You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2009/05/22 16:37:12 UTC

svn commit: r777546 - in /incubator/openwebbeans/trunk: distribution/ pom.xml samples/guess/pom.xml samples/reservation/pom.xml webbeans-api/ webbeans-ejb/ webbeans-geronimo/ webbeans-impl/ webbeans-jms/ webbeans-jpa/ webbeans-jsf/ webbeans-tck/

Author: struberg
Date: Fri May 22 14:37:12 2009
New Revision: 777546

URL: http://svn.apache.org/viewvc?rev=777546&view=rev
Log:
OWB-97 apply changes submitted by Bernd Bohmann - txs!

.) add default goal and a inceptionYear
.) Update to the most recent version of jetty and facelets. 
.) add idea project files to svn:ignore


Modified:
    incubator/openwebbeans/trunk/distribution/   (props changed)
    incubator/openwebbeans/trunk/pom.xml
    incubator/openwebbeans/trunk/samples/guess/pom.xml
    incubator/openwebbeans/trunk/samples/reservation/pom.xml
    incubator/openwebbeans/trunk/webbeans-api/   (props changed)
    incubator/openwebbeans/trunk/webbeans-ejb/   (props changed)
    incubator/openwebbeans/trunk/webbeans-geronimo/   (props changed)
    incubator/openwebbeans/trunk/webbeans-impl/   (props changed)
    incubator/openwebbeans/trunk/webbeans-jms/   (props changed)
    incubator/openwebbeans/trunk/webbeans-jpa/   (props changed)
    incubator/openwebbeans/trunk/webbeans-jsf/   (props changed)
    incubator/openwebbeans/trunk/webbeans-tck/   (props changed)

Propchange: incubator/openwebbeans/trunk/distribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May 22 14:37:12 2009
@@ -0,0 +1,8 @@
+.settings
+target
+.classpath
+.project
+*.iml
+*.ipr
+*.iws
+

Modified: incubator/openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/pom.xml?rev=777546&r1=777545&r2=777546&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/pom.xml (original)
+++ incubator/openwebbeans/trunk/pom.xml Fri May 22 14:37:12 2009
@@ -25,7 +25,7 @@
 	<name>OpenWebBeans</name>
 	<packaging>pom</packaging>
 	<version>1.0.0-incubating-SNAPSHOT</version>
-
+    
 	<description> 
         Apache OpenWebBeans is an open source implementation of
 	    JSR-299 WebBeans 
@@ -36,6 +36,8 @@
 		<url>http://incubator.apache.org/openwebbeans</url>
 	</organization>
 
+    <inceptionYear>2008</inceptionYear>
+
 	<scm>
 	    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/openwebbeans/trunk</connection>
 	    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/openwebbeans/trunk</developerConnection>
@@ -134,6 +136,8 @@
     </developers>
 	
     <build>
+    <defaultGoal>install</defaultGoal>
+    
     <pluginManagement>
         <plugins>
             <plugin>
@@ -236,6 +240,7 @@
 		<configuration>
 			<source>1.6</source>
 			<target>1.6</target>
+            
 		</configuration>
 	     </plugin>
 	     <plugin>
@@ -547,9 +552,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <configuration>
-                            <encoding>${project.build.sourceEncoding}</encoding>
-                        </configuration>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>

Modified: incubator/openwebbeans/trunk/samples/guess/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/pom.xml?rev=777546&r1=777545&r2=777546&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/guess/pom.xml Fri May 22 14:37:12 2009
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.sun.facelets</groupId>
             <artifactId>jsf-facelets</artifactId>
-            <version>1.1.11</version>
+            <version>1.1.14</version>
         </dependency>
 
         <dependency>
@@ -93,8 +93,7 @@
 	<profiles>
 		<profile>
 			<id>jetty</id>
-                        <dependencies>
-            
+            <dependencies>
                 <dependency>
                     <groupId>org.apache.openwebbeans</groupId>
                     <artifactId>openwebbeans-api</artifactId>
@@ -149,7 +148,7 @@
                     <plugin>
                         <groupId>org.mortbay.jetty</groupId>
                         <artifactId>maven-jetty-plugin</artifactId>
-                        <version>6.1.15.rc4</version>
+                        <version>6.1.18</version>
                         <configuration>
                             <scanIntervalSeconds>10</scanIntervalSeconds>
                         </configuration>
@@ -157,15 +156,6 @@
                 </plugins>
             </build>
 
-            <pluginRepositories>
-                <!-- Repository to get the jetty plugin -->
-                <pluginRepository>
-                     <id>mortbay-repo</id>
-                     <name>mortbay-repo</name>
-                     <url>http://www.mortbay.org/maven2/snapshot</url>
-                </pluginRepository>
-            </pluginRepositories>
-
             <properties>
                 <envlibscope>compile</envlibscope>
             </properties>

Modified: incubator/openwebbeans/trunk/samples/reservation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/pom.xml?rev=777546&r1=777545&r2=777546&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/reservation/pom.xml Fri May 22 14:37:12 2009
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.sun.facelets</groupId>
             <artifactId>jsf-facelets</artifactId>
-            <version>1.1.11</version>
+            <version>1.1.14</version>
         </dependency>
 
         <dependency>
@@ -99,8 +99,7 @@
 	<profiles>
 		<profile>
 			<id>jetty</id>
-                        <dependencies>
-            
+            <dependencies>
                 <dependency>
                     <groupId>org.apache.openwebbeans</groupId>
                     <artifactId>openwebbeans-api</artifactId>
@@ -155,7 +154,7 @@
                     <plugin>
                         <groupId>org.mortbay.jetty</groupId>
                         <artifactId>maven-jetty-plugin</artifactId>
-                        <version>6.1.15.rc4</version>
+                        <version>6.1.18</version>
                         <configuration>
                             <scanIntervalSeconds>10</scanIntervalSeconds>
                         </configuration>
@@ -163,15 +162,6 @@
                 </plugins>
             </build>
 
-            <pluginRepositories>
-                <!-- Repository to get the jetty plugin -->
-                <pluginRepository>
-                     <id>mortbay-repo</id>
-                     <name>mortbay-repo</name>
-                     <url>http://www.mortbay.org/maven2/snapshot</url>
-                </pluginRepository>
-            </pluginRepositories>
-
             <properties>
                 <envlibscope>compile</envlibscope>
             </properties>

Propchange: incubator/openwebbeans/trunk/webbeans-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 14:37:12 2009
@@ -1,4 +1,7 @@
-.settings
-target
-.classpath
-.project
+.settings
+target
+.classpath
+.project
+*.iml
+*.ipr
+*.iws

Propchange: incubator/openwebbeans/trunk/webbeans-ejb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 14:37:12 2009
@@ -2,3 +2,6 @@
 target
 .classpath
 .project
+*.iml
+*.ipr
+*.iws

Propchange: incubator/openwebbeans/trunk/webbeans-geronimo/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 14:37:12 2009
@@ -2,3 +2,6 @@
 .project
 .settings
 target
+*.iml
+*.ipr
+*.iws

Propchange: incubator/openwebbeans/trunk/webbeans-impl/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 14:37:12 2009
@@ -1,4 +1,7 @@
-.settings
-target
-.classpath
-.project
+.settings
+target
+.classpath
+.project
+*.iml
+*.ipr
+*.iws

Propchange: incubator/openwebbeans/trunk/webbeans-jms/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 14:37:12 2009
@@ -2,3 +2,6 @@
 target
 .classpath
 .project
+*.iml
+*.ipr
+*.iws

Propchange: incubator/openwebbeans/trunk/webbeans-jpa/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 14:37:12 2009
@@ -2,3 +2,6 @@
 .classpath
 .settings
 target
+*.iml
+*.ipr
+*.iws

Propchange: incubator/openwebbeans/trunk/webbeans-jsf/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 14:37:12 2009
@@ -2,3 +2,6 @@
 .classpath
 target
 .settings
+*.iml
+*.ipr
+*.iws

Propchange: incubator/openwebbeans/trunk/webbeans-tck/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 22 14:37:12 2009
@@ -2,6 +2,9 @@
 target
 .classpath
 .project
+*.iml
+*.ipr
+*.iws
 test-output
 jsr299-tck-impl-1.0.0-SNAPSHOT-suite.xml
 temp-testng-customsuite.xml