You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/03/23 21:40:28 UTC

[1/7] lucene-solr:master: Add override on bintray upload

Repository: lucene-solr
Updated Branches:
  refs/heads/master ced7570e2 -> 3a548e38e


Add override on bintray upload


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3a548e38
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3a548e38
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3a548e38

Branch: refs/heads/master
Commit: 3a548e38e4b001f57e89ea98d5903dfc0115f314
Parents: ae7fefd
Author: Kevin Risden <kr...@apache.org>
Authored: Sat Mar 19 16:54:53 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Mar 23 13:05:52 2016 -0500

----------------------------------------------------------------------
 descriptor.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3a548e38/descriptor.json
----------------------------------------------------------------------
diff --git a/descriptor.json b/descriptor.json
index edcad0d..c822ce8 100644
--- a/descriptor.json
+++ b/descriptor.json
@@ -11,7 +11,7 @@
     },
     "files":
         [
-        {"includePattern": "solr/package/(solr-.*-SNAPSHOT.tgz)$", "uploadPattern": "$1"}
+        {"includePattern": "solr/package/(solr-.*-SNAPSHOT.tgz)$", "uploadPattern": "$1", "matrixParams": { "override": 1 }}
         ],
     "publish": true
 }


[6/7] lucene-solr:master: Exclude master from .travis.yml

Posted by kr...@apache.org.
Exclude master from .travis.yml


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ae7fefd7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ae7fefd7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ae7fefd7

Branch: refs/heads/master
Commit: ae7fefd73a8570b7bf829e8d7a54af516bc2df08
Parents: 3956729
Author: Kevin Risden <kr...@apache.org>
Authored: Sat Mar 19 16:24:29 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Mar 23 13:05:52 2016 -0500

----------------------------------------------------------------------
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ae7fefd7/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 47c4567..ccc7922 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,9 @@ addons:
     - python3
 git:
   depth: 1
+branches:
+  except:
+  - master
 env:
 - DIR=. COMMAND="ant precommit" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
 - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.stream.Stream*Test


[3/7] lucene-solr:master: Added precommit and deploy for .travis.yml

Posted by kr...@apache.org.
Added precommit and deploy for .travis.yml


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fbb4344e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fbb4344e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fbb4344e

Branch: refs/heads/master
Commit: fbb4344eb6c8c82b3a297c19436546c6d4d35bbd
Parents: 934d4be
Author: Kevin Risden <kr...@apache.org>
Authored: Sat Mar 19 14:27:13 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Mar 23 13:05:52 2016 -0500

----------------------------------------------------------------------
 .travis.yml     | 13 +++++++++++++
 descriptor.json | 17 +++++++++++++++++
 2 files changed, 30 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fbb4344e/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 71d8ee4..53597db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,25 @@ jdk:
 git:
   depth: 1
 env:
+ - DIR=. COMMAND="ant precommit"
  - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.stream.Stream*Test test"
  - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.sql.* test"
  - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.handler.TestSQLHandler test"
+ - DIR=solr COMMAND="ant package"
 matrix:
   fast_finish: true
 script:
   - ant ivy-bootstrap
   - cd $DIR
   - $COMMAND
+before_deploy: cd .. && sed -i'' -e "s/BRANCH/${TRAVIS_BRANCH}/g" descriptor.json
+deploy:
+  provider: bintray
+  file: "descriptor.json"
+  user: "risdenk"
+  key:
+    - secure: "NwKxqFIBES+ARFnswthWyG4ZbORoT6M6Ukuv1d7GncRAztz63IrrCGvU7Eo/Sf67AY9iuysuYfR6GuZ+hrSrVy/+Xm3eNB2P4FFIdaA5CDDwhpeE/CHA/EddO9jF6I5V7trVmXettk2iGb7U2fZK1q5jp9wNd1v1ecSm7fRurALNXWugxgtYNUfAaz9wOwlrWwbIaPXzqoIz3Nczd4ZcePDqjfFrYdCxPDrLPxH6LVOfkGyGbyrD1Fjv7N68T0ZZNnzGt7zGfi9LxgfI1YTIWm391KHYcHDrDNedEcF7UzhY2SRQhhVPJWmuwvB4xCuhAHLXi1KZUj0DkzRN3ITZK40Nagp2nHZu3w9MVi51cjpLY6QjeUi0TGqz7p1nhXl9+7/TycmLZOn9XOZZkiKUqcycl/hu+JYsjrOKMAfKCsKQrc1fz/FCeHZBYoo+3TEooflDPfrTr8K5kdYRxn/DJPX3wGESBx9FjnKGZ75nmESErVcMDSl/SrqB+eYG4sVQIBbm2ZeZwKMXd09Z6IBH72uyXvx1K+l+lTULMeBfNSoFYaQ3FVACixejpGykyigXtRex3CfnWkxUoUzkYTHe82oe+ltwQxON2H2P1Phk2B+eD9koXYxTccLFr4k5/tZt0UCp/bflWXVamA3OBxBErdgkFyUVZQWKVli9cpLZtGE="
+  skip_cleanup: true
+  on:
+    all_branches: true
+    condition: $COMMAND = "ant package"

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fbb4344e/descriptor.json
----------------------------------------------------------------------
diff --git a/descriptor.json b/descriptor.json
new file mode 100644
index 0000000..4656e16
--- /dev/null
+++ b/descriptor.json
@@ -0,0 +1,17 @@
+{
+    "package": {
+        "name": "solr-test",
+        "repo": "generic",
+        "subject": "risdenk"
+    },
+    "version": {
+        "name": "BRANCH",
+        "desc": "BRANCH",
+        "gpgSign": false
+    },
+    "files":
+        [
+        {"includePattern": "solr/package/(solr-.*-SNAPSHOT.tgz)", "uploadPattern": "$1"}
+        ],
+    "publish": true
+}


[7/7] lucene-solr:master: Added python3 requirement

Posted by kr...@apache.org.
Added python3 requirement


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/984b531b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/984b531b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/984b531b

Branch: refs/heads/master
Commit: 984b531b8636e8ad074f5d3d80411ffa0f46898d
Parents: 699e6f8
Author: Kevin Risden <kr...@apache.org>
Authored: Sat Mar 19 15:12:42 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Mar 23 13:05:52 2016 -0500

----------------------------------------------------------------------
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/984b531b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 76d784b..c4e27f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
 language: java
 jdk:
   - oraclejdk8
+addons:
+  apt:
+    packages:
+      - python3
 git:
   depth: 1
 env:


[4/7] lucene-solr:master: Added .travis.yml

Posted by kr...@apache.org.
Added .travis.yml


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/934d4beb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/934d4beb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/934d4beb

Branch: refs/heads/master
Commit: 934d4bebfc3bbd651641042aec46fe7e30ee1127
Parents: ced7570
Author: Kevin Risden <ri...@avalonconsult.com>
Authored: Sun Jan 24 10:01:51 2016 -0600
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Mar 23 13:05:52 2016 -0500

----------------------------------------------------------------------
 .travis.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/934d4beb/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..71d8ee4
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: java
+jdk:
+  - oraclejdk8
+git:
+  depth: 1
+env:
+ - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.stream.Stream*Test test"
+ - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.sql.* test"
+ - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.handler.TestSQLHandler test"
+matrix:
+  fast_finish: true
+script:
+  - ant ivy-bootstrap
+  - cd $DIR
+  - $COMMAND


[2/7] lucene-solr:master: Fix bintray deploy key

Posted by kr...@apache.org.
Fix bintray deploy key


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/39567290
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/39567290
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/39567290

Branch: refs/heads/master
Commit: 395672905ddf15c419141bbdbb5c48cde386ea4a
Parents: 984b531
Author: Kevin Risden <kr...@apache.org>
Authored: Sat Mar 19 15:35:07 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Mar 23 13:05:52 2016 -0500

----------------------------------------------------------------------
 .travis.yml     | 29 ++++++++++++++++-------------
 descriptor.json |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/39567290/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c4e27f1..47c4567 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,34 @@
 language: java
 jdk:
-  - oraclejdk8
+- oraclejdk8
 addons:
   apt:
     packages:
-      - python3
+    - python3
 git:
   depth: 1
 env:
- - DIR=. COMMAND="ant precommit" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
- - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.stream.Stream*Test test" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
- - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.sql.* test" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
- - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.handler.TestSQLHandler test" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
- - DIR=solr COMMAND="ant package" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
+- DIR=. COMMAND="ant precommit" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
+- DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.stream.Stream*Test
+  test" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
+- DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.sql.* test"
+  ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
+- DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.handler.TestSQLHandler test"
+  ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
+- DIR=solr COMMAND="ant package" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
 matrix:
   fast_finish: true
 script:
-  - ant ivy-bootstrap
-  - cd $DIR
-  - $COMMAND
+- ant ivy-bootstrap
+- cd $DIR
+- "$COMMAND"
 before_deploy: cd .. && sed -i'' -e "s/BRANCH/${TRAVIS_BRANCH}/g" descriptor.json
 deploy:
   provider: bintray
-  file: "descriptor.json"
-  user: "risdenk"
+  file: descriptor.json
+  user: risdenk
   key:
-    - secure: "NwKxqFIBES+ARFnswthWyG4ZbORoT6M6Ukuv1d7GncRAztz63IrrCGvU7Eo/Sf67AY9iuysuYfR6GuZ+hrSrVy/+Xm3eNB2P4FFIdaA5CDDwhpeE/CHA/EddO9jF6I5V7trVmXettk2iGb7U2fZK1q5jp9wNd1v1ecSm7fRurALNXWugxgtYNUfAaz9wOwlrWwbIaPXzqoIz3Nczd4ZcePDqjfFrYdCxPDrLPxH6LVOfkGyGbyrD1Fjv7N68T0ZZNnzGt7zGfi9LxgfI1YTIWm391KHYcHDrDNedEcF7UzhY2SRQhhVPJWmuwvB4xCuhAHLXi1KZUj0DkzRN3ITZK40Nagp2nHZu3w9MVi51cjpLY6QjeUi0TGqz7p1nhXl9+7/TycmLZOn9XOZZkiKUqcycl/hu+JYsjrOKMAfKCsKQrc1fz/FCeHZBYoo+3TEooflDPfrTr8K5kdYRxn/DJPX3wGESBx9FjnKGZ75nmESErVcMDSl/SrqB+eYG4sVQIBbm2ZeZwKMXd09Z6IBH72uyXvx1K+l+lTULMeBfNSoFYaQ3FVACixejpGykyigXtRex3CfnWkxUoUzkYTHe82oe+ltwQxON2H2P1Phk2B+eD9koXYxTccLFr4k5/tZt0UCp/bflWXVamA3OBxBErdgkFyUVZQWKVli9cpLZtGE="
+    secure: bfmp9NCfEcy7PtbL4it8g/oYqRpvlL3oL+NZKkcgzU9XTkYLSPO4J+ZfGV6A6lmnEK3eY7V7lXPDkOO6sZHBteiLIedMRu4DEUjMYFpuUKiTr1ML9ZBZ+Z9z5Rw1QBJh79s8KYILMw8+TZV8r497nwQCrY/cLnt6MbLOmknEny6VVCJu42nessvzOKIWLV0ATHlFj2BCrHdG7DxAuHVBTTPLU8YoAFFHellLpbqqWbg/L8QQbA0chV114WVLr17g3a7+Rnad8SJhXj67RKkWB9r4usTbg1HKg5GYsRdQLr5PQycXuFBjcirUp5q4/GUZT8Ze0qLsYVRTyLIS4Oh6C3+V2oqp2tWzJvIdheRxxwPZBrZiEZa/uOizkkSHPigatFN0KqxaDchtIXgMKpjnEv31gH6tlihd7ey0SeQXrucME3x0hdt2cKQjTPAHAqnMF8S8n/wLaLkbMvjQH6wiAN0hkarzyM82jZqDqONviH+zv7dvkc9vUCFdiOyYiB8c3/9gWlT2eNBrUadFfujBX1IxE+mpt0lQNTx5tzwoNnYaJo55AxsT6+BZCsGQFPNg312sH8wdICQJ9Jm1ItZeWCxhvh2MCAM496FRXiwabsAoBhO2mUYigUr6gYSI8h93yQGTHWcGkceZG6yMzzwMHnZNRL2PNPixgRb4497dSIs=
   skip_cleanup: true
   on:
     all_branches: true

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/39567290/descriptor.json
----------------------------------------------------------------------
diff --git a/descriptor.json b/descriptor.json
index 4656e16..edcad0d 100644
--- a/descriptor.json
+++ b/descriptor.json
@@ -11,7 +11,7 @@
     },
     "files":
         [
-        {"includePattern": "solr/package/(solr-.*-SNAPSHOT.tgz)", "uploadPattern": "$1"}
+        {"includePattern": "solr/package/(solr-.*-SNAPSHOT.tgz)$", "uploadPattern": "$1"}
         ],
     "publish": true
 }


[5/7] lucene-solr:master: Add JVM settings for ant

Posted by kr...@apache.org.
Add JVM settings for ant


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/699e6f89
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/699e6f89
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/699e6f89

Branch: refs/heads/master
Commit: 699e6f89248ad0f82295287043dd5ff131b64aca
Parents: fbb4344
Author: Kevin Risden <kr...@apache.org>
Authored: Sat Mar 19 14:44:52 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Mar 23 13:05:52 2016 -0500

----------------------------------------------------------------------
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/699e6f89/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 53597db..76d784b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,11 @@ jdk:
 git:
   depth: 1
 env:
- - DIR=. COMMAND="ant precommit"
- - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.stream.Stream*Test test"
- - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.sql.* test"
- - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.handler.TestSQLHandler test"
- - DIR=solr COMMAND="ant package"
+ - DIR=. COMMAND="ant precommit" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
+ - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.stream.Stream*Test test" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
+ - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.client.solrj.io.sql.* test" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
+ - DIR=solr COMMAND="ant -Dtests.class=org.apache.solr.handler.TestSQLHandler test" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
+ - DIR=solr COMMAND="ant package" ANT_OPTS="-Xms1024m -Xmx2048m -XX:MaxPermSize=256m"
 matrix:
   fast_finish: true
 script: