Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fresh solr 2.9.2 oss #766

Open
wants to merge 58 commits into
base: develop-2.9
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
7d64c5d
grab-solr: stop all unsafety
llelf Jun 15, 2018
982efef
solr build script changes
llelf Jun 15, 2018
a42e861
restructure tools: common.sh, copy-jars.sh
llelf Jun 21, 2018
ba2aad5
tools: use sha512
llelf Jun 21, 2018
0107b1d
Fix solr startup
llelf Jun 17, 2018
bd2adca
minor yz_solr_proc fixes
llelf Jun 20, 2018
681d671
maven/idea files
llelf Jun 15, 2018
251f7e5
ant build.xml for java files
llelf Jun 21, 2018
963363b
fix SimpleQueryExample
llelf Jun 21, 2018
9df8638
XXX handler.EntropyData for solr6
llelf Jun 21, 2018
49a6d49
trivial FQShardTranslator changes
llelf Jun 21, 2018
16e6197
remove FQShardTranslator:isDistrib kludge (FIXME?)
llelf Jun 21, 2018
0fae1b0
c.b.y.m.Monitor: set thread name
llelf Jun 21, 2018
0833513
fix solr logging
llelf Jun 21, 2018
67516c7
solrconfig.xml: no need to declare /admin
llelf Jun 21, 2018
f4d7652
fix jetty configuration
llelf Jun 21, 2018
f07af4a
grab-solr: restore deleted “SOLR_PKG_DIR variable is set” case
llelf Jun 21, 2018
4925e24
tools/copy-jars: cp as the name says, not mv
llelf Jun 21, 2018
091498d
fix solr version in build.xml
llelf Jun 21, 2018
05f0bdf
make love not war
llelf Jun 21, 2018
ffdafce
make sure custom jars exist
llelf Jun 21, 2018
f533136
precompiled jars
llelf Jun 21, 2018
2c8d746
yz_schema: allow v1.6
llelf Jul 2, 2018
88c5231
grab-solr: download solr from archives
llelf Jul 2, 2018
5418cd5
minor java code changes
llelf Jul 9, 2018
8acbbaf
trivial Monitor.java change
llelf Jul 2, 2018
871ec25
modernize SimpleQueryExample
llelf Jul 2, 2018
1f15141
SIMPLE rename back
llelf Jul 9, 2018
e93feb5
java changes stash
llelf Jul 2, 2018
22d8a41
EntropyData: (*many*) changes for layered index / solr7
llelf Jul 2, 2018
de5cb6b
explicitly run needed ./tools/*.sh in rebar.config
llelf Jul 3, 2018
d4f4925
_yz_default: no Kurdish. TODO: check/update everything
llelf Jul 3, 2018
dd4cb0b
set yz.lib.dir correctly (XXX needed?)
llelf Jul 3, 2018
9cbd665
Revert "set yz.lib.dir correctly (XXX needed?)"
llelf Jul 4, 2018
682ebee
kill outdated java options
llelf Jul 3, 2018
3027082
_yz_default: correct _version_ type
llelf Jul 3, 2018
0834ca4
tooling
llelf Jul 3, 2018
d568288
don't use fancy xml in jetty configs (todo: actually DO use it)
llelf Jul 4, 2018
5936eb3
add (java) package-info
llelf Jul 4, 2018
110c517
tools: remove bashisms
llelf Jul 6, 2018
4bc15b4
EntropyData: don't skip one-after ceiling doc
llelf Jul 6, 2018
77fc2a9
build-jar.sh: use provided jars if possible
llelf Jul 6, 2018
d8b48d0
tooling minor changes
llelf Jul 6, 2018
f82c552
preliminary EntropyClient
llelf Jul 9, 2018
c3ad477
compile java sources with debug on
llelf Jul 10, 2018
56f062f
precompiled jars [yokozuna-3.2 yz_monitor-1.2]
llelf Jul 6, 2018
119e30f
tooling
llelf Jul 10, 2018
f686b9d
accept application/json POST for search too
llelf Jul 20, 2018
6c789d7
“bump” version
llelf Jul 20, 2018
cf698d1
tools scripts: ‘.’ files correctly
llelf Aug 6, 2018
9a934e5
pass indent=false to solr
llelf Jan 8, 2019
f57ff77
[sec] yz xml extractor: prevent XXE attack
llelf Mar 3, 2019
8fc7727
[sec] http search: get rid of ‘yz-fprof’ header handling
llelf Mar 3, 2019
fdeffe7
Merge branch 'sec1' into fresh-solr
llelf Mar 7, 2019
f6d2238
Merge tag 'riak_kv-2.9.0p6' into fresh-solr+2.9.0p6
Jan 21, 2020
7988a2f
fix: update test case for cuttlefish
Jan 23, 2020
95a1bef
Merge branch 'fresh-solr-2.9.0p6' into fresh-solr-2.9.1
Feb 23, 2020
47894d5
fix: solr jvm opts test
Apr 22, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions java_src/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>

<project name="yokozuna">

<property name="ant.build.javac.source" value="8" />
<property name="ant.build.javac.target" value="8" />
<property name="ant.build.javac.destdir" value="out" />

<property name="solr_vsn" value="7.3.1" />
<property name="yz_vsn" value="3.2" />
<property name="yz_mon_vsn" value="1.2" />

<property name="out">out</property>
<property name="tmp">../yz-build</property>

<target name="all">
<mkdir dir="${out}"/>
<delete>
<fileset dir="${out}" includes="**/*.class"/>
</delete>
<antcall target="yz-handler.jar"/>
<antcall target="yz-monitor.jar"/>
</target>

<target name="yz-handler.jar" depends="c">
<jar destfile="${tmp}/yokozuna-${yz_vsn}.jar"
basedir="${out}"
includes="com/basho/yokozuna/handler/**/*.class"
/>
<!-- + com/basho/yokozuna/query/**/*.class -->
</target>

<target name="yz-monitor.jar" depends="c">
<jar destfile="${tmp}/yz_monitor-${yz_mon_vsn}.jar"
basedir="${out}"
includes="com/basho/yokozuna/monitor/**/*.class"
/>
</target>

<target name="c">
<javac srcdir="." includeantruntime="false"
destdir="${out}"
debug="on" debuglevel="lines"
includeDestClasses="no"
>
<classpath>
<!-- <fileset dir="../build/solr-jars"/> -->
<!-- <fileset dir="../build/solr-${solr_vsn}-SNAPSHOT/dist"/> -->
<!-- <fileset dir="../build/solr-${solr_vsn}-SNAPSHOT/dist/solrj-lib"/> -->
<fileset dir="../build/solr-${solr_vsn}/server/lib"/>
<fileset dir="../build/solr-${solr_vsn}/server/solr-webapp/webapp/WEB-INF/lib"/>
</classpath>
</javac>
</target>

<target name="docs">
<javadoc linksource="yes"
sourcepath="." destdir="doc" access="private" source="8"
includenosourcepackages="yes"
>
<classpath>
<fileset dir="../build/solr-${solr_vsn}/server/lib"/>
<fileset dir="../build/solr-${solr_vsn}/server/solr-webapp/webapp/WEB-INF/lib"/>
</classpath>
</javadoc>
</target>

</project>

Loading