You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by da...@apache.org on 2011/05/20 15:33:46 UTC
svn commit: r1125377 - in /aries/trunk/spi-fly: spi-fly-core-old/
spi-fly-static-tool/pom.xml
spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java
Author: davidb
Date: Fri May 20 13:33:46 2011
New Revision: 1125377
URL: http://svn.apache.org/viewvc?rev=1125377&view=rev
Log:
Generate a jar with dependencies for the static tool.
Also fixed the generated import version range in the treated jar
and removed the spi-fly-core-old tree.
Removed:
aries/trunk/spi-fly/spi-fly-core-old/
Modified:
aries/trunk/spi-fly/spi-fly-static-tool/pom.xml
aries/trunk/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java
Modified: aries/trunk/spi-fly/spi-fly-static-tool/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-tool/pom.xml?rev=1125377&r1=1125376&r2=1125377&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-tool/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-static-tool/pom.xml Fri May 20 13:33:46 2011
@@ -55,17 +55,20 @@
<build>
<plugins>
+
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>org.apache.aries.spifly.statictool.Main</mainClass>
</manifest>
</archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</project>
Modified: aries/trunk/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java?rev=1125377&r1=1125376&r2=1125377&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java (original)
+++ aries/trunk/spi-fly/spi-fly-static-tool/src/main/java/org/apache/aries/spifly/statictool/Main.java Fri May 20 13:33:46 2011
@@ -44,6 +44,7 @@ import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
import org.osgi.framework.Constants;
+import org.osgi.framework.Version;
public class Main {
private static final String MODIFIED_BUNDLE_SUFFIX = "_spifly.jar";
@@ -100,15 +101,20 @@ public class Main {
private static void extendImportPackage(Manifest manifest) throws IOException {
String utilPkgVersion = getPackageVersion(Util.class);
+ Version osgiVersion = Version.parseVersion(utilPkgVersion);
+
+ Version minVersion = new Version(osgiVersion.getMajor(), osgiVersion.getMinor(), osgiVersion.getMicro());
+ Version maxVersion = new Version(osgiVersion.getMajor(), osgiVersion.getMinor() + 1, 0);
+
String ip = manifest.getMainAttributes().getValue(IMPORT_PACKAGE);
StringBuilder sb = new StringBuilder(ip);
sb.append(",");
sb.append(Util.class.getPackage().getName());
sb.append(";version=\"[");
- sb.append(utilPkgVersion);
+ sb.append(minVersion);
sb.append(",");
- sb.append(utilPkgVersion);
- sb.append("]\"");
+ sb.append(maxVersion);
+ sb.append(")\"");
manifest.getMainAttributes().putValue(IMPORT_PACKAGE, sb.toString());
}