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
Roberto-Gentili committed Oct 19, 2023
1 parent 22272f0 commit 623d900
Show file tree
Hide file tree
Showing 2 changed files with 308 additions and 309 deletions.
308 changes: 92 additions & 216 deletions java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,61 +24,23 @@
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER DEALINGS IN THE SOFTWARE.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>io.github.toolfactory</groupId>
<parent>
<groupId>io.github.toolfactory</groupId>
<artifactId>jvm-driver-parent</artifactId>
<version>${revision}</version>
</parent>

<artifactId>jvm-driver</artifactId>
<version>9.5.0-SNAPSHOT</version>

<packaging>jar</packaging>

<name>ToolFactory JVM Driver</name>
<description>
A driver to allow deep interaction with the JVM without any restrictions
</description>
<url>https://toolfactory.github.io/jvm-driver/</url>

<licenses>
<license>
<name>MIT License</name>
<url>https://github.com/toolfactory/jvm-driver/blob/master/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>

<organization>
<name>ToolFactory</name>
<url>https://github.com/toolfactory</url>
</organization>

<developers>
<developer>
<name>Luke Hutchison</name>
<id>lukehutch</id>
<email>[email protected]</email>
<organization>ToolFactory</organization>
<organizationUrl>https://github.com/toolfactory</organizationUrl>
<roles>
<role>Administrator</role>
<role>Developer</role>
</roles>
</developer>
<developer>
<name>Roberto Gentili</name>
<id>roberto.gentili</id>
<email>[email protected]</email>
<organization>ToolFactory</organization>
<organizationUrl>https://github.com/toolfactory</organizationUrl>
<roles>
<role>Administrator</role>
<role>Developer</role>
</roles>
</developer>
</developers>
<packaging>bundle</packaging>

<properties>
<copyright.holder>Luke Hutchison, Roberto Gentili</copyright.holder>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project_jdk_version>7</project_jdk_version>
Expand All @@ -87,27 +49,17 @@
<project.test.testSuite>AllTestsSuite</project.test.testSuite>
<project.test.includes>**/${project.test.testSuite}.java</project.test.includes>
<project.test.excludes>**/*Test.java</project.test.excludes>
<repository.url>https://[email protected]/toolfactory/jvm-driver.git</repository.url>

<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
<junit-jupiter.version>5.10.0</junit-jupiter.version>
<junit.version>1.10.0</junit.version>
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
<maven-bundle-plugin.version>
<maven-compiler->5.1.9</maven-bundle-plugin.version>
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<maven-jxr-plugin.version>3.1.1</maven-jxr-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-scm-provider-gitexe.version>1.9.5</maven-scm-provider-gitexe.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<narcissus.version>1.0.7</narcissus.version>
<nexus-staging-maven-plugin.version>1.6.12</nexus-staging-maven-plugin.version>
</properties>

<issueManagement>
Expand Down Expand Up @@ -218,10 +170,18 @@
</phase>
<configuration>
<target>
<copy file="${project.basedir}/../java-hook/bin/java/lang/ConsulterRetrieverForJDK9.class" tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/function/catalog/ConsulterRetrieverForJDK9.bwc" />
<copy file="${project.basedir}/../java-hook/bin/java/lang/reflect/AccessibleSetterInvokerForJDK9.class" tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/function/catalog/AccessibleSetterInvokerForJDK9.bwc" />
<copy file="${project.basedir}/../java-hook/bin/jdk/internal/loader/ClassLoaderDelegateForJDK9.class" tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/util/ClassLoaderDelegateForJDK9.bwc" />
<copy file="${project.basedir}/../java-hook/bin/io/github/toolfactory/jvm/function/catalog/ThrowExceptionFunction$ForJava7.class" tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/function/catalog/ThrowExceptionFunction$ForJava7.class" />
<copy
file="${project.basedir}/../java-hook/bin/java/lang/ConsulterRetrieverForJDK9.class"
tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/function/catalog/ConsulterRetrieverForJDK9.bwc" />
<copy
file="${project.basedir}/../java-hook/bin/java/lang/reflect/AccessibleSetterInvokerForJDK9.class"
tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/function/catalog/AccessibleSetterInvokerForJDK9.bwc" />
<copy
file="${project.basedir}/../java-hook/bin/jdk/internal/loader/ClassLoaderDelegateForJDK9.class"
tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/util/ClassLoaderDelegateForJDK9.bwc" />
<copy
file="${project.basedir}/../java-hook/bin/io/github/toolfactory/jvm/function/catalog/ThrowExceptionFunction$ForJava7.class"
tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/function/catalog/ThrowExceptionFunction$ForJava7.class" />
</target>
</configuration>
</execution>
Expand All @@ -233,8 +193,11 @@
</goals>
<configuration>
<target>
<jar update="true" destfile="${project.build.directory}/${project.build.finalName}.jar">
<zipfileset prefix="META-INF/versions/9" dir="${project.build.directory}/classes" includes="module-info.class" />
<jar update="true"
destfile="${project.build.directory}/${project.build.finalName}.jar">
<zipfileset prefix="META-INF/versions/9"
dir="${project.build.directory}/classes"
includes="module-info.class" />
</jar>
</target>
</configuration>
Expand Down Expand Up @@ -306,9 +269,70 @@
</excludes>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
<manifestEntries>
<built-by>ToolFactory</built-by>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<configuration>
<excludes>
<exclude>**/*.class</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Previous OSGI data generation
<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>
<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>
Expand All @@ -319,6 +343,7 @@
<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 @@ -330,69 +355,6 @@
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
<configuration>
<localCheckout>true</localCheckout>
<pushChanges>true</pushChanges>
<mavenExecutorId>forked-path</mavenExecutorId>
<arguments>-Dgpg.passphrase="${gpg.passphrase}"</arguments>
<!-- <tagNameFormat>${project.artifactId}-${project.version}</tagNameFormat> -->
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>${maven-scm-provider-gitexe.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<!-- <stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes> -->
<serverId>ossrh</serverId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<configuration>
<excludes>
<exclude>**/*.class</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -415,90 +377,4 @@
</plugins>
</build>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>${maven-jxr-plugin.version}</version>
</plugin>
</plugins>
</reporting>

<profiles>
<!-- GPG Signature on release -->
<profile>
<id>release-sign-artifacts</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>run-coveralls</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<!-- Generate coveralls reports from CI server. -->
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>${coveralls-maven-plugin.version}</version>
<configuration>
<sourceDirectories>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
</sourceDirectories>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco-maven-plugin.version}</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
<configuration>
<excludes>
<exclude>**/*AccessibleSetterInvokerForJDK9.*</exclude>
<exclude>**/*ClassLoaderDelegateForJDK9.*</exclude>
<exclude>**/*ConsulterRetrieverForJDK9.*</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
</project>
Loading

0 comments on commit 623d900

Please sign in to comment.