Fixing the poms for bcpkix, jscep and commons-io

deshankoswatte · Feb 17, 2015 · 1a72bbc · 1a72bbc
1 parent 7059362
commit 1a72bbc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/bcpkix/1.49.0.wso2v2/pom.xml b/bcpkix/1.49.0.wso2v2/pom.xml
@@ -82,16 +82,16 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Import-Package>
-                            org.bouncycastle.x509.*;version="[1.49.0.wso2v2, 1.50.0.wso2v1)",
-                            org.bouncycastle.util.*;version="[1.49.0.wso2v2, 1.50.0.wso2v1)",
-                            org.bouncycastle.pqc.*;version="[1.49.0.wso2v2, 1.50.0.wso2v1)",
-                            org.bouncycastle.ocsp.*;version="[1.49.0.wso2v2, 1.50.0.wso2v1)",
-                            org.bouncycastle.math.*;version="[1.49.0.wso2v2, 1.50.0.wso2v1)",
-                            org.bouncycastle.jce.*;version="[1.49.0.wso2v2, 1.50.0.wso2v1)",
-                            org.bouncycastle.jcajce.*;version="[1.49.0.wso2v2, 1.50.0.wso2v1)",
-                            org.bouncycastle.i18n.*;version="[1.49.0.wso2v2, 1.50.0.wso2v1)",
-                            org.bouncycastle.crypto.*;version="[1.49.0.wso2v2, 1.50.0.wso2v1)",
-                            org.bouncycastle.asn1.*;version="[1.49.0.wso2v2, 1.50.0.wso2v1)"
+                            org.bouncycastle.x509.*;version="${imp.pkg.version.range.bcprov}",
+                            org.bouncycastle.util.*;version="${imp.pkg.version.range.bcprov}",
+                            org.bouncycastle.pqc.*;version="${imp.pkg.version.range.bcprov}",
+                            org.bouncycastle.ocsp.*;version="${imp.pkg.version.range.bcprov}",
+                            org.bouncycastle.math.*;version="${imp.pkg.version.range.bcprov}",
+                            org.bouncycastle.jce.*;version="${imp.pkg.version.range.bcprov}",
+                            org.bouncycastle.jcajce.*;version="${imp.pkg.version.range.bcprov}",
+                            org.bouncycastle.i18n.*;version="${imp.pkg.version.range.bcprov}",
+                            org.bouncycastle.crypto.*;version="${imp.pkg.version.range.bcprov}",
+                            org.bouncycastle.asn1.*;version="${imp.pkg.version.range.bcprov}"
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                         <Embed-Dependency>bcpkix-jdk15on;scope=compile|runtime;inline=false
@@ -146,6 +146,7 @@
 
     <properties>
         <exp.pkg.version.bcpkix>1.49.0.wso2v2</exp.pkg.version.bcpkix>
+        <imp.pkg.version.range.bcprov>[1.49.0.wso2v2, 1.50.0.wso2v1)</imp.pkg.version.range.bcprov>
     </properties>
 
 </project>
diff --git a/commons-io/2.4.0.wso2v1/pom.xml b/commons-io/2.4.0.wso2v1/pom.xml
@@ -62,6 +62,7 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.4</version>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

diff --git a/jscep/2.0.2.wso2v2/pom.xml b/jscep/2.0.2.wso2v2/pom.xml
@@ -58,11 +58,6 @@
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.4</version>
-        </dependency>
         <dependency>
             <groupId>com.google.code.jscep</groupId>
             <artifactId>jscep</artifactId>
@@ -89,8 +84,6 @@
                             !org.jscep.*,
                             *;resolution:=optional
                         </Import-Package>
-                        <Private-Package>
-                        </Private-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
                 </configuration>