Skip to content

Commit

Permalink
Merge branch 'temp/update-versions'
Browse files Browse the repository at this point in the history
# Conflicts:
#	source/java/pom.xml
#	source/java/src/org/lucee/extension/search/lucene/LuceneSearchCollection.java
#	source/java/src/org/lucee/extension/search/lucene/SearchResulItemHits.java
#	source/java/src/org/lucee/extension/search/lucene/SearchUtil.java
#	source/java/src/org/lucee/extension/search/lucene/query/Simple.java
  • Loading branch information
michaeloffner committed Jan 17, 2025
2 parents d39a532 + c21f131 commit 2d1fe1a
Show file tree
Hide file tree
Showing 6 changed files with 217 additions and 249 deletions.
7 changes: 7 additions & 0 deletions source/java/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
Expand Down
28 changes: 9 additions & 19 deletions source/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.lucee</groupId>
<artifactId>lucene-search</artifactId>
<version>3.0.0.1-ALPHA</version>
<version>3.0.0.3-ALPHA</version>

<name>Lucene Search</name>
<description>Lucene Search implementation for Lucee</description>
Expand Down Expand Up @@ -208,38 +208,28 @@
<!-- Lucene Dependencies -->
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>4.10.4</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<version>4.10.4</version>
<artifactId>lucene-analyzers</artifactId>
<version>3.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-highlighter</artifactId>
<version>4.10.4</version>
<version>3.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-misc</artifactId>
<version>4.10.4</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queries</artifactId>
<version>4.10.4</version>
<version>3.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>4.10.4</version>
<artifactId>lucene-core</artifactId>
<version>3.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-suggest</artifactId>
<version>4.10.4</version>
<artifactId>lucene-snowball</artifactId>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
Expand Down
Loading

0 comments on commit 2d1fe1a

Please sign in to comment.