Skip to content

Commit e8364a6

Browse files
committed
Fix build issues and document
bnd-maven-plugin version 7.0.0 required Java 17 or later, however we still need to support building on Java 11 and testing on Java 8, downgraded to version 6.4.0 Added missing build instructions from README.md Updated references to asm libraries in qa tests.
1 parent 7aec93d commit e8364a6

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

JGDMS/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
<plugin>
190190
<groupId>biz.aQute.bnd</groupId>
191191
<artifactId>bnd-maven-plugin</artifactId>
192-
<version>7.0.0</version>
192+
<version>6.4.0</version>
193193
</plugin>
194194
<plugin>
195195
<groupId>org.apache.maven.plugins</groupId>

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ $mvn -f JGDMS/pom.xml test
1010

1111
After successfully testing the above, integration and regression tests can be run by:
1212

13+
$export JSK_HOME= /* path to current directory or set this property in build.properties*/
14+
1315
$ cd qa
1416

17+
$ ant build
18+
1519
$ ant run-all
1620

1721
$ ant jtreg

common.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@
145145
</path>
146146

147147
<fileset id="asm.jars" dir="${root}/JGDMS/dist/target/JGDMS-3.1.1-SNAPSHOT/lib">
148-
<include name="asm-9.5.jar" />
149-
<include name="asm-commons-9.5.jar" />
148+
<include name="asm-9.7.jar" />
149+
<include name="asm-commons-9.7.jar" />
150150
</fileset>
151151

152152
<path id="groovy.jars">

qa/build.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
<file name="classdep-${jgdms.version}.jar"/>
218218
<file name="classserver-${jgdms.version}.jar"/>
219219
<file name="asm-*.jar"/>
220-
<!--<file name="asm-commons-7.3.1.jar"/>-->
220+
<!--<file name="asm-commons-9.7.jar"/>-->
221221
<file name="high-scale-lib-*.jar"/>
222222
<file name="jgdms-activation-${jgdms.version}.jar"/>
223223
<file name="jgdms-activation-parameters-${jgdms.version}.jar"/>
@@ -241,7 +241,7 @@
241241
reportdir="${jtreg.dir}/JTreport" workdir="${jtreg.dir}/JTwork"
242242
jdk="${jdk.home}">
243243
<!--<arg value="-Dpolicy.provider=net.jini.security.policy.DynamicPolicyProvider"/>-->
244-
<arg value="-cpa:${jtlib.tmp}/jgdms-collections-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-iiop-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-jeri-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-lib-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-lib-dl-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-platform-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-pref-class-loader-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-url-integrity-${jgdms.version}.jar${path.separator}${jtlib.tmp}/classdep-${jgdms.version}.jar${path.separator}${jtlib.tmp}/classserver-${jgdms.version}.jar${path.separator}${jtlib.tmp}/asm-7.3.1.jar${path.separator}${jtlib.tmp}/asm-commons-7.3.1.jar${path.separator}${jtlib.tmp}/high-scale-lib-1.0.6.jar${path.separator}${jtlib.tmp}/jgdms-activation-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-activation-parameters-${jgdms.version}.jar${path.separator}${jtlib.tmp}/checkconfigurationfile-${jgdms.version}.jar${path.separator}${jtlib.tmp}/phoenix-dl-${jgdms.version}.jar"/>
244+
<arg value="-cpa:${jtlib.tmp}/jgdms-collections-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-iiop-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-jeri-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-lib-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-lib-dl-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-platform-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-pref-class-loader-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-url-integrity-${jgdms.version}.jar${path.separator}${jtlib.tmp}/classdep-${jgdms.version}.jar${path.separator}${jtlib.tmp}/classserver-${jgdms.version}.jar${path.separator}${jtlib.tmp}/asm-9.7.jar${path.separator}${jtlib.tmp}/asm-commons-9.7.jar${path.separator}${jtlib.tmp}/high-scale-lib-1.0.6.jar${path.separator}${jtlib.tmp}/jgdms-activation-${jgdms.version}.jar${path.separator}${jtlib.tmp}/jgdms-activation-parameters-${jgdms.version}.jar${path.separator}${jtlib.tmp}/checkconfigurationfile-${jgdms.version}.jar${path.separator}${jtlib.tmp}/phoenix-dl-${jgdms.version}.jar"/>
245245
<arg value="-timeout:16"/>
246246
<arg value="-Djtlib.tmp=${jtlib.tmp}"/>
247247
<arg value="-Djtreg.dir=${jtreg.dir}"/>
@@ -305,7 +305,7 @@
305305
<file name="classdep-${jgdms.version}.jar"/>
306306
<file name="classserver-${jgdms.version}.jar"/>
307307
<file name="asm-*.jar"/>
308-
<!--<file name="asm-commons-7.3.1.jar"/>-->
308+
<!--<file name="asm-commons-9.7.jar"/>-->
309309
<file name="high-scale-lib-*.jar"/>
310310
<file name="jgdms-activation-${jgdms.version}.jar"/>
311311
<file name="jgdms-activation-parameters-${jgdms.version}.jar"/>
@@ -345,7 +345,7 @@
345345
<file name="classdep-${jgdms.version}.jar"/>
346346
<file name="classserver-${jgdms.version}.jar"/>
347347
<file name="asm-*.jar"/>
348-
<!--<file name="asm-commons-7.3.1.jar"/>-->
348+
<!--<file name="asm-commons-9.7.jar"/>-->
349349
<file name="high-scale-lib-*.jar"/>
350350
<file name="jgdms-activation-${jgdms.version}.jar"/>
351351
<file name="jgdms-activation-parameters-${jgdms.version}.jar"/>
@@ -437,8 +437,8 @@
437437
<include name="classdep-${jgdms.version}.jar"/>
438438
<include name="classserver-${jgdms.version}.jar"/>
439439
<include name="service-starter-${jgdms.version}.jar"/>
440-
<include name="asm-7.3.1.jar"/>
441-
<include name="asm-commons-7.3.1.jar"/>
440+
<include name="asm-9.7.jar"/>
441+
<include name="asm-commons-9.7.jar"/>
442442
<include name="high-scale-lib-1.0.6.jar"/>
443443
<include name="bcprov-jdk15on-1.59.jar"/>
444444
<include name="bctls-jdk15on-1.59.jar"/>

0 commit comments

Comments
 (0)