Skip to content

Commit

Permalink
Merge pull request #12 from TopQuadrant/rc1.4.0
Browse files Browse the repository at this point in the history 
1.4.0 upgrade
  • Loading branch information
@cygri
cygri authored Dec 18, 2023
2 parents 50cdf17 + 0d53319 commit ab6912d
Show file tree
Hide file tree
Showing 14 changed files with 427 additions and 462 deletions.
7 changes: 7 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
* eol=lf autocrlf=input
*.java text
*.js text
*.md text
*.properties text
*.txt text
*.xml text
6 changes: 4 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ This project is licensed under the terms of the [GNU GPL v3](http://www.gnu.org/

## Version history

### 1.3.1 (in development)
- TODO
### 1.4.0 (in development)
- Update various libraries
- Require Java 11
- Re-training of all existing taggers is required due to major WEKA version update

### 1.3.0 (2019-09-27)
- Add WEKA classifier API
Expand Down
139 changes: 45 additions & 94 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.topbraid</groupId>
<artifactId>mauiserver</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.4.0-tq</version>
<packaging>war</packaging>
<name>Maui Server</name>
<description>An HTTP wrapper around the Maui Topic Indexer</description>
Expand All @@ -28,13 +28,14 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>11</maven.compiler.release>
</properties>

<dependencies>
<dependency>
<groupId>com.entopix</groupId>
<artifactId>maui</artifactId>
<version>1.3.1-cygri</version>
<version>1.4.0-tq</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -45,22 +46,27 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.10.0</version>
<version>2.15.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
<version>3.13.0</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>2.13.0</version>
<artifactId>jena-arq</artifactId>
<version>4.10.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -73,26 +79,10 @@
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.20.v20190813</version>
<dependencies>
<!-- Make slf4j log to Log4j in jetty:run -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.6</version>
</dependency>
</dependencies>
<version>9.4.53.v20231009</version>
<configuration>
<loginServices>
<loginService implementation="org.eclipse.jetty.security.HashLoginService">
Expand All @@ -102,78 +92,39 @@
</loginServices>
</configuration>
</plugin>
<!-- Set system property for Log4j config file location so jetty:run finds it -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<goals>
<goal>set-system-properties</goal>
</goals>
<configuration>
<properties>
<property>
<name>log4j.configuration</name>
<value>file:./src/main/resources/log4j.properties</value>
</property>
</properties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>

<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
properties-maven-plugin
</artifactId>
<versionRange>
[1.0.0,)
</versionRange>
<goals>
<goal>
set-system-properties
</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
<plugins>
<!-- Prevent use of outdated built-in Maven plugins -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.2</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.1</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.3</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.4.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
<profile>
<id>downloadSources</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
</properties>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion src/main/java/org/topbraid/mauiserver/VocabularyResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import com.entopix.maui.vocab.Vocabulary;
import com.entopix.maui.vocab.VocabularyStore;
import com.hp.hpl.jena.rdf.model.Model;
import org.apache.jena.rdf.model.Model;

public class VocabularyResource extends Resource
implements Gettable, Puttable, Deletable {
Expand Down
Loading

0 comments on commit ab6912d

Please sign in to comment.