You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/10/07 19:20:31 UTC

svn commit: r582653 - in /myfaces/orchestra/trunk: core/pom.xml core15/pom.xml examples/pom.xml maven/pom.xml pom.xml sandbox/pom.xml

Author: imario
Date: Sun Oct  7 10:20:29 2007
New Revision: 582653

URL: http://svn.apache.org/viewvc?rev=582653&view=rev
Log:
some pom fixing

Modified:
    myfaces/orchestra/trunk/core/pom.xml
    myfaces/orchestra/trunk/core15/pom.xml
    myfaces/orchestra/trunk/examples/pom.xml
    myfaces/orchestra/trunk/maven/pom.xml
    myfaces/orchestra/trunk/pom.xml
    myfaces/orchestra/trunk/sandbox/pom.xml

Modified: myfaces/orchestra/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/pom.xml?rev=582653&r1=582652&r2=582653&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/pom.xml (original)
+++ myfaces/orchestra/trunk/core/pom.xml Sun Oct  7 10:20:29 2007
@@ -6,12 +6,12 @@
 	<artifactId>myfaces-orchestra-core</artifactId>
 	<packaging>jar</packaging>
 	<name>MyFaces Orchestra Core</name>
-	<version>1.1-SNAPSHOT</version>
+	<version>1.0-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.apache.myfaces.orchestra</groupId>
 		<artifactId>myfaces-orchestra-maven</artifactId>
-		<version>1.0</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 
 	<scm>
@@ -107,13 +107,29 @@
 				<version>2.0</version>
 				<configuration>
 					<source>1.4</source>
-					<target>1.4</target>
+					<target>${build.target}</target>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.1</version>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<orchestra.artifact>${pom.artifactId}</orchestra.artifact>
+							<orchestra.artifact.version>${pom.version}</orchestra.artifact.version>
+							<build.target>${build.target}</build.target>
+						</manifestEntries>
+					</archive>
 				</configuration>
 			</plugin>
 
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>dependency-maven-plugin</artifactId>
+				<version>1.0</version>
 				<executions>
 
 					<!-- unpack the shared sources into target/shared_sources-->
@@ -142,6 +158,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.0</version>
 				<executions>
 					<execution>
 						<id>add-source</id>
@@ -198,7 +215,7 @@
 		<site>
 			<id>apache-site</id>
 			<name>Apache Website</name>
-			<url>scpexe://minotaur.apache.org/www/myfaces.apache.org/orchestra/myfaces-orchestra-core</url>
+			<url>scpexe://people.apache.org/www/myfaces.apache.org/orchestra/myfaces-orchestra-core</url>
 		</site>
 	</distributionManagement>
 
@@ -229,11 +246,15 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.0-beta-3</version>
+				<configuration>
+					<show>protected</show>
+				</configuration>
 			</plugin>
 
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>jxr-maven-plugin</artifactId>
+				<version>2.0-beta-1</version>
 			</plugin>
 
 			<plugin>
@@ -245,11 +266,13 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>surefire-report-maven-plugin</artifactId>
+				<version>2.0-beta-1</version>
 			</plugin>
 
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>rat-maven-plugin</artifactId>
+				<version>1.0-alpha-3</version>
 			</plugin>
 
 		</plugins>
@@ -300,6 +323,7 @@
 					<plugin>
 						<groupId>net.sourceforge.maven-taglib</groupId>
 						<artifactId>maven-taglib-plugin</artifactId>
+						<version>1.4.2</version>
 						<configuration>
 							<taglib.src.dir>${basedir}/target/tlddoc-site</taglib.src.dir>
 							<tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>
@@ -346,6 +370,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>2.0</version>
 						<executions>
 							<execution>
 								<id>attach-javadoc</id>
@@ -374,6 +399,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
+						<version>2.0.3</version>
 						<executions>
 							<execution>
 								<id>attach-source</id>
@@ -387,5 +413,9 @@
 			</build>
 		</profile>
 	</profiles>
+
+	<properties>
+		<build.target>1.4</build.target>
+	</properties>
 
 </project>

Modified: myfaces/orchestra/trunk/core15/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/pom.xml?rev=582653&r1=582652&r2=582653&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/pom.xml (original)
+++ myfaces/orchestra/trunk/core15/pom.xml Sun Oct  7 10:20:29 2007
@@ -189,7 +189,7 @@
         <site>
             <id>apache-site</id>
             <name>Apache Website</name>
-            <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/orchestra/myfaces-orchestra-core15</url>
+            <url>scpexe://people.apache.org/www/myfaces.apache.org/orchestra/myfaces-orchestra-core15</url>
         </site>
     </distributionManagement>
 

Modified: myfaces/orchestra/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/pom.xml?rev=582653&r1=582652&r2=582653&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/pom.xml (original)
+++ myfaces/orchestra/trunk/examples/pom.xml Sun Oct  7 10:20:29 2007
@@ -316,7 +316,7 @@
         <site>
             <id>apache-site</id>
             <name>Apache Website</name>
-            <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/orchestra/myfaces-orchestra-examples</url>
+            <url>scpexe://people.apache.org/www/myfaces.apache.org/orchestra/myfaces-orchestra-examples</url>
         </site>
     </distributionManagement>
 

Modified: myfaces/orchestra/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/maven/pom.xml?rev=582653&r1=582652&r2=582653&view=diff
==============================================================================
--- myfaces/orchestra/trunk/maven/pom.xml (original)
+++ myfaces/orchestra/trunk/maven/pom.xml Sun Oct  7 10:20:29 2007
@@ -12,7 +12,7 @@
 	<packaging>pom</packaging>
 	<name>MyFaces Orchestra Maven</name>
 	<url>http://myfaces.apache.org/orchestra</url>
-	<version>1.1-SNAPSHOT</version>
+	<version>1.0-SNAPSHOT</version>
 	<description>Apache MyFaces Orchestra is a sub-project of Apache MyFaces</description>
 
 	<developers>
@@ -116,7 +116,7 @@
 		<site>
 			<id>apache-site</id>
 			<name>Apache Website</name>
-			<url>scpexe://minotaur.apache.org/www/myfaces.apache.org/orchestra/myfaces-orchestra-maven</url>
+			<url>scpexe://people.apache.org/www/myfaces.apache.org/orchestra/myfaces-orchestra-maven</url>
 		</site>
 	</distributionManagement>
 

Modified: myfaces/orchestra/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/pom.xml?rev=582653&r1=582652&r2=582653&view=diff
==============================================================================
--- myfaces/orchestra/trunk/pom.xml (original)
+++ myfaces/orchestra/trunk/pom.xml Sun Oct  7 10:20:29 2007
@@ -29,7 +29,7 @@
         <site>
             <id>apache-site</id>
             <name>Apache Website</name>
-            <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/orchestra</url>
+            <url>scpexe://people.apache.org/www/myfaces.apache.org/orchestra</url>
         </site>
     </distributionManagement>
 

Modified: myfaces/orchestra/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/pom.xml?rev=582653&r1=582652&r2=582653&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/pom.xml (original)
+++ myfaces/orchestra/trunk/sandbox/pom.xml Sun Oct  7 10:20:29 2007
@@ -192,7 +192,7 @@
         <site>
             <id>apache-site</id>
             <name>Apache Website</name>
-            <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/orchestra/myfaces-orchestra-sandbox</url>
+            <url>scpexe://people.apache.org/www/myfaces.apache.org/orchestra/myfaces-orchestra-sandbox</url>
         </site>
     </distributionManagement>