Skip to content

Commit 13613f0

Browse files
Roberto-GentiliRoberto-Gentili
committed
Prepare for next development iteration
1 parent b38cb49 commit 13613f0

File tree

2 files changed

+226
-226
lines changed

2 files changed

+226
-226
lines changed

‎java/pom.xml

Lines changed: 29 additions & 196 deletions
Original file line numberDiff line numberDiff line change
@@ -24,61 +24,23 @@
2424
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
2525
OR OTHER DEALINGS IN THE SOFTWARE.
2626
-->
27-
<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">
27+
<project xmlns="http://maven.apache.org/POM/4.0.0"
28+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
29+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2830
<modelVersion>4.0.0</modelVersion>
2931

30-
<groupId>io.github.toolfactory</groupId>
32+
<parent>
33+
<groupId>io.github.toolfactory</groupId>
34+
<artifactId>jvm-driver-parent</artifactId>
35+
<version>${revision}</version>
36+
</parent>
37+
3138
<artifactId>jvm-driver</artifactId>
3239
<version>9.4.4-SNAPSHOT</version>
3340

3441
<packaging>jar</packaging>
3542

36-
<name>ToolFactory JVM Driver</name>
37-
<description>
38-
A driver to allow deep interaction with the JVM without any restrictions
39-
</description>
40-
<url>https://toolfactory.github.io/jvm-driver/</url>
41-
42-
<licenses>
43-
<license>
44-
<name>MIT License</name>
45-
<url>https://github.com/toolfactory/jvm-driver/blob/master/LICENSE</url>
46-
<distribution>repo</distribution>
47-
</license>
48-
</licenses>
49-
50-
<organization>
51-
<name>ToolFactory</name>
52-
<url>https://github.com/toolfactory</url>
53-
</organization>
54-
55-
<developers>
56-
<developer>
57-
<name>Luke Hutchison</name>
58-
<id>lukehutch</id>
59-
<email>[email protected]</email>
60-
<organization>ToolFactory</organization>
61-
<organizationUrl>https://github.com/toolfactory</organizationUrl>
62-
<roles>
63-
<role>Administrator</role>
64-
<role>Developer</role>
65-
</roles>
66-
</developer>
67-
<developer>
68-
<name>Roberto Gentili</name>
69-
<id>roberto.gentili</id>
70-
<email>[email protected]</email>
71-
<organization>ToolFactory</organization>
72-
<organizationUrl>https://github.com/toolfactory</organizationUrl>
73-
<roles>
74-
<role>Administrator</role>
75-
<role>Developer</role>
76-
</roles>
77-
</developer>
78-
</developers>
79-
8043
<properties>
81-
<copyright.holder>Luke Hutchison, Roberto Gentili</copyright.holder>
8244
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
8345
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8446
<project_jdk_version>7</project_jdk_version>
@@ -87,25 +49,16 @@
8749
<project.test.testSuite>AllTestsSuite</project.test.testSuite>
8850
<project.test.includes>**/${project.test.testSuite}.java</project.test.includes>
8951
<project.test.excludes>**/*Test.java</project.test.excludes>
90-
<repository.url>https://[email protected]/toolfactory/jvm-driver.git</repository.url>
9152

92-
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
93-
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
9453
<junit-jupiter.version>5.9.1</junit-jupiter.version>
9554
<junit.version>1.9.1</junit.version>
9655
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
9756
<maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
98-
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
99-
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
10057
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
101-
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
102-
<maven-jxr-plugin.version>3.1.1</maven-jxr-plugin.version>
103-
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
58+
<maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
10459
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
105-
<maven-scm-provider-gitexe.version>1.9.5</maven-scm-provider-gitexe.version>
10660
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
10761
<narcissus.version>1.0.7</narcissus.version>
108-
<nexus-staging-maven-plugin.version>1.6.12</nexus-staging-maven-plugin.version>
10962
</properties>
11063

11164
<issueManagement>
@@ -216,10 +169,18 @@
216169
</phase>
217170
<configuration>
218171
<target>
219-
<copy file="${project.basedir}/../java-hook/bin/java/lang/ConsulterRetrieverForJDK9.class" tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/function/catalog/ConsulterRetrieverForJDK9.bwc" />
220-
<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" />
221-
<copy file="${project.basedir}/../java-hook/bin/jdk/internal/loader/ClassLoaderDelegateForJDK9.class" tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/util/ClassLoaderDelegateForJDK9.bwc" />
222-
<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" />
172+
<copy
173+
file="${project.basedir}/../java-hook/bin/java/lang/ConsulterRetrieverForJDK9.class"
174+
tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/function/catalog/ConsulterRetrieverForJDK9.bwc" />
175+
<copy
176+
file="${project.basedir}/../java-hook/bin/java/lang/reflect/AccessibleSetterInvokerForJDK9.class"
177+
tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/function/catalog/AccessibleSetterInvokerForJDK9.bwc" />
178+
<copy
179+
file="${project.basedir}/../java-hook/bin/jdk/internal/loader/ClassLoaderDelegateForJDK9.class"
180+
tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/util/ClassLoaderDelegateForJDK9.bwc" />
181+
<copy
182+
file="${project.basedir}/../java-hook/bin/io/github/toolfactory/jvm/function/catalog/ThrowExceptionFunction$ForJava7.class"
183+
tofile="${project.build.directory}/classes/io/github/toolfactory/jvm/function/catalog/ThrowExceptionFunction$ForJava7.class" />
223184
</target>
224185
</configuration>
225186
</execution>
@@ -231,8 +192,11 @@
231192
</goals>
232193
<configuration>
233194
<target>
234-
<jar update="true" destfile="${project.build.directory}/${project.build.finalName}.jar">
235-
<zipfileset prefix="META-INF/versions/9" dir="${project.build.directory}/classes" includes="module-info.class" />
195+
<jar update="true"
196+
destfile="${project.build.directory}/${project.build.finalName}.jar">
197+
<zipfileset prefix="META-INF/versions/9"
198+
dir="${project.build.directory}/classes"
199+
includes="module-info.class" />
236200
</jar>
237201
</target>
238202
</configuration>
@@ -319,58 +283,13 @@
319283
<Bundle-Description>${project.description}</Bundle-Description>
320284
<Bundle-Version>${project.version}</Bundle-Version>
321285
<Require-Capability>osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.7))"</Require-Capability>
322-
<Import-Package>io.github.toolfactory.narcissus;version="1.0.7",com.sun.management,jdk.internal.reflect;resolution:=optional,sun.misc;resolution:=optional,sun.reflect;resolution:=optional</Import-Package>
286+
<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>
323287
<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>
324288
<Multi-Release>true</Multi-Release>
325289
</manifestEntries>
326290
</archive>
327291
</configuration>
328292
</plugin>
329-
<plugin>
330-
<artifactId>maven-deploy-plugin</artifactId>
331-
<version>${maven-deploy-plugin.version}</version>
332-
<executions>
333-
<execution>
334-
<id>default-deploy</id>
335-
<phase>deploy</phase>
336-
<goals>
337-
<goal>deploy</goal>
338-
</goals>
339-
</execution>
340-
</executions>
341-
</plugin>
342-
343-
<plugin>
344-
<groupId>org.apache.maven.plugins</groupId>
345-
<artifactId>maven-release-plugin</artifactId>
346-
<version>${maven-release-plugin.version}</version>
347-
<configuration>
348-
<localCheckout>true</localCheckout>
349-
<pushChanges>true</pushChanges>
350-
<mavenExecutorId>forked-path</mavenExecutorId>
351-
<arguments>-Dgpg.passphrase="${gpg.passphrase}"</arguments>
352-
<!-- <tagNameFormat>${project.artifactId}-${project.version}</tagNameFormat> -->
353-
</configuration>
354-
<dependencies>
355-
<dependency>
356-
<groupId>org.apache.maven.scm</groupId>
357-
<artifactId>maven-scm-provider-gitexe</artifactId>
358-
<version>${maven-scm-provider-gitexe.version}</version>
359-
</dependency>
360-
</dependencies>
361-
</plugin>
362-
<plugin>
363-
<groupId>org.sonatype.plugins</groupId>
364-
<artifactId>nexus-staging-maven-plugin</artifactId>
365-
<version>${nexus-staging-maven-plugin.version}</version>
366-
<extensions>true</extensions>
367-
<configuration>
368-
<!-- <stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes> -->
369-
<serverId>ossrh</serverId>
370-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
371-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
372-
</configuration>
373-
</plugin>
374293
<plugin>
375294
<groupId>org.apache.maven.plugins</groupId>
376295
<artifactId>maven-source-plugin</artifactId>
@@ -411,90 +330,4 @@
411330
</plugins>
412331
</build>
413332

414-
<reporting>
415-
<plugins>
416-
<plugin>
417-
<groupId>org.apache.maven.plugins</groupId>
418-
<artifactId>maven-jxr-plugin</artifactId>
419-
<version>${maven-jxr-plugin.version}</version>
420-
</plugin>
421-
</plugins>
422-
</reporting>
423-
424-
<profiles>
425-
<!-- GPG Signature on release -->
426-
<profile>
427-
<id>release-sign-artifacts</id>
428-
<activation>
429-
<property>
430-
<name>performRelease</name>
431-
<value>true</value>
432-
</property>
433-
</activation>
434-
<build>
435-
<plugins>
436-
<plugin>
437-
<groupId>org.apache.maven.plugins</groupId>
438-
<artifactId>maven-gpg-plugin</artifactId>
439-
<version>${maven-gpg-plugin.version}</version>
440-
<executions>
441-
<execution>
442-
<phase>verify</phase>
443-
<goals>
444-
<goal>sign</goal>
445-
</goals>
446-
<configuration>
447-
<gpgArguments>
448-
<arg>--pinentry-mode</arg>
449-
<arg>loopback</arg>
450-
</gpgArguments>
451-
</configuration>
452-
</execution>
453-
</executions>
454-
</plugin>
455-
</plugins>
456-
</build>
457-
</profile>
458-
<profile>
459-
<id>run-coveralls</id>
460-
<activation>
461-
<activeByDefault>false</activeByDefault>
462-
</activation>
463-
<build>
464-
<plugins>
465-
<!-- Generate coveralls reports from CI server. -->
466-
<plugin>
467-
<groupId>org.eluder.coveralls</groupId>
468-
<artifactId>coveralls-maven-plugin</artifactId>
469-
<version>${coveralls-maven-plugin.version}</version>
470-
<configuration>
471-
<sourceDirectories>
472-
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
473-
</sourceDirectories>
474-
</configuration>
475-
</plugin>
476-
<plugin>
477-
<groupId>org.jacoco</groupId>
478-
<artifactId>jacoco-maven-plugin</artifactId>
479-
<version>${jacoco-maven-plugin.version}</version>
480-
<executions>
481-
<execution>
482-
<id>prepare-agent</id>
483-
<goals>
484-
<goal>prepare-agent</goal>
485-
</goals>
486-
</execution>
487-
</executions>
488-
<configuration>
489-
<excludes>
490-
<exclude>**/*AccessibleSetterInvokerForJDK9.*</exclude>
491-
<exclude>**/*ClassLoaderDelegateForJDK9.*</exclude>
492-
<exclude>**/*ConsulterRetrieverForJDK9.*</exclude>
493-
</excludes>
494-
</configuration>
495-
</plugin>
496-
</plugins>
497-
</build>
498-
</profile>
499-
</profiles>
500-
</project>
333+
</project>

0 commit comments

Comments
 (0)