You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2019/10/19 22:46:51 UTC

[lucene-solr] branch jira/SOLR-13841_1 created (now f3571e5)

This is an automated email from the ASF dual-hosted git repository.

noble pushed a change to branch jira/SOLR-13841_1
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.


      at f3571e5  Add jackson databind annotations to SolrJ classpath

This branch includes the following new commits:

     new f3571e5  Add jackson databind annotations to SolrJ classpath

The 1 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.



[lucene-solr] 01/01: Add jackson databind annotations to SolrJ classpath

Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

noble pushed a commit to branch jira/SOLR-13841_1
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit f3571e5145269a005bf1cf960b3e0cae9350a019
Author: noble <no...@apache.org>
AuthorDate: Sun Oct 20 09:46:23 2019 +1100

    Add jackson databind annotations to SolrJ classpath
---
 solr/CHANGES.txt                                                      | 4 +++-
 solr/solrj/ivy.xml                                                    | 2 ++
 .../src/java/org/apache/solr/common}/util/ReflectMapWriter.java       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b21ef2c..05a7c14 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -103,7 +103,7 @@ New Features
 Improvements
 ---------------------
 
-*SOLR-13731: javabin must support a 1:1 mapping of the JSON update format (noble)
+* SOLR-13731: 'javabin' must support a 1:1 mapping of the JSON update format (noble)
 
 
 Optimizations
@@ -122,6 +122,8 @@ Other Changes
 
 * SOLR-12769: Fix incorrect documentation for 'delete' op in Request parameters API (Alexandre Rafalovitch, Munendra S N)
 
+* SOLR-13841: Add jackson databind annotations to SolrJ classpath (noble)
+
 ==================  8.3.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/solrj/ivy.xml b/solr/solrj/ivy.xml
index 5312c42..b1871fe 100644
--- a/solr/solrj/ivy.xml
+++ b/solr/solrj/ivy.xml
@@ -61,6 +61,8 @@
     <dependency org="io.netty" name="netty-transport-native-epoll" rev="${/io.netty/netty-transport-native-epoll}" conf="compile"/>
     <dependency org="io.netty" name="netty-transport-native-unix-common" rev="${/io.netty/netty-transport-native-unix-common}" conf="compile"/>
 
+    <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="${/com.fasterxml.jackson.core/jackson-annotations}" conf="compile"/>
+
     <dependency org="org.apache.logging.log4j" name="log4j-slf4j-impl" rev="${/org.apache.logging.log4j/log4j-slf4j-impl}" conf="test"/>
 
     <dependency org="org.mockito" name="mockito-core" rev="${/org.mockito/mockito-core}" conf="test"/>
diff --git a/solr/core/src/java/org/apache/solr/util/ReflectMapWriter.java b/solr/solrj/src/java/org/apache/solr/common/util/ReflectMapWriter.java
similarity index 98%
rename from solr/core/src/java/org/apache/solr/util/ReflectMapWriter.java
rename to solr/solrj/src/java/org/apache/solr/common/util/ReflectMapWriter.java
index 9555740..0193aea 100644
--- a/solr/core/src/java/org/apache/solr/util/ReflectMapWriter.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/ReflectMapWriter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.util;
+package org.apache.solr.common.util;
 
 import java.io.IOException;
 import java.lang.reflect.Field;