You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/05/10 17:24:59 UTC
[1/3] lucene-solr:jira/solr-10290: tabs to spaces
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-10290 da77243dd -> f132c9634
tabs to spaces
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4c80ac15
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4c80ac15
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4c80ac15
Branch: refs/heads/jira/solr-10290
Commit: 4c80ac15abbae01b5adde2119dba450ae62f6698
Parents: da77243
Author: Chris Hostetter <ho...@apache.org>
Authored: Wed May 10 10:08:28 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed May 10 10:08:28 2017 -0700
----------------------------------------------------------------------
solr/solr-ref-guide/src/_includes/topnav.html | 4 +--
solr/solr-ref-guide/src/css/comments.css | 40 +++++++++++-----------
solr/solr-ref-guide/src/css/ref-guide.css | 22 ++++++------
3 files changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c80ac15/solr/solr-ref-guide/src/_includes/topnav.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/topnav.html b/solr/solr-ref-guide/src/_includes/topnav.html
index bf97b1c..677f850 100755
--- a/solr/solr-ref-guide/src/_includes/topnav.html
+++ b/solr/solr-ref-guide/src/_includes/topnav.html
@@ -33,8 +33,8 @@
</ul>
</li>
{% if site.feedback_disable == null or site.feedback_disable == false %}
- {% include feedback.html %}
- {% endif %}
+ {% include feedback.html %}
+ {% endif %}
<!--comment out this block if you want to hide search-->
<li>
<!--start search-->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c80ac15/solr/solr-ref-guide/src/css/comments.css
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/css/comments.css b/solr/solr-ref-guide/src/css/comments.css
index 5e0ced6..1292d23 100644
--- a/solr/solr-ref-guide/src/css/comments.css
+++ b/solr/solr-ref-guide/src/css/comments.css
@@ -32,9 +32,9 @@
}
.apaste_menu {
- float: right;
- margin-right: 10px;
- width: 80px;
+ float: right;
+ margin-right: 10px;
+ width: 80px;
}
.apaste_comment {
@@ -46,10 +46,10 @@
font-weight: normal;
padding-left: 20px;
padding-right: 20px;
- padding-bottom: 16px;
- padding-top: 5px;
- margin: 15px;
- font-size: 13px
+ padding-bottom: 16px;
+ padding-top: 5px;
+ margin: 15px;
+ font-size: 13px
}
.comment_header {
color: #000000;
@@ -117,31 +117,31 @@
.apaste_comment_verified {background: #FAFBFA;}
.apaste_comment_invalid {
- color: #999;
- background: #F8F8F8;
+ color: #999;
+ background: #F8F8F8;
}
.apaste_comment textarea {
- width: 480px;
- height: 180px;
+ width: 480px;
+ height: 180px;
}
#apaste {
- margin: 5px;
- font-weight: normal;
- font-size: 14px;
- color: #024;
+ margin: 5px;
+ font-weight: normal;
+ font-size: 14px;
+ color: #024;
}
#apaste .section {
- padding: 20px;
- padding-left: 80px;
+ padding: 20px;
+ padding-left: 80px;
}
.notapproved {
- background-color: #FEE;
- padding: 5px;
+ background-color: #FEE;
+ padding: 5px;
}
#comments_thread textarea{
@@ -154,7 +154,7 @@
}
.apaste_honeypot {
- display: none;
+ display: none;
}
//* Remove external link icons when they appear in comments *//
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c80ac15/solr/solr-ref-guide/src/css/ref-guide.css
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/css/ref-guide.css b/solr/solr-ref-guide/src/css/ref-guide.css
index f3b600b..100266b 100644
--- a/solr/solr-ref-guide/src/css/ref-guide.css
+++ b/solr/solr-ref-guide/src/css/ref-guide.css
@@ -84,7 +84,7 @@ a
a:focus
{
outline: thin dotted;
- outline-offset: -2px;
+ outline-offset: -2px;
}
a:active,
@@ -194,7 +194,7 @@ q
small
{
font-size: 80%;
- line-height: inherit;
+ line-height: inherit;
}
sub,
@@ -546,12 +546,12 @@ h6
font-weight: 300;
font-style: normal;
font-family: 'Noto Sans', sans-serif;
- margin: 40px 0 0 0;
- padding: 0;
- direction: ltr;
- word-spacing: -.05em;
- line-height: 1.2;
- letter-spacing: -.01em;
+ margin: 40px 0 0 0;
+ padding: 0;
+ direction: ltr;
+ word-spacing: -.05em;
+ line-height: 1.2;
+ letter-spacing: -.01em;
page-break-after: avoid;
}
@@ -572,7 +572,7 @@ h6 small
/* Pad the page title and sidebar header */
h1.post-title-main,
li.sidebarTitle {
- padding-top: 20px;
+ padding-top: 20px;
}
h1
@@ -887,7 +887,7 @@ pre > code
font-weight: 400;
font-family: 'Inconsolata', monospace;
line-height: 1.45;
- white-space: pre-wrap;
+ white-space: pre-wrap;
}
.keyseq
@@ -1001,7 +1001,7 @@ span.projectTitle
{
font-weight: bold;
font-family: 'Noto Sans', sans-serif;
- font-size: 14pt;
+ font-size: 14pt;
}
#header > h1:first-child
[3/3] lucene-solr:jira/solr-10290: Fix some ivy related precommit
issues
Posted by ho...@apache.org.
Fix some ivy related precommit issues
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f132c963
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f132c963
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f132c963
Branch: refs/heads/jira/solr-10290
Commit: f132c9634ddc6423a2760f3df602b4add6052de8
Parents: 2210941
Author: Chris Hostetter <ho...@apache.org>
Authored: Wed May 10 10:22:44 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed May 10 10:22:44 2017 -0700
----------------------------------------------------------------------
lucene/ivy-versions.properties | 10 ++++++----
solr/solr-ref-guide/ivy.xml | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f132c963/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 094199f..dbfdaa9 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -187,15 +187,12 @@ org.apache.uima.version = 2.3.1
/org.apache.velocity/velocity-tools = 2.0
/org.apache.xmlbeans/xmlbeans = 2.6.0
/org.apache.zookeeper/zookeeper = 3.4.10
-/org.aspectj/aspectjrt = 1.8.0
# v1.6.0-alpha.3 of asciidoctor-ant includes asciidoctorj-pdf 1.5.0-alpha.15,
# which is the same as asciidoctor-pdf 1.5.0-alpha.15
/org.asciidoctor/asciidoctor-ant = 1.6.0-alpha.3
-/org.json/json = 20160810
-
-/org.jsoup/jsoup = 1.8.2
+/org.aspectj/aspectjrt = 1.8.0
org.bouncycastle.version = 1.45
/org.bouncycastle/bcmail-jdk15 = ${org.bouncycastle.version}
@@ -244,6 +241,10 @@ org.gagravarr.vorbis.java.version = 0.8
/org.gagravarr/vorbis-java-core = ${org.gagravarr.vorbis.java.version}
/org.gagravarr/vorbis-java-tika = ${org.gagravarr.vorbis.java.version}
+/org.json/json = 20160810
+
+/org.jsoup/jsoup = 1.8.2
+
/org.locationtech.spatial4j/spatial4j = 0.6
/org.mockito/mockito-core = 2.6.2
@@ -270,6 +271,7 @@ org.slf4j.version = 1.7.7
/org.slf4j/jul-to-slf4j = ${org.slf4j.version}
/org.slf4j/slf4j-api = ${org.slf4j.version}
/org.slf4j/slf4j-log4j12 = ${org.slf4j.version}
+/org.slf4j/slf4j-simple = ${org.slf4j.version}
/org.tukaani/xz = 1.5
/rome/rome = 1.0
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f132c963/solr/solr-ref-guide/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/ivy.xml b/solr/solr-ref-guide/ivy.xml
index 12cfa96..594866a 100644
--- a/solr/solr-ref-guide/ivy.xml
+++ b/solr/solr-ref-guide/ivy.xml
@@ -28,7 +28,7 @@
<dependency org="org.apache.pdfbox" name="pdfbox" rev="${/org.apache.pdfbox/pdfbox}" conf="compile"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="compile"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${/org.slf4j/slf4j-api}" conf="compile"/>
- <dependency org="org.slf4j" name="slf4j-simple" rev="${/org.slf4j/slf4j-log4j12}" conf="compile"/>
+ <dependency org="org.slf4j" name="slf4j-simple" rev="${/org.slf4j/slf4j-simple}" conf="compile"/>
<dependency org="log4j" name="log4j" rev="${/log4j/log4j}" conf="compile"/>
</dependencies>
</ivy-module>
[2/3] lucene-solr:jira/solr-10290: remove old nocommit debugging code
(was tired that night)
Posted by ho...@apache.org.
remove old nocommit debugging code (was tired that night)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/22109418
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/22109418
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/22109418
Branch: refs/heads/jira/solr-10290
Commit: 2210941839329422fa1e1de09f799678fc219cbc
Parents: 4c80ac1
Author: Chris Hostetter <ho...@apache.org>
Authored: Wed May 10 10:09:38 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed May 10 10:09:38 2017 -0700
----------------------------------------------------------------------
solr/solr-ref-guide/tools/CheckLinksAndAnchors.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/22109418/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java b/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java
index f1b5f2d..06ae001 100644
--- a/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java
+++ b/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java
@@ -179,10 +179,6 @@ public class CheckLinksAndAnchors {
problems++;
System.err.println("Relative link points at id that doesn't exist in dest: " + link);
System.err.println(" ... source: " + source.toURI().toString());
- try {
- System.err.println(" ... nocommit: " + idsToFiles.get(frag).get(0).getName());
- System.err.println(" ... nocommit: " + path);
- } catch (NullPointerException ignored) { /* nocommit: Noop */ }
}
}
}