Merge pull request #12 from italiangrid/develop

Merge 3.0.6 back to master

package/rpm/voms-clients.spec.in

@@ -5,7 +5,7 @@
 %global _varlib /var/lib
 
 Name: voms-clients3
-Version: 3.0.5
+Version: 3.0.6
 Release: 1%{?dist}
 Summary: The Virtual Organisation Membership Service command line clients
 
@@ -164,6 +164,8 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %changelog
+* Tue Dec 10 2014 Andrea Ceccanti <andrea.ceccanti at cnaf.infn.it> - 3.0.6-1
+- Packaing 3.0.6 version
 
 * Mon Jan 27 2014 Andrea Ceccanti <andrea.ceccanti at cnaf.infn.it> - 3.0.5-1
 - Fix for https://issues.infn.it/jira/browse/VOMS-495. New packaging installable

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.italiangrid</groupId>
   <artifactId>voms-clients</artifactId>
-  <version>3.0.5</version>
+  <version>3.0.6</version>
 
   <name>voms-clients</name>
   <description>VOMS service command-line clients</description>
@@ -44,7 +44,7 @@
     <junit.version>4.10</junit.version>
     <commons-io.version>2.0.1</commons-io.version>
     <commons-cli.version>1.2</commons-cli.version>
-    <voms-api-java.version>3.0.4</voms-api-java.version>
+    <voms-api-java.version>3.0.5</voms-api-java.version>
 
     <!-- Leave this defined as empty -->
     <voms-clients.libs />
@@ -81,14 +81,19 @@
   </developers>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${plugin.jar.version}</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
 
       <plugin>
         <groupId>com.mycila.maven-license-plugin</groupId>