You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/06/02 07:02:38 UTC
[lucene-solr] branch jira/SOLR-13452_gradle_3 updated (604b227 ->
8ea6509)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 604b227 SOLR-13452: Make task descriptions more consistent.
new 964f279 SOLR-13452: Remove errant tmp file.
new 6241e67 SOLR-13452: Make eclipse .settings dir in case it does not yet exist.
new dc510d6 SOLR-13452: Put build nori dict into regenerate tasks.
new b632c32 SOLR-13452: Use https repo urls.
new 1e07c53 SOLR-13452: Improve version specs for pdfbox.
new 8ea6509 SOLR-13452: Cannot use configureondemand and slf4j version is specified twice.
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
buildSrc/build.gradle | 2 -
buildSrc/common/configure-repositories.gradle | 11 ++---
buildSrc/ide/eclipse.gradle | 4 +-
gradle.properties | 4 +-
lucene/analysis/nori/build.gradle | 2 +-
solr/contrib/extraction/build.gradle.bak | 69 ---------------------------
versions.lock | 8 ++--
versions.props | 4 +-
8 files changed, 18 insertions(+), 86 deletions(-)
delete mode 100644 solr/contrib/extraction/build.gradle.bak
[lucene-solr] 05/06: SOLR-13452: Improve version specs for pdfbox.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 1e07c53ec991e145abc6a82dc7e751ebf280eac4
Author: markrmiller <ma...@apache.org>
AuthorDate: Sun Jun 2 01:30:01 2019 -0500
SOLR-13452: Improve version specs for pdfbox.
---
versions.lock | 8 ++++----
versions.props | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/versions.lock b/versions.lock
index 01059f6..8f9b652 100644
--- a/versions.lock
+++ b/versions.lock
@@ -122,11 +122,11 @@ org.apache.logging.log4j:log4j-api:2.11.2 (1 constraints: 3805343b)
org.apache.logging.log4j:log4j-core:2.11.2 (1 constraints: 3805343b)
org.apache.logging.log4j:log4j-slf4j-impl:2.11.2 (1 constraints: 3805343b)
org.apache.opennlp:opennlp-tools:1.9.1 (2 constraints: 6d11c4f2)
-org.apache.pdfbox:fontbox:2.0.12 (2 constraints: 4910d4c4)
-org.apache.pdfbox:jbig2-imageio:3.0.2 (1 constraints: 5c0ced01)
+org.apache.pdfbox:fontbox:2.0.15 (2 constraints: 4f1040c5)
+org.apache.pdfbox:jbig2-imageio:3.0.2 (2 constraints: 6211c7f1)
org.apache.pdfbox:jempbox:1.8.16 (2 constraints: d8119111)
-org.apache.pdfbox:pdfbox:2.0.12 (2 constraints: c211b30f)
-org.apache.pdfbox:pdfbox-tools:2.0.12 (2 constraints: c211b30f)
+org.apache.pdfbox:pdfbox:2.0.15 (2 constraints: c5112810)
+org.apache.pdfbox:pdfbox-tools:2.0.15 (2 constraints: c5112810)
org.apache.poi:poi:4.0.0 (4 constraints: dc28d830)
org.apache.poi:poi-ooxml:4.0.0 (2 constraints: 6011a8f1)
org.apache.poi:poi-ooxml-schemas:4.0.0 (2 constraints: cd0f45a7)
diff --git a/versions.props b/versions.props
index 52fcde2..a0e717e 100644
--- a/versions.props
+++ b/versions.props
@@ -69,8 +69,9 @@ org.apache.james:*=0.8.2
org.apache.kerby:*=1.0.1
org.apache.logging.log4j:*=2.11.2
org.apache.opennlp:opennlp-tools=1.9.1
-org.apache.pdfbox:*=2.0.12
+org.apache.pdfbox:jbig2-imageio=3.0.2
org.apache.pdfbox:jempbox=1.8.16
+org.apache.pdfbox:*=2.0.15
org.apache.poi:*=4.0.0
org.apache.tika:*=1.19.1
org.apache.velocity.tools:*=3.0
[lucene-solr] 06/06: SOLR-13452: Cannot use configureondemand and
slf4j version is specified twice.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 8ea6509787ca1732a262a147a10432b9fd1af3ff
Author: markrmiller <ma...@apache.org>
AuthorDate: Sun Jun 2 02:02:02 2019 -0500
SOLR-13452: Cannot use configureondemand and slf4j version is specified twice.
---
gradle.properties | 4 +++-
versions.props | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 5d74616..a2bb521 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,9 @@ org.gradle.parallel=true
# Default is number of CPU processors.
# org.gradle.workers.max=2
-org.gradle.configureondemand=true
+# experimental gradle feature - does not currently work with our version constraints plugin
+org.gradle.configureondemand=false
+
org.gradle.jvmargs=-Xmx1g
python_exe=python
\ No newline at end of file
diff --git a/versions.props b/versions.props
index a0e717e..6977a6a 100644
--- a/versions.props
+++ b/versions.props
@@ -108,7 +108,6 @@ org.restlet.jee:*=2.3.0
org.rrd4j:rrd4j=3.5
org.simpleframework:simple-xml=2.7.1
org.slf4j:*=1.7.24
-org.slf4j:*=1.7.24
org.tallison:jmatio=1.5
org.tukaani:xz=1.8
ua.net.nlp:morfologik-ukrainian-search=3.9.0
[lucene-solr] 01/06: SOLR-13452: Remove errant tmp file.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 964f279fdc5eea0241d9425478eb177f881202d3
Author: markrmiller <ma...@apache.org>
AuthorDate: Sat Jun 1 19:53:42 2019 -0500
SOLR-13452: Remove errant tmp file.
---
solr/contrib/extraction/build.gradle.bak | 69 --------------------------------
1 file changed, 69 deletions(-)
diff --git a/solr/contrib/extraction/build.gradle.bak b/solr/contrib/extraction/build.gradle.bak
deleted file mode 100644
index c55e693..0000000
--- a/solr/contrib/extraction/build.gradle.bak
+++ /dev/null
@@ -1,69 +0,0 @@
-apply plugin: 'java'
-
-dependencies {
-
- implementation 'org.slf4j:slf4j-api'
- implementation 'io.dropwizard.metrics:metrics-core'
- implementation 'commons-io:commons-io'
-
- compile library.tika_core
- compile library.tika_parsers
- compile library.tika_xmp
- compile library.tika_java7
- // Tika dependencies - see http://tika.apache.org/1.3/gettingstarted.html#Using_Tika_as_a_Maven_dependency
-
- //When upgrading Tika, upgrade dependencies versions and add any new ones
- // (except slf4j-api, commons-codec, commons-logging, commons-httpclient, geronimo-stax-api_1.0_spec, jcip-annotations, xml-apis, asm)
- // WARNING: Don't add netcdf / unidataCommon (partially LGPL code)
- compile library.jackcess
- compile library.jackcess_encrypt
- compile library.vorbis_java_tika
- compile library.vorbis_java_core
- compile library.apache_mime4j_core
- compile library.apache_mime4j_dom
- compile library.commons_compress
- compile library.pdfbox
- compile library.pdfbox_tools
- compile library.fontbox
- compile library.jempbox
- compile library.bcmail_jdk15on
- compile library.bcpkix_jdk15on
- compile library.bcprov_jdk15on
- compile library.poi
- compile library.poi_scratchpad
- compile library.poi_ooxml
- compile library.poi_ooxml_schemas
- compile library.xmlbeans
- compile library.commons_collections4
- compile library.curvesapi
- compile library.tagsoup
- compile library.isoparser
- compile library.aspectjrt
- compile library.metadata_extractor
- compile library.boilerpipe
- compile library.rome
- compile library.rome_utils
- compile library.jdom2
- compile library.juniversalchardet
- compile library.xz
- compile library.xmpcore
- compile library.java_libpst
- compile library.jmatio
- compile library.parso
- compile library.dec
-
- // Other ExtractingRequestHandler dependencies
- compile library.icu4j
- compile library.xercesImpl
-
- // if we try to make this compileOnly or testImplementation forbidden apis fails?
- implementation 'javax.servlet:javax.servlet-api'
-
- compile project(':lucene:core')
- compile project(':solr:core')
- compile project(':solr:solrj')
- compile project(':lucene:analysis:common')
-
- testProject project(':lucene:test-framework')
- testProject project(':solr:test-framework')
-}
\ No newline at end of file
[lucene-solr] 03/06: SOLR-13452: Put build nori dict into
regenerate tasks.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit dc510d61a1472b113cc511866599c7fe8b223b90
Author: markrmiller <ma...@apache.org>
AuthorDate: Sun Jun 2 00:35:18 2019 -0500
SOLR-13452: Put build nori dict into regenerate tasks.
---
lucene/analysis/nori/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lucene/analysis/nori/build.gradle b/lucene/analysis/nori/build.gradle
index 0ba8a4d..5cddf41 100644
--- a/lucene/analysis/nori/build.gradle
+++ b/lucene/analysis/nori/build.gradle
@@ -60,7 +60,7 @@ task downloadDict(type: org.apache.lucene.gradle.Download) {
}
task buildNoriDict(type: JavaExec) {
- group = 'Build'
+ group = 'Build Regenerate'
description = "Downloads, patches, and builds dict for nori."
doFirst {
[lucene-solr] 04/06: SOLR-13452: Use https repo urls.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit b632c32b7bc7d7f8c55c2f7bc3a0f41bbc6553c5
Author: markrmiller <ma...@apache.org>
AuthorDate: Sun Jun 2 01:29:16 2019 -0500
SOLR-13452: Use https repo urls.
---
buildSrc/common/configure-repositories.gradle | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/buildSrc/common/configure-repositories.gradle b/buildSrc/common/configure-repositories.gradle
index ac7b2ce..232e571 100644
--- a/buildSrc/common/configure-repositories.gradle
+++ b/buildSrc/common/configure-repositories.gradle
@@ -16,19 +16,18 @@
*/
repositories {
- jcenter()
- maven {
- url "https://oss.sonatype.org/content/repositories/releases"
+ jcenter() {
+ url "https://jcenter.bintray.com"
}
maven {
- url "http://maven.restlet.org"
+ url "https://oss.sonatype.org/content/repositories/releases"
}
maven {
- url "http://repository.cloudera.com/content/repositories/releases"
+ url "https://maven.restlet.com"
}
mavenCentral()
// chinese mirror
maven {
- url "http://uk.maven.org/maven2"
+ url "https://uk.maven.org/maven2"
}
}
[lucene-solr] 02/06: SOLR-13452: Make eclipse .settings dir in case
it does not yet exist.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 6241e67c2855441700e4c3beff49fffab622406b
Author: markrmiller <ma...@apache.org>
AuthorDate: Sun Jun 2 00:31:46 2019 -0500
SOLR-13452: Make eclipse .settings dir in case it does not yet exist.
---
buildSrc/build.gradle | 2 --
buildSrc/ide/eclipse.gradle | 4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 84be33a..f1eb030 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -48,8 +48,6 @@ configurations {
jflex.extendsFrom implementation
}
-
-
dependencies {
jflex "de.jflex:jflex:1.7.0"
rat "org.apache.rat:apache-rat:0.11"
diff --git a/buildSrc/ide/eclipse.gradle b/buildSrc/ide/eclipse.gradle
index f02ac29..d4363b9 100644
--- a/buildSrc/ide/eclipse.gradle
+++ b/buildSrc/ide/eclipse.gradle
@@ -78,7 +78,9 @@ eclipse {
}
// Jetty mod files make eclipse sad
- new File("${projectDir}/.settings/org.eclipse.wst.validation.prefs").text = """
+ def settingsDir = new File("${projectDir}/.settings")
+ mkdir(settingsDir)
+ new File(settingsDir, "org.eclipse.wst.validation.prefs").text = """
eclipse.preferences.version=1
override=true
suspend=true