Skip to content

GitLab

Commit ba05d078 authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

Merge branch 'release/2.0.5'

parents cc8c3aba 92e8fd1a
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ ba05d078
image: maven:3.5.3-jdk-8
image: maven:3.6.0-jdk-8
variables:
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
......@@ -10,7 +10,7 @@ cache:
build:
script:
- 'mvn $MAVEN_CLI_OPTS clean package'
- 'mvn ${MAVEN_CLI_OPTS} clean package'
artifacts:
paths:
- target/*.xar
......
Jenkinsfile deleted 100644 → 0
View file @ cc8c3aba
node {
def mvnHome
stage('Preparation') {
git 'https://gitlab.gwdg.de/fontane-notizbuecher/fontane-lucene-exist-module.git'
mvnHome = tool 'Maven 3.5.0'
}
stage('Build') {
sh "'${mvnHome}/bin/mvn' -U -Dmaven.test.failure.ignore clean package"
}
stage('Archive') {
archiveArtifacts artifacts: 'target/*.xar'
}
stage('Publish') {
FILENAME = sh (
script: "find target/ -name '*.xar' -exec basename {} \\;",
returnStdout: true
).trim()
sh "curl -X POST -F 'file=@target/${FILENAME}' http://localhost:8181/exist/apps/receiver.xql"
}
}
pom.xml
View file @ ba05d078
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>eu.dariah.de.fontane</groupId>
<artifactId>fontane-lucene-exist-module</artifactId>
<version>2.0.3</version>
<version>2.0.5</version>
<name>fontane-lucene-exist-module</name>
<description>lucene analyzer and filter modules for exist</description>
<url>http://fontane-nb.dariah.eu</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<exist.version>3.1.1</exist.version>
<lucene.version>4.10.4</lucene.version>
<!-- properties for the xar plugin -->
<package-title>${project.name}</package-title>
<package-name>http://textgrid.de/exist/${project.artifactId}</package-name>
<package-abbrev>${project.artifactId}</package-abbrev>
<package-type>library</package-type>
<package-final-name>${project.artifactId}-${project.version}</package-final-name>
<package-title>${project.name}</package-title>
<package-name>http://textgrid.de/exist/${project.artifactId}</package-name>
<package-abbrev>${project.artifactId}</package-abbrev>
<package-type>library</package-type>
<package-final-name>${project.artifactId}-${project.version}</package-final-name>
</properties>
<dependencies>
<dependency>
<groupId>org.exist-db</groupId>
......@@ -35,14 +34,8 @@
<version>${exist.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<version>${lucene.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- https://devcenter.heroku.com/articles/local-maven-dependencies -->
<groupId>sub.fwb</groupId>
<groupId>sub.fwb</groupId>
<artifactId>fwb-solr-mods</artifactId>
<version>0.0.1-SNAPSHOT</version>
<exclusions>
......@@ -51,7 +44,7 @@
<artifactId>solr-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
......@@ -59,7 +52,7 @@
<scope>test</scope>
</dependency>
</dependencies>
<repositories>
<repository>
<id>exist</id>
......@@ -70,61 +63,79 @@
<name>project</name>
<url>file:${project.basedir}/repo</url>
</repository>
</repositories>
<build>
<!--
<finalName>exist-lib-fontane-analyzers</finalName>
-->
<plugins>
<plugin>
</repositories>
<build>
<!-- <finalName>exist-lib-fontane-analyzers</finalName> -->
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<archive>
<manifest>
<mainClass>eu.dariah.de.fontane.module.TestModule</mainClass>
<packageName>eu.dariah.de.fontane.module</packageName>
</manifest>
<manifestEntries>
<ModuleNamespace>http://fontane-nb.de.dariah.eu/ns/exist-lucene-module</ModuleNamespace>
</manifestEntries>
</archive>
<encoding>UTF-8</encoding>
<finalName>exist-lib-fontane-analyzers</finalName>
</configuration>
</plugin>
<plugin>
<groupId>com.code54.mojo</groupId>
<artifactId>buildversion-plugin</artifactId>
<version>1.0.3</version>
<executions>
<execution>
<goals>
<goal>set-properties</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>ro.kuberam.maven.plugins</groupId>
<artifactId>kuberam-expath-plugin</artifactId>
<version>0.4.9</version>
<executions>
<execution>
<id>create-xar</id>
<phase>package</phase>
<goals>
<goal>make-xar</goal>
</goals>
<configuration>
<descriptor>src/assembly/xar-assembly.xml</descriptor>
<finalName>${package-final-name}</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<archive>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Build-Tag>${build-tag}</Build-Tag>
<Git-Commit>${build-commit}</Git-Commit>
<Git-Commit-Abbrev>${build-commit-abbrev}</Git-Commit-Abbrev>
<Build-Version>${build-version}</Build-Version>
<Build-Timestamp>${build-tstamp}</Build-Timestamp>
<Source-Repository>${project.scm.connection}</Source-Repository>
<Description>${project.description}</Description>
<Implementation-URL>${project.url}</Implementation-URL>
</manifestEntries>
</archive>
<encoding>UTF-8</encoding>
<finalName>exist-lib-fontane-analyzers</finalName>
</configuration>
</plugin>
<plugin>
<groupId>ro.kuberam.maven.plugins</groupId>
<artifactId>kuberam-expath-plugin</artifactId>
<version>0.5.9</version>
<executions>
<execution>
<id>create-xar</id>
<phase>package</phase>
<goals>
<goal>make-xar</goal>
</goals>
<configuration>
<descriptor>src/assembly/xar-assembly.xml</descriptor>
<finalName>${package-final-name}</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
src/assembly/xar-assembly.xml
View file @ ba05d078
<package xmlns="http://expath.org/ns/pkg" name="${package-name}" abbrev="${package-abbrev}" version="${project.version}"
spec="1.0">
<title>${package-title}</title>
<package xmlns="http://expath.org/ns/pkg" name="${package-name}" abbrev="${package-abbrev}"
version="${project.version}" spec="1.0">
<title>${package-title}</title>
<author id="ubboveentjer">Ubbo Veentjer</author>
<website>${project.url}</website>
<license>GNU-LGPL</license>
<copyright>true</copyright>
<type>library</type>
<status>alpha</status>
<tag>${project.artifactId}</tag>
<tag>library</tag>
<tag>exist</tag>
<website>${project.url}</website>
<license>GNU LGPL v3.0</license>
<copyright>true</copyright>
<type>library</type>
<status>alpha</status>
<tag>${project.artifactId}</tag>
<tag>library</tag>
<tag>exist</tag>
<tag>xquery</tag>
<tag>lucene</tag>
<tag>analyzer</tag>
<category id="libs">Libraries</category>
<category id="exist">eXist extensions</category>
<dependency processor="http://exist-db.org" semver-min="2.3.0" />
<dependencySets>
<dependencySet>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</dependencySet>
<dependencySet>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-phonetic</artifactId>
<version>4.10.4</version>
</dependencySet>
<dependencySet>
<groupId>sub.fwb</groupId>
<category id="libs">Libraries</category>
<category id="exist">eXist extensions</category>
<finish></finish>
<dependency processor="http://exist-db.org" semver-min="2.3.0" />
<dependencySets>
<dependencySet>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</dependencySet>
<dependencySet>
<groupId>sub.fwb</groupId>
<artifactId>fwb-solr-mods</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependencySet>
</dependencySets>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
<directory>${basedir}</directory>
<includes>
<include>README.md</include>
</includes>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/xar-resources</directory>
</fileSet>
<fileSet>
<directory>${basedir}</directory>
<includes>
<include>README.md</include>
</includes>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/xar-resources</directory>
</fileSet>
</fileSets>
</package>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment