From cbbe739c811b5c6fa6cdc38a4c040f2bde5a6ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Thu, 8 Feb 2018 11:18:45 +0100 Subject: [PATCH] bump dependency versions, clean subproject structure --- build.gradle | 19 +++++---- {cql => cql-common}/build.gradle | 0 .../config/checkstyle/checkstyle.xml | 0 .../config/checkstyle/suppressions.xml | 0 .../src/main/jacc/org/xbib/cql/CQL.jacc | 0 .../main/java/org/xbib/cql/AbstractNode.java | 0 .../main/java/org/xbib/cql/BooleanGroup.java | 0 .../java/org/xbib/cql/BooleanOperator.java | 0 .../main/java/org/xbib/cql/CQLGenerator.java | 0 .../main/java/org/xbib/cql/Comparitor.java | 0 .../main/java/org/xbib/cql/Identifier.java | 0 .../src/main/java/org/xbib/cql/Index.java | 0 .../src/main/java/org/xbib/cql/Modifier.java | 0 .../main/java/org/xbib/cql/ModifierList.java | 0 .../src/main/java/org/xbib/cql/Node.java | 0 .../java/org/xbib/cql/PrefixAssignment.java | 0 .../src/main/java/org/xbib/cql/Query.java | 0 .../main/java/org/xbib/cql/QueryFacet.java | 0 .../main/java/org/xbib/cql/QueryFilter.java | 0 .../main/java/org/xbib/cql/QueryOption.java | 0 .../src/main/java/org/xbib/cql/Relation.java | 0 .../main/java/org/xbib/cql/ScopedClause.java | 0 .../main/java/org/xbib/cql/SearchClause.java | 0 .../main/java/org/xbib/cql/SimpleName.java | 0 .../main/java/org/xbib/cql/SingleSpec.java | 0 .../src/main/java/org/xbib/cql/SortSpec.java | 0 .../main/java/org/xbib/cql/SortedQuery.java | 0 .../java/org/xbib/cql/SyntaxException.java | 0 .../src/main/java/org/xbib/cql/Term.java | 0 .../src/main/java/org/xbib/cql/Visitor.java | 0 .../org/xbib/cql/model/CQLQueryModel.java | 0 .../main/java/org/xbib/cql/model/Facet.java | 0 .../main/java/org/xbib/cql/model/Filter.java | 0 .../main/java/org/xbib/cql/model/Option.java | 0 .../breadcrumb/FacetBreadcrumbTrail.java | 0 .../breadcrumb/FilterBreadcrumbTrail.java | 0 .../breadcrumb/OptionBreadcrumbTrail.java | 0 .../cql/model/breadcrumb/package-info.java | 0 .../java/org/xbib/cql/model/package-info.java | 0 .../main/java/org/xbib/cql/package-info.java | 0 .../org/xbib/cql/util/QueryStringDecoder.java | 0 .../xbib/cql/util/QuotedStringTokenizer.java | 0 .../UnterminatedQuotedStringException.java | 0 .../java/org/xbib/cql/util/package-info.java | 0 .../src/main/jflex/org/xbib/cql/CQL.jflex | 0 .../src/test/java/org/xbib/cql/QueryTest.java | 0 .../test/java/org/xbib/cql/package-info.java | 0 .../cql/util/QuotedStringTokenizerTest.java | 0 .../java/org/xbib/cql/util/package-info.java | 0 .../src/test/resources/log4j2.xml | 0 .../test/resources/org/xbib/cql/queries.txt | 0 cql-elasticsearch/build.gradle | 4 +- gradle.properties | 7 +++- gradle/publish.gradle | 37 +++++++++++++++++- gradle/wrapper/gradle-wrapper.jar | Bin 54333 -> 54333 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- settings.gradle | 3 +- 57 files changed, 56 insertions(+), 18 deletions(-) rename {cql => cql-common}/build.gradle (100%) rename {cql => cql-common}/config/checkstyle/checkstyle.xml (100%) rename {cql => cql-common}/config/checkstyle/suppressions.xml (100%) rename {cql => cql-common}/src/main/jacc/org/xbib/cql/CQL.jacc (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/AbstractNode.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/BooleanGroup.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/BooleanOperator.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/CQLGenerator.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/Comparitor.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/Identifier.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/Index.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/Modifier.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/ModifierList.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/Node.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/PrefixAssignment.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/Query.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/QueryFacet.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/QueryFilter.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/QueryOption.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/Relation.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/ScopedClause.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/SearchClause.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/SimpleName.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/SingleSpec.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/SortSpec.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/SortedQuery.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/SyntaxException.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/Term.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/Visitor.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/model/CQLQueryModel.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/model/Facet.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/model/Filter.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/model/Option.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/model/breadcrumb/FacetBreadcrumbTrail.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/model/breadcrumb/FilterBreadcrumbTrail.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/model/breadcrumb/OptionBreadcrumbTrail.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/model/breadcrumb/package-info.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/model/package-info.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/package-info.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/util/QueryStringDecoder.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/util/QuotedStringTokenizer.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/util/UnterminatedQuotedStringException.java (100%) rename {cql => cql-common}/src/main/java/org/xbib/cql/util/package-info.java (100%) rename {cql => cql-common}/src/main/jflex/org/xbib/cql/CQL.jflex (100%) rename {cql => cql-common}/src/test/java/org/xbib/cql/QueryTest.java (100%) rename {cql => cql-common}/src/test/java/org/xbib/cql/package-info.java (100%) rename {cql => cql-common}/src/test/java/org/xbib/cql/util/QuotedStringTokenizerTest.java (100%) rename {cql => cql-common}/src/test/java/org/xbib/cql/util/package-info.java (100%) rename {cql => cql-common}/src/test/resources/log4j2.xml (100%) rename {cql => cql-common}/src/test/resources/org/xbib/cql/queries.txt (100%) diff --git a/build.gradle b/build.gradle index cde898c..fbd45cb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { id "org.sonarqube" version '2.6.1' - id "org.xbib.gradle.plugin.asciidoctor" version "1.5.4.1.0" id "io.codearte.nexus-staging" version "0.11.0" + id "org.xbib.gradle.plugin.asciidoctor" version "1.5.6.0.1" } -printf "Host: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGroovy: %s\nGradle: %s\n" + +printf "Host: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGradle: %s Groovy: %s Java: %s\n" + "Build: group: ${project.group} name: ${project.name} version: ${project.version}\n", InetAddress.getLocalHost(), System.getProperty("os.name"), @@ -14,8 +14,9 @@ printf "Host: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGroovy: %s\nGradle: %s\n" + System.getProperty("java.vm.version"), System.getProperty("java.vm.vendor"), System.getProperty("java.vm.name"), + gradle.gradleVersion, GroovySystem.getVersion(), - gradle.gradleVersion + JavaVersion.current() apply plugin: 'java' apply plugin: 'org.xbib.gradle.plugin.asciidoctor' @@ -25,7 +26,7 @@ configurations { } dependencies { - asciidoclet 'org.asciidoctor:asciidoclet:1.5.4' + asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}" } asciidoctor { @@ -70,8 +71,8 @@ subprojects { } dependencies { - testCompile 'junit:junit:4.12' - wagon 'org.apache.maven.wagon:wagon-ssh:2.12' + testCompile "junit:junit:${project.property('junit.version')}" + wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}" } sourceCompatibility = JavaVersion.VERSION_1_8 @@ -93,12 +94,15 @@ subprojects { classifier 'sources' from sourceSets.main.allSource } + task javadocJar(type: Jar, dependsOn: javadoc) { classifier 'javadoc' } + artifacts { archives sourcesJar, javadocJar } + if (project.hasProperty('signing.keyId')) { signing { sign configurations.archives @@ -108,5 +112,4 @@ subprojects { apply from: "${rootProject.projectDir}/gradle/ext.gradle" apply from: "${rootProject.projectDir}/gradle/publish.gradle" apply from: "${rootProject.projectDir}/gradle/sonarqube.gradle" - -} \ No newline at end of file +} diff --git a/cql/build.gradle b/cql-common/build.gradle similarity index 100% rename from cql/build.gradle rename to cql-common/build.gradle diff --git a/cql/config/checkstyle/checkstyle.xml b/cql-common/config/checkstyle/checkstyle.xml similarity index 100% rename from cql/config/checkstyle/checkstyle.xml rename to cql-common/config/checkstyle/checkstyle.xml diff --git a/cql/config/checkstyle/suppressions.xml b/cql-common/config/checkstyle/suppressions.xml similarity index 100% rename from cql/config/checkstyle/suppressions.xml rename to cql-common/config/checkstyle/suppressions.xml diff --git a/cql/src/main/jacc/org/xbib/cql/CQL.jacc b/cql-common/src/main/jacc/org/xbib/cql/CQL.jacc similarity index 100% rename from cql/src/main/jacc/org/xbib/cql/CQL.jacc rename to cql-common/src/main/jacc/org/xbib/cql/CQL.jacc diff --git a/cql/src/main/java/org/xbib/cql/AbstractNode.java b/cql-common/src/main/java/org/xbib/cql/AbstractNode.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/AbstractNode.java rename to cql-common/src/main/java/org/xbib/cql/AbstractNode.java diff --git a/cql/src/main/java/org/xbib/cql/BooleanGroup.java b/cql-common/src/main/java/org/xbib/cql/BooleanGroup.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/BooleanGroup.java rename to cql-common/src/main/java/org/xbib/cql/BooleanGroup.java diff --git a/cql/src/main/java/org/xbib/cql/BooleanOperator.java b/cql-common/src/main/java/org/xbib/cql/BooleanOperator.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/BooleanOperator.java rename to cql-common/src/main/java/org/xbib/cql/BooleanOperator.java diff --git a/cql/src/main/java/org/xbib/cql/CQLGenerator.java b/cql-common/src/main/java/org/xbib/cql/CQLGenerator.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/CQLGenerator.java rename to cql-common/src/main/java/org/xbib/cql/CQLGenerator.java diff --git a/cql/src/main/java/org/xbib/cql/Comparitor.java b/cql-common/src/main/java/org/xbib/cql/Comparitor.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/Comparitor.java rename to cql-common/src/main/java/org/xbib/cql/Comparitor.java diff --git a/cql/src/main/java/org/xbib/cql/Identifier.java b/cql-common/src/main/java/org/xbib/cql/Identifier.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/Identifier.java rename to cql-common/src/main/java/org/xbib/cql/Identifier.java diff --git a/cql/src/main/java/org/xbib/cql/Index.java b/cql-common/src/main/java/org/xbib/cql/Index.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/Index.java rename to cql-common/src/main/java/org/xbib/cql/Index.java diff --git a/cql/src/main/java/org/xbib/cql/Modifier.java b/cql-common/src/main/java/org/xbib/cql/Modifier.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/Modifier.java rename to cql-common/src/main/java/org/xbib/cql/Modifier.java diff --git a/cql/src/main/java/org/xbib/cql/ModifierList.java b/cql-common/src/main/java/org/xbib/cql/ModifierList.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/ModifierList.java rename to cql-common/src/main/java/org/xbib/cql/ModifierList.java diff --git a/cql/src/main/java/org/xbib/cql/Node.java b/cql-common/src/main/java/org/xbib/cql/Node.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/Node.java rename to cql-common/src/main/java/org/xbib/cql/Node.java diff --git a/cql/src/main/java/org/xbib/cql/PrefixAssignment.java b/cql-common/src/main/java/org/xbib/cql/PrefixAssignment.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/PrefixAssignment.java rename to cql-common/src/main/java/org/xbib/cql/PrefixAssignment.java diff --git a/cql/src/main/java/org/xbib/cql/Query.java b/cql-common/src/main/java/org/xbib/cql/Query.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/Query.java rename to cql-common/src/main/java/org/xbib/cql/Query.java diff --git a/cql/src/main/java/org/xbib/cql/QueryFacet.java b/cql-common/src/main/java/org/xbib/cql/QueryFacet.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/QueryFacet.java rename to cql-common/src/main/java/org/xbib/cql/QueryFacet.java diff --git a/cql/src/main/java/org/xbib/cql/QueryFilter.java b/cql-common/src/main/java/org/xbib/cql/QueryFilter.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/QueryFilter.java rename to cql-common/src/main/java/org/xbib/cql/QueryFilter.java diff --git a/cql/src/main/java/org/xbib/cql/QueryOption.java b/cql-common/src/main/java/org/xbib/cql/QueryOption.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/QueryOption.java rename to cql-common/src/main/java/org/xbib/cql/QueryOption.java diff --git a/cql/src/main/java/org/xbib/cql/Relation.java b/cql-common/src/main/java/org/xbib/cql/Relation.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/Relation.java rename to cql-common/src/main/java/org/xbib/cql/Relation.java diff --git a/cql/src/main/java/org/xbib/cql/ScopedClause.java b/cql-common/src/main/java/org/xbib/cql/ScopedClause.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/ScopedClause.java rename to cql-common/src/main/java/org/xbib/cql/ScopedClause.java diff --git a/cql/src/main/java/org/xbib/cql/SearchClause.java b/cql-common/src/main/java/org/xbib/cql/SearchClause.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/SearchClause.java rename to cql-common/src/main/java/org/xbib/cql/SearchClause.java diff --git a/cql/src/main/java/org/xbib/cql/SimpleName.java b/cql-common/src/main/java/org/xbib/cql/SimpleName.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/SimpleName.java rename to cql-common/src/main/java/org/xbib/cql/SimpleName.java diff --git a/cql/src/main/java/org/xbib/cql/SingleSpec.java b/cql-common/src/main/java/org/xbib/cql/SingleSpec.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/SingleSpec.java rename to cql-common/src/main/java/org/xbib/cql/SingleSpec.java diff --git a/cql/src/main/java/org/xbib/cql/SortSpec.java b/cql-common/src/main/java/org/xbib/cql/SortSpec.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/SortSpec.java rename to cql-common/src/main/java/org/xbib/cql/SortSpec.java diff --git a/cql/src/main/java/org/xbib/cql/SortedQuery.java b/cql-common/src/main/java/org/xbib/cql/SortedQuery.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/SortedQuery.java rename to cql-common/src/main/java/org/xbib/cql/SortedQuery.java diff --git a/cql/src/main/java/org/xbib/cql/SyntaxException.java b/cql-common/src/main/java/org/xbib/cql/SyntaxException.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/SyntaxException.java rename to cql-common/src/main/java/org/xbib/cql/SyntaxException.java diff --git a/cql/src/main/java/org/xbib/cql/Term.java b/cql-common/src/main/java/org/xbib/cql/Term.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/Term.java rename to cql-common/src/main/java/org/xbib/cql/Term.java diff --git a/cql/src/main/java/org/xbib/cql/Visitor.java b/cql-common/src/main/java/org/xbib/cql/Visitor.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/Visitor.java rename to cql-common/src/main/java/org/xbib/cql/Visitor.java diff --git a/cql/src/main/java/org/xbib/cql/model/CQLQueryModel.java b/cql-common/src/main/java/org/xbib/cql/model/CQLQueryModel.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/model/CQLQueryModel.java rename to cql-common/src/main/java/org/xbib/cql/model/CQLQueryModel.java diff --git a/cql/src/main/java/org/xbib/cql/model/Facet.java b/cql-common/src/main/java/org/xbib/cql/model/Facet.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/model/Facet.java rename to cql-common/src/main/java/org/xbib/cql/model/Facet.java diff --git a/cql/src/main/java/org/xbib/cql/model/Filter.java b/cql-common/src/main/java/org/xbib/cql/model/Filter.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/model/Filter.java rename to cql-common/src/main/java/org/xbib/cql/model/Filter.java diff --git a/cql/src/main/java/org/xbib/cql/model/Option.java b/cql-common/src/main/java/org/xbib/cql/model/Option.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/model/Option.java rename to cql-common/src/main/java/org/xbib/cql/model/Option.java diff --git a/cql/src/main/java/org/xbib/cql/model/breadcrumb/FacetBreadcrumbTrail.java b/cql-common/src/main/java/org/xbib/cql/model/breadcrumb/FacetBreadcrumbTrail.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/model/breadcrumb/FacetBreadcrumbTrail.java rename to cql-common/src/main/java/org/xbib/cql/model/breadcrumb/FacetBreadcrumbTrail.java diff --git a/cql/src/main/java/org/xbib/cql/model/breadcrumb/FilterBreadcrumbTrail.java b/cql-common/src/main/java/org/xbib/cql/model/breadcrumb/FilterBreadcrumbTrail.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/model/breadcrumb/FilterBreadcrumbTrail.java rename to cql-common/src/main/java/org/xbib/cql/model/breadcrumb/FilterBreadcrumbTrail.java diff --git a/cql/src/main/java/org/xbib/cql/model/breadcrumb/OptionBreadcrumbTrail.java b/cql-common/src/main/java/org/xbib/cql/model/breadcrumb/OptionBreadcrumbTrail.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/model/breadcrumb/OptionBreadcrumbTrail.java rename to cql-common/src/main/java/org/xbib/cql/model/breadcrumb/OptionBreadcrumbTrail.java diff --git a/cql/src/main/java/org/xbib/cql/model/breadcrumb/package-info.java b/cql-common/src/main/java/org/xbib/cql/model/breadcrumb/package-info.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/model/breadcrumb/package-info.java rename to cql-common/src/main/java/org/xbib/cql/model/breadcrumb/package-info.java diff --git a/cql/src/main/java/org/xbib/cql/model/package-info.java b/cql-common/src/main/java/org/xbib/cql/model/package-info.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/model/package-info.java rename to cql-common/src/main/java/org/xbib/cql/model/package-info.java diff --git a/cql/src/main/java/org/xbib/cql/package-info.java b/cql-common/src/main/java/org/xbib/cql/package-info.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/package-info.java rename to cql-common/src/main/java/org/xbib/cql/package-info.java diff --git a/cql/src/main/java/org/xbib/cql/util/QueryStringDecoder.java b/cql-common/src/main/java/org/xbib/cql/util/QueryStringDecoder.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/util/QueryStringDecoder.java rename to cql-common/src/main/java/org/xbib/cql/util/QueryStringDecoder.java diff --git a/cql/src/main/java/org/xbib/cql/util/QuotedStringTokenizer.java b/cql-common/src/main/java/org/xbib/cql/util/QuotedStringTokenizer.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/util/QuotedStringTokenizer.java rename to cql-common/src/main/java/org/xbib/cql/util/QuotedStringTokenizer.java diff --git a/cql/src/main/java/org/xbib/cql/util/UnterminatedQuotedStringException.java b/cql-common/src/main/java/org/xbib/cql/util/UnterminatedQuotedStringException.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/util/UnterminatedQuotedStringException.java rename to cql-common/src/main/java/org/xbib/cql/util/UnterminatedQuotedStringException.java diff --git a/cql/src/main/java/org/xbib/cql/util/package-info.java b/cql-common/src/main/java/org/xbib/cql/util/package-info.java similarity index 100% rename from cql/src/main/java/org/xbib/cql/util/package-info.java rename to cql-common/src/main/java/org/xbib/cql/util/package-info.java diff --git a/cql/src/main/jflex/org/xbib/cql/CQL.jflex b/cql-common/src/main/jflex/org/xbib/cql/CQL.jflex similarity index 100% rename from cql/src/main/jflex/org/xbib/cql/CQL.jflex rename to cql-common/src/main/jflex/org/xbib/cql/CQL.jflex diff --git a/cql/src/test/java/org/xbib/cql/QueryTest.java b/cql-common/src/test/java/org/xbib/cql/QueryTest.java similarity index 100% rename from cql/src/test/java/org/xbib/cql/QueryTest.java rename to cql-common/src/test/java/org/xbib/cql/QueryTest.java diff --git a/cql/src/test/java/org/xbib/cql/package-info.java b/cql-common/src/test/java/org/xbib/cql/package-info.java similarity index 100% rename from cql/src/test/java/org/xbib/cql/package-info.java rename to cql-common/src/test/java/org/xbib/cql/package-info.java diff --git a/cql/src/test/java/org/xbib/cql/util/QuotedStringTokenizerTest.java b/cql-common/src/test/java/org/xbib/cql/util/QuotedStringTokenizerTest.java similarity index 100% rename from cql/src/test/java/org/xbib/cql/util/QuotedStringTokenizerTest.java rename to cql-common/src/test/java/org/xbib/cql/util/QuotedStringTokenizerTest.java diff --git a/cql/src/test/java/org/xbib/cql/util/package-info.java b/cql-common/src/test/java/org/xbib/cql/util/package-info.java similarity index 100% rename from cql/src/test/java/org/xbib/cql/util/package-info.java rename to cql-common/src/test/java/org/xbib/cql/util/package-info.java diff --git a/cql/src/test/resources/log4j2.xml b/cql-common/src/test/resources/log4j2.xml similarity index 100% rename from cql/src/test/resources/log4j2.xml rename to cql-common/src/test/resources/log4j2.xml diff --git a/cql/src/test/resources/org/xbib/cql/queries.txt b/cql-common/src/test/resources/org/xbib/cql/queries.txt similarity index 100% rename from cql/src/test/resources/org/xbib/cql/queries.txt rename to cql-common/src/test/resources/org/xbib/cql/queries.txt diff --git a/cql-elasticsearch/build.gradle b/cql-elasticsearch/build.gradle index d671853..ab28d5c 100644 --- a/cql-elasticsearch/build.gradle +++ b/cql-elasticsearch/build.gradle @@ -1,4 +1,4 @@ dependencies { - compile project(':cql') + compile project(':cql-common') compile "org.xbib:content-core:${project.property('xbib-content.version')}" -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 026cbbd..47aedc0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,8 @@ group = org.xbib name = cql -version = 1.1.1 +version = 1.2.0 -xbib-content.version = 1.2.4 +xbib-content.version = 1.3.0 +junit.version = 4.12 +wagon.version = 3.0.0 +asciidoclet.version = 1.5.4 diff --git a/gradle/publish.gradle b/gradle/publish.gradle index dc6328c..b6678b6 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -1,5 +1,6 @@ task xbibUpload(type: Upload, dependsOn: build) { + group = 'publish' configuration = configurations.archives uploadDescriptor = true repositories { @@ -9,12 +10,45 @@ task xbibUpload(type: Upload, dependsOn: build) { repository(url: uri('sftp://xbib.org/repository')) { authentication(userName: xbibUsername, privateKey: xbibPrivateKey) } - } + pom.project { + groupId project.group + artifactId project.name + version project.version + name project.name + description projectDescription + packaging 'jar' + inceptionYear '2016' + url scmUrl + organization { + name 'xbib' + url 'http://xbib.org' + } + developers { + developer { + id user + name 'Jörg Prante' + email 'joergprante@gmail.com' + url 'https://github.com/jprante' + } + } + scm { + url scmUrl + connection scmConnection + developerConnection scmDeveloperConnection + } + licenses { + license { + name 'The Apache License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + } } } } } task sonatypeUpload(type: Upload, dependsOn: build) { + group = 'publish' configuration = configurations.archives uploadDescriptor = true repositories { @@ -65,7 +99,6 @@ task sonatypeUpload(type: Upload, dependsOn: build) { } } - nexusStaging { packageGroup = "org.xbib" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 99340b4ad18d3c7e764794d300ffd35017036793..c44b679acd3f794ddbb3aa5e919244914911014a 100644 GIT binary patch delta 67 zcmdnHf_d)><_YF3^<10PCt62xypsG>^s$JMVS?1gZT}APTs3B42=Hd-&|;n)KKZ~Q Tf3UjE!iVn(uz-cWUiJV0iuD?> delta 67 zcmdnHf_d)><_YF3rx}klPPC5Xcp>?z=wlHh!vv{~+x{KoxoFJ75a7+uA)6T)Hu=CI Tf3UjE!iVn(uz-cWUiJV0zM~v6 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 15328f7..20572e7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Feb 06 16:03:05 CET 2018 +#Thu Feb 08 11:11:10 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip diff --git a/settings.gradle b/settings.gradle index 216ff77..78274c0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,3 @@ -rootProject.name = 'cql-main' -include 'cql' +include 'cql-common' include 'cql-elasticsearch'