aboutsummaryrefslogtreecommitdiffstats
path: root/poi-excelant
diff options
context:
space:
mode:
authorAndreas Beeker <kiwiwings@apache.org>2021-09-01 22:32:48 +0000
committerAndreas Beeker <kiwiwings@apache.org>2021-09-01 22:32:48 +0000
commit5c6493a5fc76f2e11441d39af05e3f3208283896 (patch)
treea6e806672bf04201688e641e10a23ca9d712ef18 /poi-excelant
parent7adf9c26b799f1323f77a5c80f463b5fe2a7f2a6 (diff)
downloadpoi-5c6493a5fc76f2e11441d39af05e3f3208283896.tar.gz
poi-5c6493a5fc76f2e11441d39af05e3f3208283896.zip
try to fix no-scratchpad build
remove or set-to-static scratchpad dependency from modules git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1892795 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poi-excelant')
-rw-r--r--poi-excelant/build.gradle7
-rw-r--r--poi-excelant/src/main/java9/module-info.java1
-rw-r--r--poi-excelant/src/test/java9/module-info.java1
3 files changed, 3 insertions, 6 deletions
diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index ee7cd664c0..e22a80f1f2 100644
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -38,14 +38,13 @@ dependencies {
api 'org.apache.ant:ant:1.10.9'
api project(':poi-ooxml')
- api project(':poi-scratchpad')
api project(path: ':poi-ooxml', configuration: 'archives')
- api project(path: ':poi-scratchpad', configuration: 'archives')
testImplementation project(path: ':poi-ooxml-lite-agent', configuration: 'archives')
testImplementation project(path: ':poi', configuration: 'tests')
- testImplementation project(path: ':poi-ooxml', configuration: 'tests')
- testImplementation project(path: ':poi-scratchpad', configuration: 'tests')
+ testImplementation(project(path: ':poi-ooxml', configuration: 'tests')) {
+ exclude group: 'org.apache.poi', module: 'poi-scratchpad'
+ }
testImplementation 'com.google.guava:guava:30.0-jre'
testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1'
}
diff --git a/poi-excelant/src/main/java9/module-info.java b/poi-excelant/src/main/java9/module-info.java
index 43b64560a7..743b172ad1 100644
--- a/poi-excelant/src/main/java9/module-info.java
+++ b/poi-excelant/src/main/java9/module-info.java
@@ -19,7 +19,6 @@ module org.apache.poi.excelant {
requires ant;
requires org.apache.poi.ooxml;
- requires org.apache.poi.scratchpad;
exports org.apache.poi.ss.excelant;
exports org.apache.poi.ss.excelant.util;
diff --git a/poi-excelant/src/test/java9/module-info.java b/poi-excelant/src/test/java9/module-info.java
index a26d9bd04d..97c40ae4b6 100644
--- a/poi-excelant/src/test/java9/module-info.java
+++ b/poi-excelant/src/test/java9/module-info.java
@@ -19,7 +19,6 @@ module org.apache.poi.excelant {
requires ant;
requires org.apache.poi.ooxml;
- requires org.apache.poi.scratchpad;
exports org.apache.poi.ss.excelant;
exports org.apache.poi.ss.excelant.util;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 08:51:37 +0000
>this.query = query; this.x = x; } public <Q, Z> QueryWhere<T> in(SubQuery<Q, Z> q) { query.addConditionToken(new SubQueryCondition<A, Q, Z>(x, q)); return new QueryWhere<T>(query); } public QueryWhere<T> oneOf(A... a) { return oneOf(Utils.newArrayIterable(a)); } public QueryWhere<T> oneOf(Iterable<A> i) { query.addConditionToken(new Condition<A>(x, i, CompareType.IN)); return new QueryWhere<T>(query); } public QueryWhere<T> noneOf(A... a) { return noneOf(Utils.newArrayIterable(a)); } public QueryWhere<T> noneOf(Iterable<A> i) { query.addConditionToken(new Condition<A>(x, i, CompareType.NOT_IN)); return new QueryWhere<T>(query); } public QueryWhere<T> is(A y) { query.addConditionToken(new Condition<A>(x, y, CompareType.EQUAL)); return new QueryWhere<T>(query); } public QueryWhere<T> isNot(A y) { query.addConditionToken(new Condition<A>(x, y, CompareType.NOT_EQUAL)); return new QueryWhere<T>(query); } public QueryWhere<T> isNull() { query.addConditionToken(new Condition<A>(x, CompareType.IS_NULL)); return new QueryWhere<T>(query); } public QueryWhere<T> isNotNull() { query.addConditionToken(new Condition<A>(x, CompareType.IS_NOT_NULL)); return new QueryWhere<T>(query); } public QueryWhere<T> exceeds(A y) { query.addConditionToken(new Condition<A>(x, y, CompareType.EXCEEDS)); return new QueryWhere<T>(query); } public QueryWhere<T> atLeast(A y) { query.addConditionToken(new Condition<A>(x, y, CompareType.AT_LEAST)); return new QueryWhere<T>(query); } public QueryWhere<T> lessThan(A y) { query.addConditionToken(new Condition<A>(x, y, CompareType.LESS_THAN)); return new QueryWhere<T>(query); } public QueryWhere<T> atMost(A y) { query.addConditionToken(new Condition<A>(x, y, CompareType.AT_MOST)); return new QueryWhere<T>(query); } public QueryBetween<T, A> between(A y) { return new QueryBetween<T, A>(query, x, y); } public QueryWhere<T> like(A pattern) { query.addConditionToken(new Condition<A>(x, pattern, CompareType.LIKE)); return new QueryWhere<T>(query); } /* * These method allows you to generate "x=?", "x!=?", etc where conditions. * Parameter substitution must be done manually later with db.executeQuery. * This allows for building re-usable SQL string statements from your model * classes. */ public QueryWhere<T> isParameter() { query.addConditionToken(new RuntimeParameter<A>(x, CompareType.EQUAL)); return new QueryWhere<T>(query); } public QueryWhere<T> isNotParameter() { query.addConditionToken(new RuntimeParameter<A>(x, CompareType.NOT_EQUAL)); return new QueryWhere<T>(query); } public QueryWhere<T> exceedsParameter() { query.addConditionToken(new RuntimeParameter<A>(x, CompareType.EXCEEDS)); return new QueryWhere<T>(query); } public QueryWhere<T> lessThanParameter() { query.addConditionToken(new RuntimeParameter<A>(x, CompareType.LESS_THAN)); return new QueryWhere<T>(query); } public QueryWhere<T> atMostParameter() { query.addConditionToken(new RuntimeParameter<A>(x, CompareType.AT_MOST)); return new QueryWhere<T>(query); } public QueryWhere<T> likeParameter() { query.addConditionToken(new RuntimeParameter<A>(x, CompareType.LIKE)); return new QueryWhere<T>(query); } }