Skip to content

Commit

Permalink
lucene 6.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tarzanek committed Nov 9, 2016
1 parent 8b6a02e commit ad0b633
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 11 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
@@ -1,6 +1,9 @@
language: java
jdk:
- oraclejdk8
cache:
directories:
- $HOME/.m2
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq exuberant-ctags cvs git mercurial cssc bzr subversion monotone rcs
Expand All @@ -16,5 +19,5 @@ addons:
project:
name: "OpenGrok/OpenGrok"
description: "Build submitted via Travis CI"
build_command_prepend: "mvn clean"
build_command: "mvn -DskipTests=true compile"
# build_command_prepend: "mvn clean"
build_command: "mvn -DskipTests=true -Dmaven.javadoc.skip=false -B -V compile"
2 changes: 1 addition & 1 deletion nbproject/project.properties
Expand Up @@ -19,7 +19,7 @@ build.generated.dir=${build.dir}/generated
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
lucene.version=6.2.1
lucene.version=6.3.0
lucene-core.jar=lucene-core-${lucene.version}.jar
file.reference.opengrok-dev-test=test
debug.test.classpath=${run.test.classpath}
Expand Down
41 changes: 40 additions & 1 deletion opengrok-web-nbproject/nbproject/ant-deploy.xml
@@ -1,4 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
Oracle and Java are registered trademarks of Oracle and/or its affiliates.
Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
Development and Distribution License("CDDL") (collectively, the
"License"). You may not use this file except in compliance with the
License. You can obtain a copy of the License at
http://www.netbeans.org/cddl-gplv2.html
or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
particular file as subject to the "Classpath" exception as provided
by Oracle in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
under the [CDDL or GPL Version 2] license." If you do not indicate a
single choice of license, a recipient has the option to distribute
your version of this file under either the CDDL, the GPL Version 2 or
to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
Contributor(s):
-->
<project default="-deploy-ant" basedir=".">
<target name="-init" if="deploy.ant.enabled">
<property file="${deploy.ant.properties.file}"/>
Expand All @@ -16,7 +55,7 @@
<isset property="tomcat.password"/>
</not>
</condition>
</fail>
</fail>
</target>
<target name="-deploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials">
<echo message="Deploying ${deploy.ant.archive} to ${Context(path)}"/>
Expand Down
2 changes: 1 addition & 1 deletion opengrok-web-nbproject/nbproject/project.properties
Expand Up @@ -35,7 +35,7 @@ excludes=
file.reference.bcel-6.0.jar=../lib/bcel-6.0.jar
file.reference.json-simple-1.1.1.jar=../lib/json-simple-1.1.1.jar
j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.2.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
lucene.version=6.2.1
lucene.version=6.3.0
lucene-core.jar=lucene-core-${lucene.version}.jar
lucene-analyzers-common.jar=lucene-analyzers-common-${lucene.version}.jar
lucene-queryparser.jar=lucene-queryparser-${lucene.version}.jar
Expand Down
2 changes: 1 addition & 1 deletion platform/solaris/ips/create.sh
Expand Up @@ -214,7 +214,7 @@ PKG pkgsend add file doc/ctags.config mode=0444 owner=root group=sys path=/usr/o


# install libs
LV=6.2.1
LV=6.3.0
for file in ant.jar \
bcel-6.0.jar \
lucene-analyzers-common-${LV}.jar \
Expand Down
8 changes: 4 additions & 4 deletions platform/solaris/pkgdef/prototype
Expand Up @@ -62,10 +62,10 @@ f none usr/opengrok/doc/opengrok-agent.properties=platform/solaris/default/openg
f none usr/opengrok/lib/opengrok.jar=dist/opengrok.jar 0444 root bin
f none usr/opengrok/lib/ant.jar=dist/lib/ant.jar 0444 root bin
f none usr/opengrok/lib/bcel-6.0.jar=lib/bcel-6.0.jar 0444 root bin
f none usr/opengrok/lib/lucene-core-6.2.1.jar=lib/lucene-core-6.2.1.jar 0444 root bin
f none usr/opengrok/lib/lucene-analyzers-common-6.2.1.jar=lib/lucene-analyzers-common-6.2.1.jar 0444 root bin
f none usr/opengrok/lib/lucene-queryparser-6.2.1.jar=lib/lucene-queryparser-6.2.1.jar 0444 root bin
f none usr/opengrok/lib/lucene-suggest-6.2.1.jar=lib/lucene-suggest-6.2.1.jar 0444 root bin
f none usr/opengrok/lib/lucene-core-6.3.0.jar=lib/lucene-core-6.3.0.jar 0444 root bin
f none usr/opengrok/lib/lucene-analyzers-common-6.3.0.jar=lib/lucene-analyzers-common-6.3.0.jar 0444 root bin
f none usr/opengrok/lib/lucene-queryparser-6.3.0.jar=lib/lucene-queryparser-6.3.0.jar 0444 root bin
f none usr/opengrok/lib/lucene-suggest-6.3.0.jar=lib/lucene-suggest-6.3.0.jar 0444 root bin
f none usr/opengrok/lib/jrcs.jar=lib/jrcs.jar 0444 root bin
f none usr/opengrok/lib/swing-layout-0.9.jar=lib/swing-layout-0.9.jar 0444 root bin
f none usr/opengrok/lib/json-simple-1.1.1.jar=lib/json-simple-1.1.1.jar 0444 root bin
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -58,7 +58,7 @@ Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
</modules>

<properties>
<lucene.version>6.2.1</lucene.version>
<lucene.version>6.3.0</lucene.version>
<mavenjavadocplugin.version>2.10.4</mavenjavadocplugin.version>
<compileSource>1.8</compileSource>
<compileTarget>1.8</compileTarget>
Expand Down

0 comments on commit ad0b633

Please sign in to comment.