Skip to content

H
h2database
提交 8c9faf7a authored 作者: Erwan Bocher's avatar Erwan Bocher
浏览文件
操作

update JTS 1.13 to JTS 1.14.0

上级 3d253279
隐藏空白字符变更
内嵌 并排
正在显示 包含 12 行增加 和 12 行删除
h2/src/main/META-INF/MANIFEST.MF
浏览文件 @ 8c9faf7a
...@@ -31,8 +31,8 @@ Import-Package: javax.management, ...@@ -31,8 +31,8 @@ Import-Package: javax.management,
org.apache.lucene.search;version="[3.0.0,3.1.0)";resolution:=optional, org.apache.lucene.search;version="[3.0.0,3.1.0)";resolution:=optional,
org.apache.lucene.store;version="[3.0.0,3.1.0)";resolution:=optional, org.apache.lucene.store;version="[3.0.0,3.1.0)";resolution:=optional,
org.apache.lucene.util;version="[3.0.0,3.1.0)";resolution:=optional, org.apache.lucene.util;version="[3.0.0,3.1.0)";resolution:=optional,
com.vividsolutions.jts.geom;version="1.13";resolution:=optional, com.vividsolutions.jts.geom;version="1.14.0";resolution:=optional,
com.vividsolutions.jts.io;version="1.13";resolution:=optional, com.vividsolutions.jts.io;version="1.14.0";resolution:=optional,
org.h2;version="[${version},1.5.0)", org.h2;version="[${version},1.5.0)",
org.h2.api;version="[${version},1.5.0)", org.h2.api;version="[${version},1.5.0)",
org.h2.fulltext;version="[${version},1.5.0)", org.h2.fulltext;version="[${version},1.5.0)",
......
h2/src/tools/org/h2/build/Build.java
浏览文件 @ 8c9faf7a
...@@ -125,7 +125,7 @@ public class Build extends BuildBase { ...@@ -125,7 +125,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/h2mig_pagestore_addon.jar" + File.pathSeparator + "ext/h2mig_pagestore_addon.jar" +
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-1.13.jar" + File.pathSeparator + "ext/jts-core-1.14.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 + System.getProperty("java.home") + File.pathSeparator + System.getProperty("java.home") +
...@@ -203,7 +203,7 @@ public class Build extends BuildBase { ...@@ -203,7 +203,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/slf4j-api-1.6.0.jar" + File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
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-1.13.jar" + File.pathSeparator + "ext/jts-core-1.14.0.jar" +
File.pathSeparator + System.getProperty("java.home") + "/../lib/tools.jar"; File.pathSeparator + System.getProperty("java.home") + "/../lib/tools.jar";
FileList files; FileList files;
if (clientOnly) { if (clientOnly) {
...@@ -302,8 +302,8 @@ public class Build extends BuildBase { ...@@ -302,8 +302,8 @@ public class Build extends BuildBase {
downloadOrVerify("ext/org.osgi.enterprise-4.2.0.jar", downloadOrVerify("ext/org.osgi.enterprise-4.2.0.jar",
"org/osgi", "org.osgi.enterprise", "4.2.0", "org/osgi", "org.osgi.enterprise", "4.2.0",
"8634dcb0fc62196e820ed0f1062993c377f74972", offline); "8634dcb0fc62196e820ed0f1062993c377f74972", offline);
downloadOrVerify("ext/jts-1.13.jar", downloadOrVerify("ext/jts-core-1.14.0.jar",
"com/vividsolutions", "jts", "1.13", "com/vividsolutions", "jts-core", "1.14.0",
"3ccfb9b60f04d71add996a666ceb8902904fd805", offline); "3ccfb9b60f04d71add996a666ceb8902904fd805", offline);
} }
...@@ -576,7 +576,7 @@ public class Build extends BuildBase { ...@@ -576,7 +576,7 @@ public class Build extends BuildBase {
"org.h2.tools", "org.h2.api", "org.h2.engine", "org.h2.fulltext", "org.h2.tools", "org.h2.api", "org.h2.engine", "org.h2.fulltext",
"-classpath", "-classpath",
"ext/lucene-core-3.0.2.jar" + "ext/lucene-core-3.0.2.jar" +
File.pathSeparator + "ext/jts-1.13.jar", File.pathSeparator + "ext/jts-core-1.14.0.jar",
"-docletpath", "bin" + File.pathSeparator + "temp", "-docletpath", "bin" + File.pathSeparator + "temp",
"-doclet", "org.h2.build.doclet.Doclet"); "-doclet", "org.h2.build.doclet.Doclet");
copy("docs/javadoc", files("src/docsrc/javadoc"), "src/docsrc/javadoc"); copy("docs/javadoc", files("src/docsrc/javadoc"), "src/docsrc/javadoc");
...@@ -601,7 +601,7 @@ public class Build extends BuildBase { ...@@ -601,7 +601,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/lucene-core-3.0.2.jar" + File.pathSeparator + "ext/lucene-core-3.0.2.jar" +
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-1.13.jar", File.pathSeparator + "ext/jts-core-1.14.0.jar",
"-subpackages", "org.h2", "-subpackages", "org.h2",
"-exclude", "org.h2.test.jaqu:org.h2.jaqu"); "-exclude", "org.h2.test.jaqu:org.h2.jaqu");
...@@ -617,7 +617,7 @@ public class Build extends BuildBase { ...@@ -617,7 +617,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/lucene-core-3.0.2.jar" + File.pathSeparator + "ext/lucene-core-3.0.2.jar" +
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-1.13.jar", File.pathSeparator + "ext/jts-core-1.14.0.jar",
"-subpackages", "org.h2.mvstore", "-subpackages", "org.h2.mvstore",
"-exclude", "org.h2.mvstore.db"); "-exclude", "org.h2.mvstore.db");
...@@ -633,7 +633,7 @@ public class Build extends BuildBase { ...@@ -633,7 +633,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/lucene-core-3.0.2.jar" + File.pathSeparator + "ext/lucene-core-3.0.2.jar" +
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-1.13.jar", File.pathSeparator + "ext/jts-core-1.14.0.jar",
"-subpackages", "org.h2", "-subpackages", "org.h2",
"-exclude", "org.h2.test.jaqu:org.h2.jaqu", "-exclude", "org.h2.test.jaqu:org.h2.jaqu",
"-package", "-package",
...@@ -847,7 +847,7 @@ public class Build extends BuildBase { ...@@ -847,7 +847,7 @@ public class Build extends BuildBase {
javadoc("-sourcepath", "src/main", "org.h2.tools", "org.h2.jmx", javadoc("-sourcepath", "src/main", "org.h2.tools", "org.h2.jmx",
"-classpath", "-classpath",
"ext/lucene-core-3.0.2.jar" + "ext/lucene-core-3.0.2.jar" +
File.pathSeparator + "ext/jts-1.13.jar", File.pathSeparator + "ext/jts-core-1.14.0.jar",
"-docletpath", "bin" + File.pathSeparator + "temp", "-docletpath", "bin" + File.pathSeparator + "temp",
"-doclet", "org.h2.build.doclet.ResourceDoclet"); "-doclet", "org.h2.build.doclet.ResourceDoclet");
} }
...@@ -897,7 +897,7 @@ public class Build extends BuildBase { ...@@ -897,7 +897,7 @@ public class Build extends BuildBase {
File.pathSeparator + "ext/h2mig_pagestore_addon.jar" + File.pathSeparator + "ext/h2mig_pagestore_addon.jar" +
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-1.13.jar" + File.pathSeparator + "ext/jts-core-1.14.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 + System.getProperty("java.home") + File.pathSeparator + System.getProperty("java.home") +
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论