Skip to content

H
h2database
提交 a6f19b41 authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov
浏览文件
操作

Update ASM for Java 11 support

上级 334f02bb
显示空白字符变更
内嵌 并排
正在显示 包含 33 行增加 和 33 行删除
h2/pom.xml
浏览文件 @ a6f19b41
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
<version>6.1</version> <version>7.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- END TEST DEPENDENCIES !--> <!-- END TEST DEPENDENCIES !-->
......
h2/src/tools/org/h2/build/Build.java
浏览文件 @ a6f19b41
...@@ -136,10 +136,10 @@ public class Build extends BuildBase { ...@@ -136,10 +136,10 @@ public class Build extends BuildBase {
public void coverage() { public void coverage() {
compile(); compile();
downloadTest(); downloadTest();
downloadUsingMaven("ext/org.jacoco.agent-0.8.0.jar", downloadUsingMaven("ext/org.jacoco.agent-0.8.2.jar",
"org.jacoco", "org.jacoco.agent", "0.8.0", "org.jacoco", "org.jacoco.agent", "0.8.2",
"f2748b949b5fc661e089e2eeef39891dfd10a7e5"); "1402427761df5c7601ff6e06280764833ed727b5");
try (ZipFile zipFile = new ZipFile(new File("ext/org.jacoco.agent-0.8.0.jar"))) { try (ZipFile zipFile = new ZipFile(new File("ext/org.jacoco.agent-0.8.2.jar"))) {
final Enumeration<? extends ZipEntry> e = zipFile.entries(); final Enumeration<? extends ZipEntry> e = zipFile.entries();
while (e.hasMoreElements()) { while (e.hasMoreElements()) {
final ZipEntry zipEntry = e.nextElement(); final ZipEntry zipEntry = e.nextElement();
...@@ -154,21 +154,21 @@ public class Build extends BuildBase { ...@@ -154,21 +154,21 @@ public class Build extends BuildBase {
} catch (IOException ex) { } catch (IOException ex) {
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
downloadUsingMaven("ext/org.jacoco.cli-0.8.0.jar", downloadUsingMaven("ext/org.jacoco.cli-0.8.2.jar",
"org.jacoco", "org.jacoco.cli", "0.8.0", "org.jacoco", "org.jacoco.cli", "0.8.2",
"69e55ba110e6ffa91d72ed3df8e09aecf043b0ab"); "9595c53358d0306900183b5a7e6a70c88171ab4c");
downloadUsingMaven("ext/org.jacoco.core-0.8.0.jar", downloadUsingMaven("ext/org.jacoco.core-0.8.2.jar",
"org.jacoco", "org.jacoco.core", "0.8.0", "org.jacoco", "org.jacoco.core", "0.8.2",
"cc2ebdc1da53665ec788903bad65ee64345e4455"); "977b33afe2344a9ee801fd3317c54d8e1f9d7a79");
downloadUsingMaven("ext/org.jacoco.report-0.8.0.jar", downloadUsingMaven("ext/org.jacoco.report-0.8.2.jar",
"org.jacoco", "org.jacoco.report", "0.8.0", "org.jacoco", "org.jacoco.report", "0.8.2",
"1bcab2a451f5a382bc674857c8f3f6d3fa52151d"); "50e133cdfd2d31ca5702b73615be70f801d3ae26");
downloadUsingMaven("ext/asm-commons-6.1.jar", downloadUsingMaven("ext/asm-commons-7.0.jar",
"org.ow2.asm", "asm-commons", "6.1", "org.ow2.asm", "asm-commons", "7.0",
"8a8d242d7ce00fc937a245fae5b65763d13f7cd1"); "478006d07b7c561ae3a92ddc1829bca81ae0cdd1");
downloadUsingMaven("ext/asm-tree-6.1.jar", downloadUsingMaven("ext/asm-tree-7.0.jar",
"org.ow2.asm", "asm-tree", "6.1", "org.ow2.asm", "asm-tree", "7.0",
"701262d4b9bcbdc2d4b80617e82db9a2b7f4f088"); "29bc62dcb85573af6e62e5b2d735ef65966c4180");
downloadUsingMaven("ext/args4j-2.33.jar", downloadUsingMaven("ext/args4j-2.33.jar",
"args4j", "args4j", "2.33", "args4j", "args4j", "2.33",
"bd87a75374a6d6523de82fef51fc3cfe9baf9fc9"); "bd87a75374a6d6523de82fef51fc3cfe9baf9fc9");
...@@ -204,12 +204,12 @@ public class Build extends BuildBase { ...@@ -204,12 +204,12 @@ public class Build extends BuildBase {
delete(files("coverage/bin/org/h2/sample")); delete(files("coverage/bin/org/h2/sample"));
// Generate report // Generate report
execJava(args("-cp", execJava(args("-cp",
"ext/org.jacoco.cli-0.8.0.jar" + File.pathSeparator "ext/org.jacoco.cli-0.8.2.jar" + File.pathSeparator
+ "ext/org.jacoco.core-0.8.0.jar" + File.pathSeparator + "ext/org.jacoco.core-0.8.2.jar" + File.pathSeparator
+ "ext/org.jacoco.report-0.8.0.jar" + File.pathSeparator + "ext/org.jacoco.report-0.8.2.jar" + File.pathSeparator
+ "ext/asm-6.1.jar" + File.pathSeparator + "ext/asm-7.0.jar" + File.pathSeparator
+ "ext/asm-commons-6.1.jar" + File.pathSeparator + "ext/asm-commons-7.0.jar" + File.pathSeparator
+ "ext/asm-tree-6.1.jar" + File.pathSeparator + "ext/asm-tree-7.0.jar" + File.pathSeparator
+ "ext/args4j-2.33.jar", + "ext/args4j-2.33.jar",
"org.jacoco.cli.internal.Main", "report", "coverage/jacoco.exec", "org.jacoco.cli.internal.Main", "report", "coverage/jacoco.exec",
"--classfiles", "coverage/bin", "--classfiles", "coverage/bin",
...@@ -269,7 +269,7 @@ public class Build extends BuildBase { ...@@ -269,7 +269,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
File.pathSeparator + "ext/jts-core-1.15.0.jar" + File.pathSeparator + "ext/jts-core-1.15.0.jar" +
File.pathSeparator + "ext/asm-6.1.jar" + File.pathSeparator + "ext/asm-7.0.jar" +
File.pathSeparator + javaToolsJar; File.pathSeparator + javaToolsJar;
FileList files; FileList files;
if (clientOnly) { if (clientOnly) {
...@@ -384,9 +384,9 @@ public class Build extends BuildBase { ...@@ -384,9 +384,9 @@ public class Build extends BuildBase {
downloadOrVerify("ext/junit-4.12.jar", downloadOrVerify("ext/junit-4.12.jar",
"junit", "junit", "4.12", "junit", "junit", "4.12",
"2973d150c0dc1fefe998f834810d68f278ea58ec", offline); "2973d150c0dc1fefe998f834810d68f278ea58ec", offline);
downloadUsingMaven("ext/asm-6.1.jar", downloadUsingMaven("ext/asm-7.0.jar",
"org.ow2.asm", "asm", "6.1", "org.ow2.asm", "asm", "7.0",
"94a0d17ba8eb24833cd54253ace9b053786a9571"); "d74d4ba0dee443f68fb2dcb7fcdb945a2cd89912");
} }
private void downloadOrVerify(String target, String group, String artifact, private void downloadOrVerify(String target, String group, String artifact,
...@@ -669,7 +669,7 @@ public class Build extends BuildBase { ...@@ -669,7 +669,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
File.pathSeparator + "ext/jts-core-1.15.0.jar" + File.pathSeparator + "ext/jts-core-1.15.0.jar" +
File.pathSeparator + "ext/asm-6.1.jar" + File.pathSeparator + "ext/asm-7.0.jar" +
File.pathSeparator + "ext/junit-4.12.jar", File.pathSeparator + "ext/junit-4.12.jar",
"-subpackages", "org.h2"); "-subpackages", "org.h2");
...@@ -704,7 +704,7 @@ public class Build extends BuildBase { ...@@ -704,7 +704,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" + File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
File.pathSeparator + "ext/jts-core-1.15.0.jar" + File.pathSeparator + "ext/jts-core-1.15.0.jar" +
File.pathSeparator + "ext/asm-6.1.jar" + File.pathSeparator + "ext/asm-7.0.jar" +
File.pathSeparator + "ext/junit-4.12.jar", File.pathSeparator + "ext/junit-4.12.jar",
"-subpackages", "org.h2", "-subpackages", "org.h2",
"-package", "-package",
...@@ -967,7 +967,7 @@ public class Build extends BuildBase { ...@@ -967,7 +967,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/jts-core-1.15.0.jar" + File.pathSeparator + "ext/jts-core-1.15.0.jar" +
File.pathSeparator + "ext/slf4j-api-1.6.0.jar" + File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
File.pathSeparator + "ext/slf4j-nop-1.6.0.jar" + File.pathSeparator + "ext/slf4j-nop-1.6.0.jar" +
File.pathSeparator + "ext/asm-6.1.jar" + File.pathSeparator + "ext/asm-7.0.jar" +
File.pathSeparator + javaToolsJar; File.pathSeparator + javaToolsJar;
int version = getJavaVersion(); int version = getJavaVersion();
if (version >= 9) { if (version >= 9) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论