Skip to content

Commit

Permalink
OSGI data fix. Releasing new version
Browse files Browse the repository at this point in the history
  • Loading branch information
Roberto-Gentili committed Oct 19, 2023
1 parent 0ecdc70 commit 1dea431
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 55 deletions.
66 changes: 28 additions & 38 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<artifactId>jvm-driver</artifactId>
<version>9.5.1-SNAPSHOT</version>

<packaging>bundle</packaging>
<packaging>jar</packaging>

<properties>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
Expand Down Expand Up @@ -297,49 +297,23 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
<excludes>
<exclude>module-info.class</exclude>
<exclude>jdk/</exclude>
<exclude>java/</exclude>
<exclude>META-INF/maven/</exclude>
</excludes>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<!-- Previous OSGI data generation
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
<manifestEntries>
<Bundle-Category>Utilities</Bundle-Category>
<built-by>ToolFactory</built-by>
<Bundle-License>https://github.com/toolfactory/jvm-driver/blob/master/LICENSE</Bundle-License>
<Bundle-ManifestVersion>2</Bundle-ManifestVersion>
<Bundle-Name>JVM Driver</Bundle-Name>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>ToolFactory</Bundle-Vendor>
<Bundle-Description>${project.description}</Bundle-Description>
<Bundle-Version>${project.version}</Bundle-Version>
<Require-Capability>osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.7))"</Require-Capability>
<Import-Package>io.github.toolfactory.narcissus;version="${narcissus.version}",com.sun.management,jdk.internal.reflect;resolution:=optional,sun.misc;resolution:=optional,sun.reflect;resolution:=optional</Import-Package>
<Export-Package>io.github.toolfactory.jvm;uses:="io.github.toolfactory.jvm.function.catalog,io.github.toolfactory.jvm.util,io.github.toolfactory.jvm.function.template";version="8.9.4",io.github.toolfactory.jvm.util;uses:="io.github.toolfactory.jvm.function.template,io.github.toolfactory.jvm";version="8.9.4",io.github.toolfactory.jvm.function.template;version="8.9.4",io.github.toolfactory.jvm.function.catalog;uses:="io.github.toolfactory.jvm.util,sun.misc,io.github.toolfactory.jvm.function,io.github.toolfactory.narcissus,io.github.toolfactory.jvm.function.template,io.github.toolfactory.jvm";version="8.9.4",io.github.toolfactory.jvm.function;version="8.9.4"</Export-Package>
<Multi-Release>true</Multi-Release>
</manifestEntries>
-->
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<id>generate-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration>
<instructions>
<manifestLocation>${project.build.outputDirectory}/META-INF/</manifestLocation>
<instructions>
<Bundle-Category>Utilities</Bundle-Category>
<built-by>ToolFactory</built-by>
<Bundle-License>https://github.com/toolfactory/jvm-driver/blob/master/LICENSE</Bundle-License>
Expand All @@ -355,6 +329,22 @@
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
<excludes>
<exclude>module-info.class</exclude>
<exclude>jdk/</exclude>
<exclude>java/</exclude>
<exclude>META-INF/maven/</exclude>
</excludes>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
46 changes: 29 additions & 17 deletions java/sa-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<groupId>io.github.toolfactory</groupId>
<artifactId>jvm-driver</artifactId>
<version>9.5.1-SNAPSHOT</version>
<version>9.6.0-SNAPSHOT</version>

<packaging>jar</packaging>

Expand Down Expand Up @@ -293,31 +293,27 @@
<useModulePath>false</useModulePath>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
<excludes>
<exclude>module-info.class</exclude>
<exclude>jdk/</exclude>
<exclude>java/</exclude>
<exclude>META-INF/maven/</exclude>
</excludes>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<id>generate-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration>
<instructions>
<manifestLocation>${project.build.outputDirectory}/META-INF/</manifestLocation>
<instructions>
<Bundle-Category>Utilities</Bundle-Category>
<built-by>ToolFactory</built-by>
<Bundle-License>https://github.com/toolfactory/jvm-driver/blob/master/LICENSE</Bundle-License>
<Bundle-ManifestVersion>2</Bundle-ManifestVersion>
<Bundle-Name>JVM Driver</Bundle-Name>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>ToolFactory</Bundle-Vendor>
Expand All @@ -329,6 +325,22 @@
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
<excludes>
<exclude>module-info.class</exclude>
<exclude>jdk/</exclude>
<exclude>java/</exclude>
<exclude>META-INF/maven/</exclude>
</excludes>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
Expand Down

0 comments on commit 1dea431

Please sign in to comment.