You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by si...@apache.org on 2012/02/16 10:46:56 UTC
svn commit: r1244908 - in /incubator/directmemory/trunk: pom.xml
serializers/protobuf/pom.xml
Author: simonetripodi
Date: Thu Feb 16 09:46:56 2012
New Revision: 1244908
URL: http://svn.apache.org/viewvc?rev=1244908&view=rev
Log:
managed protopub dependency
fixed (?!?) OSGi protopub metadata
Modified:
incubator/directmemory/trunk/pom.xml
incubator/directmemory/trunk/serializers/protobuf/pom.xml
Modified: incubator/directmemory/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/pom.xml?rev=1244908&r1=1244907&r2=1244908&view=diff
==============================================================================
--- incubator/directmemory/trunk/pom.xml (original)
+++ incubator/directmemory/trunk/pom.xml Thu Feb 16 09:46:56 2012
@@ -251,6 +251,7 @@ under the License.
<protostuff.version>1.0.4</protostuff.version>
<slf4j.version>1.6.4</slf4j.version>
<msgpack.version>0.6.5</msgpack.version>
+ <protobuf.version>2.4.1</protobuf.version>
<wagon.version>2.2</wagon.version>
<!-- Plugin Versions -->
@@ -603,6 +604,12 @@ under the License.
</dependency>
<dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
Modified: incubator/directmemory/trunk/serializers/protobuf/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/serializers/protobuf/pom.xml?rev=1244908&r1=1244907&r2=1244908&view=diff
==============================================================================
--- incubator/directmemory/trunk/serializers/protobuf/pom.xml (original)
+++ incubator/directmemory/trunk/serializers/protobuf/pom.xml Thu Feb 16 09:46:56 2012
@@ -38,7 +38,7 @@ under the License.
<properties>
<osgi.import>
!org.apache.directmemory*,
- com.dyuproject.protostuff*;version="[1,2)",
+ com.google.protobuf*;version="[${protobuf.version})",
*
</osgi.import>
<osgi.export>org.apache.directmemory*;version="${project.version}</osgi.export>
@@ -54,7 +54,6 @@ under the License.
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>2.4.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>