You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2008/03/18 05:54:57 UTC
svn commit: r638216 - in /directory/sandbox/akarasulu/bigbang/project:
LAST_BIG_BANG_MERGE pom.xml
Author: akarasulu
Date: Mon Mar 17 21:54:53 2008
New Revision: 638216
URL: http://svn.apache.org/viewvc?rev=638216&view=rev
Log:
[MERGE] pulling in changes from the bigbang branch to minimize conflicts
Added:
directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE (with props)
Modified:
directory/sandbox/akarasulu/bigbang/project/pom.xml
Added: directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE?rev=638216&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE (added)
+++ directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE Mon Mar 17 21:54:53 2008
@@ -0,0 +1,12 @@
+This file shows the last time I merged from the big bang branch here as a commit
+number:
+
+ https://svn.apache.org/repos/asf/directory/project/branches/bigbang/
+
+
+Tue Mar 18 00:52:06 EDT 2008
+----------------------------
+svn merge -r 613581:638215 https://svn.apache.org/repos/asf/directory/project/branches/bigbang .
+$Rev$
+$Date$
+
Propchange: directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 17 21:54:53 2008
@@ -0,0 +1,2 @@
+Revision
+Date
Modified: directory/sandbox/akarasulu/bigbang/project/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/project/pom.xml?rev=638216&r1=638215&r2=638216&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/project/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/project/pom.xml Mon Mar 17 21:54:53 2008
@@ -9,7 +9,7 @@
</parent>
<groupId>org.apache.directory.project</groupId>
- <version>9-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<artifactId>project</artifactId>
<name>Apache Directory Project</name>
<inceptionYear>2003</inceptionYear>
@@ -47,7 +47,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
@@ -66,7 +66,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</plugin>
<plugin>
@@ -78,13 +78,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.3</version>
+ <version>2.0.4</version>
</plugin>
<plugin>
@@ -96,19 +96,34 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.3</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/directory/project/releases</tagBase>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-6</version>
+ <version>2.0-beta-7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-5</version>
+ <version>1.0-beta-2</version>
<executions>
<execution>
<goals>
@@ -128,7 +143,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.1</version>
<configuration>
<argLine>-Xmx1024m</argLine>
</configuration>
@@ -162,7 +177,7 @@
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-3</version>
+ <version>1.0-alpha-4</version>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/directory/project/releases</tagBase>
</configuration>