You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/03/03 01:13:42 UTC
svn commit: r1296525 - in /directory/shared/branches/shared-txns: ./
distribution/pom.xml pom.xml
Author: elecharny
Date: Sat Mar 3 00:13:42 2012
New Revision: 1296525
URL: http://svn.apache.org/viewvc?rev=1296525&view=rev
Log:
Merged trunk into the txn branch
Modified:
directory/shared/branches/shared-txns/ (props changed)
directory/shared/branches/shared-txns/distribution/pom.xml
directory/shared/branches/shared-txns/pom.xml
Propchange: directory/shared/branches/shared-txns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 3 00:13:42 2012
@@ -6,4 +6,4 @@
/directory/shared/branches/shared-schema:806622-896441
/directory/shared/branches/shared-subtree:965208-965686
/directory/shared/branches/xdbm-refactoring:945830-946347
-/directory/shared/trunk:1066124-1067995,1068025-1072732,1072797-1075328,1209073-1214195
+/directory/shared/trunk:1066124-1067995,1068025-1072732,1072797-1075328,1177671-1214195
Modified: directory/shared/branches/shared-txns/distribution/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/distribution/pom.xml?rev=1296525&r1=1296524&r2=1296525&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/distribution/pom.xml (original)
+++ directory/shared/branches/shared-txns/distribution/pom.xml Sat Mar 3 00:13:42 2012
@@ -42,6 +42,13 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<!-- Package additional jars that are no runtime dependencies -->
Modified: directory/shared/branches/shared-txns/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/pom.xml?rev=1296525&r1=1296524&r2=1296525&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/pom.xml (original)
+++ directory/shared/branches/shared-txns/pom.xml Sat Mar 3 00:13:42 2012
@@ -44,18 +44,18 @@
<!-- Set versions for depending jars -->
<antlr.version>2.7.7</antlr.version>
<commons.collections.version>3.2.1</commons.collections.version>
- <commons.io.version>2.0.1</commons.io.version>
+ <commons.io.version>2.1</commons.io.version>
<commons.lang.version>2.6</commons.lang.version>
<commons.pool.version>1.5.6</commons.pool.version>
<dom4j.version>1.6.1</dom4j.version>
- <junit.version>4.9</junit.version>
+ <junit.version>4.10</junit.version>
<log4j.version>1.2.16</log4j.version>
<mina.core.version>2.0.4</mina.core.version>
<org.osgi.version>3.0.0</org.osgi.version>
<org.osgi.core.version>4.3.0</org.osgi.core.version>
- <org.apache.felix.version>3.2.2</org.apache.felix.version>
- <slf4j.api.version>1.6.2</slf4j.api.version>
- <slf4j.log4j12.version>1.6.2</slf4j.log4j12.version>
+ <org.apache.felix.version>4.0.1</org.apache.felix.version>
+ <slf4j.api.version>1.6.4</slf4j.api.version>
+ <slf4j.log4j12.version>1.6.4</slf4j.log4j12.version>
<xml.apis.version>2.0.2</xml.apis.version>
<xpp3.version>1.1.4c</xpp3.version>
<pax-exam.version>2.2.0</pax-exam.version>