From 1f3ce6c45c6f44081c78cfadd479a9d7cde75814 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Fri, 28 Nov 2014 12:27:11 +0100
Subject: [PATCH] Increased version to 1.1.1-SNAPSHOT. Using ElasticSearch
1.0.3 now.
---
oaipmh-core/pom.xml | 166 ++++++++++++++++++++----------------------
oaipmh-webapp/pom.xml | 100 ++++++++++++-------------
pom.xml | 15 ++--
3 files changed, 135 insertions(+), 146 deletions(-)
diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 24d40b92..be04bd69 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -1,49 +1,45 @@
<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>info.textgrid.middleware</groupId>
- <artifactId>oaipmh-core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>TextGrid :: TG-OAI-PMH :: Core</name>
-
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>2.7.8</cxf.version>
- <textgrid.httpclients.version>1.3.0-SNAPSHOT</textgrid.httpclients.version>
- <tgsearch.version>3.0.2-SNAPSHOT</tgsearch.version>
- <slf4j.version>1.7.5</slf4j.version>
- </properties>
-
+ 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>info.textgrid.middleware</groupId>
+ <artifactId>oaipmh-core</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>TextGrid :: TG-OAI-PMH :: Core</name>
+ <url>http://maven.apache.org</url>
+
+ <parent>
+ <artifactId>oaipmh</artifactId>
+ <groupId>info.textgrid.middleware</groupId>
+ <version>1.1.1-SNAPSHOT</version>
+ </parent>
+
<dependencies>
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>3.0.0-milestone1</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-hc</artifactId>
- <version>${cxf.version}</version>
+ <version>${cxf.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
-
+
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
@@ -62,31 +58,28 @@
<version>4.11</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>
-
+
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>0.90.7</version>
</dependency>
-
+
<dependency>
<groupId>info.textgrid.utils</groupId>
<artifactId>httpclients</artifactId>
<version>${textgrid.httpclients.version}</version>
</dependency>
-
- <!-- >dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-runtime</artifactId>
- <version>2.5.0</version>
- </dependency-->
-
+
+ <!-- >dependency> <groupId>org.openrdf.sesame</groupId> <artifactId>sesame-runtime</artifactId>
+ <version>2.5.0</version> </dependency -->
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -97,7 +90,7 @@
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -123,59 +116,56 @@
<enabled>true</enabled>
</snapshots>
</repository>
-
- <!-- repository>
- <id>aduna</id>
- <name>Aduna Software</name>
- <url>http://repo.aduna-software.org/maven2/releases/</url>
- </repository-->
+
+ <!-- repository> <id>aduna</id> <name>Aduna Software</name> <url>http://repo.aduna-software.org/maven2/releases/</url>
+ </repository -->
</repositories>
-
- <build>
- <pluginManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+
+ <execution>
+ <id>oaipmhSchema-xjc</id>
+ <goals>
+ <goal>xjc</goal>
+ </goals>
+ <configuration>
+ <schemaFile>oai_pmh.xsd</schemaFile>
+ <packageName>info.textgrid.middleware.oaipmh</packageName>
+ <staleFile>${project.build.directory}/jaxb2/.oaipmhSchemaXjcStaleFlag</staleFile>
+ <clearOutputDir>false</clearOutputDir>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>oaipmhDCSchema-xjc</id>
+ <goals>
+ <goal>xjc</goal>
+ </goals>
+ <configuration>
+ <schemaFile>oai_dc.xsd</schemaFile>
+ <packageName>info.textgrid.middleware.oaidc</packageName>
+ <staleFile>${project.build.directory}/jaxb2/.oaiDCSchemaXjcStaleFlag</staleFile>
+ <clearOutputDir>false</clearOutputDir>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
-
- <execution>
- <id>oaipmhSchema-xjc</id>
- <goals>
- <goal>xjc</goal>
- </goals>
- <configuration>
- <schemaFile>oai_pmh.xsd</schemaFile>
- <packageName>info.textgrid.middleware.oaipmh</packageName>
- <staleFile>${project.build.directory}/jaxb2/.oaipmhSchemaXjcStaleFlag</staleFile>
- <clearOutputDir>false</clearOutputDir>
- </configuration>
- </execution>
-
- <execution>
- <id>oaipmhDCSchema-xjc</id>
- <goals>
- <goal>xjc</goal>
- </goals>
- <configuration>
- <schemaFile>oai_dc.xsd</schemaFile>
- <packageName>info.textgrid.middleware.oaidc</packageName>
- <staleFile>${project.build.directory}/jaxb2/.oaiDCSchemaXjcStaleFlag</staleFile>
- <clearOutputDir>false</clearOutputDir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </build>
</project>
diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml
index 124177a0..b6c26fe6 100644
--- a/oaipmh-webapp/pom.xml
+++ b/oaipmh-webapp/pom.xml
@@ -1,91 +1,85 @@
<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>info.textgrid.middleware</groupId>
- <artifactId>oaipmh-webapp</artifactId>
- <packaging>war</packaging>
- <version>1.1.0-SNAPSHOT</version>
- <name>TextGrid :: TG-OAI-PMH :: Webapp</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <spring.version>3.0.5.RELEASE</spring.version>
- <junit.version>4.11</junit.version>
- <jdk.version>1.7</jdk.version>
- <cxf.version>2.7.8</cxf.version>
- </properties>
-
- <parent>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>info.textgrid.middleware</groupId>
+ <artifactId>oaipmh-webapp</artifactId>
+ <packaging>war</packaging>
+ <version>1.1.1-SNAPSHOT</version>
+ <name>TextGrid :: TG-OAI-PMH :: Webapp</name>
+ <url>http://maven.apache.org</url>
+
+ <parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
-
- <profiles>
- <profile>
- <id>public</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <webxml.file>web.xml</webxml.file>
- <finalName.war>tgoaipmh</finalName.war>
+
+ <profiles>
+ <profile>
+ <id>public</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <webxml.file>web.xml</webxml.file>
+ <finalName.war>tgoaipmh</finalName.war>
</properties>
- </profile>
- </profiles>
-
- <dependencies>
+ </profile>
+ </profiles>
+
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
+
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>${cxf.version}</version>
- </dependency>
-
- <dependency>
- <groupId>info.textgrid.middleware</groupId>
- <artifactId>oaipmh-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-cors</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>info.textgrid.middleware</groupId>
+ <artifactId>oaipmh-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
-
+
<build>
<finalName>tgoaipmh</finalName>
<plugins>
@@ -100,5 +94,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
diff --git a/pom.xml b/pom.xml
index 9ce93647..c0d83df1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,21 +3,26 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TextGrid :: TG-OAI-PMH :: Parent</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.host.url>https://ci.bibforge.org/sonar</sonar.host.url>
- <cxf.version>2.7.4</cxf.version>
+ <cxf.version>2.7.13</cxf.version>
<spring.version>3.1.2.RELEASE</spring.version>
<textgrid.httpclients.version>1.3.0-SNAPSHOT</textgrid.httpclients.version>
<felix.version>2.3.4</felix.version>
<jetty.version>6.1.15</jetty.version>
- <elasticsearch.version>0.90.7</elasticsearch.version>
+ <elasticsearch.version>1.0.3</elasticsearch.version>
<antlr-runtime.version>3.2</antlr-runtime.version>
<antlr-maven-plugin.version>3.2</antlr-maven-plugin.version>
+ <jdk.version>1.7</jdk.version>
+ <junit.version>4.11</junit.version>
+ <tgsearch.version>3.3.1-SNAPSHOT</tgsearch.version>
+ <textgrid.httpclients.version>1.3.0-SNAPSHOT</textgrid.httpclients.version>
+ <slf4j.version>1.7.5</slf4j.version>
</properties>
<build>
@@ -28,8 +33,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
<fork>true</fork>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
--
GitLab