Skip to content

Commit

Permalink
Java POM changes for OSGI
Browse files Browse the repository at this point in the history
Will now add bundle information to MANIFEST in .jar

Also:
Removed unneeded dependencies.
Changed to use rotobuf-maven-plugin from maven central

Fixes basho#19
  • Loading branch information
Brian Roach committed Dec 20, 2012
1 parent d6539f3 commit 39db0c8
Showing 1 changed file with 16 additions and 45 deletions.
61 changes: 16 additions & 45 deletions pom.xml
Expand Up @@ -4,8 +4,8 @@

<groupId>com.basho.riak.protobuf</groupId>
<artifactId>riak-pb</artifactId>
<version>1.2</version>
<packaging>jar</packaging>
<version>1.2.1</version>
<packaging>bundle</packaging>

<name>Riak Protocol Buffers</name>
<description>Protocol buffers used to communicate with Riak</description>
Expand Down Expand Up @@ -35,13 +35,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<pluginRepositories>
<pluginRepository>
<id>davidtrott</id>
<url>http://maven.davidtrott.com/repository</url>
</pluginRepository>
</pluginRepositories>

<build>
<plugins>
<plugin>
Expand All @@ -67,27 +60,28 @@
</configuration>
</plugin>
<plugin>
<groupId>com.google.protobuf.tools</groupId>
<artifactId>maven-protoc-plugin</artifactId>
<version>0.1.10</version>
<groupId>com.github.igor-petruk.protobuf</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.5.2</version>
<configuration>
<protocExecutable>protoc</protocExecutable>
<protoSourceRoot>${project.basedir}/src</protoSourceRoot>
<languageSpecifications>
<LanguageSpecification>
<language>JAVA</language>
<outputDirectory>${project.basedir}/target/generated-sources/java</outputDirectory>
</LanguageSpecification>
</languageSpecifications>
</configuration>
<inputDirectories>
<directory>${project.basedir}/src</directory>
</inputDirectories>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-bundle-plugin</artifactId>
<groupId>org.apache.felix</groupId>
<version>2.3.7</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down Expand Up @@ -228,29 +222,6 @@
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>net.avh4.util</groupId>
<artifactId>imagecomparison</artifactId>
<version>0.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand Down

0 comments on commit 39db0c8

Please sign in to comment.