Skip to content
Snippets Groups Projects
Commit 1f3ce6c4 authored by Stefan E. Funk's avatar Stefan E. Funk
Browse files

Increased version to 1.1.1-SNAPSHOT. 

Using ElasticSearch 1.0.3 now.
parent a4d1bde1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
oaipmh-core/pom.xml
+ 78
− 88
View file @ 1f3ce6c4
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId> <groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId> <artifactId>oaipmh-core</artifactId>
<version>1.1.0-SNAPSHOT</version> <version>1.1.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>TextGrid :: TG-OAI-PMH :: Core</name> <name>TextGrid :: TG-OAI-PMH :: Core</name>
<url>http://maven.apache.org</url>
<url>http://maven.apache.org</url>
<parent>
<properties> <artifactId>oaipmh</artifactId>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <groupId>info.textgrid.middleware</groupId>
<cxf.version>2.7.8</cxf.version> <version>1.1.1-SNAPSHOT</version>
<textgrid.httpclients.version>1.3.0-SNAPSHOT</textgrid.httpclients.version> </parent>
<tgsearch.version>3.0.2-SNAPSHOT</tgsearch.version>
<slf4j.version>1.7.5</slf4j.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId> <artifactId>cxf-rt-rs-client</artifactId>
<version>3.0.0-milestone1</version> <version>3.0.0-milestone1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-hc</artifactId> <artifactId>cxf-rt-transports-http-hc</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId> <artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId> <artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.ws.rs</groupId> <groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId> <artifactId>jsr311-api</artifactId>
...@@ -62,31 +58,28 @@ ...@@ -62,31 +58,28 @@
<version>4.11</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<version>2.1</version> <version>2.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId> <artifactId>elasticsearch</artifactId>
<version>0.90.7</version> <version>0.90.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>info.textgrid.utils</groupId> <groupId>info.textgrid.utils</groupId>
<artifactId>httpclients</artifactId> <artifactId>httpclients</artifactId>
<version>${textgrid.httpclients.version}</version> <version>${textgrid.httpclients.version}</version>
</dependency> </dependency>
<!-- >dependency> <!-- >dependency> <groupId>org.openrdf.sesame</groupId> <artifactId>sesame-runtime</artifactId>
<groupId>org.openrdf.sesame</groupId> <version>2.5.0</version> </dependency -->
<artifactId>sesame-runtime</artifactId>
<version>2.5.0</version>
</dependency-->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
...@@ -97,7 +90,7 @@ ...@@ -97,7 +90,7 @@
<artifactId>jcl-over-slf4j</artifactId> <artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
...@@ -123,59 +116,56 @@ ...@@ -123,59 +116,56 @@
<enabled>true</enabled> <enabled>true</enabled>
</snapshots> </snapshots>
</repository> </repository>
<!-- repository> <!-- repository> <id>aduna</id> <name>Aduna Software</name> <url>http://repo.aduna-software.org/maven2/releases/</url>
<id>aduna</id> </repository -->
<name>Aduna Software</name>
<url>http://repo.aduna-software.org/maven2/releases/</url>
</repository-->
</repositories> </repositories>
<build> <build>
<pluginManagement> <pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>jaxb2-maven-plugin</artifactId>
<version>2.5.1</version> <version>1.5</version>
</plugin> <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> </plugins>
</pluginManagement> </build>
<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>
</project> </project>
oaipmh-webapp/pom.xml
+ 47
− 53
View file @ 1f3ce6c4
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-webapp</artifactId> <groupId>info.textgrid.middleware</groupId>
<packaging>war</packaging> <artifactId>oaipmh-webapp</artifactId>
<version>1.1.0-SNAPSHOT</version> <packaging>war</packaging>
<name>TextGrid :: TG-OAI-PMH :: Webapp</name> <version>1.1.1-SNAPSHOT</version>
<url>http://maven.apache.org</url> <name>TextGrid :: TG-OAI-PMH :: Webapp</name>
<url>http://maven.apache.org</url>
<properties>
<spring.version>3.0.5.RELEASE</spring.version> <parent>
<junit.version>4.11</junit.version>
<jdk.version>1.7</jdk.version>
<cxf.version>2.7.8</cxf.version>
</properties>
<parent>
<artifactId>oaipmh</artifactId> <artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId> <groupId>info.textgrid.middleware</groupId>
<version>1.1.0-SNAPSHOT</version> <version>1.1.1-SNAPSHOT</version>
</parent> </parent>
<profiles> <profiles>
<profile> <profile>
<id>public</id> <id>public</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<properties> <properties>
<webxml.file>web.xml</webxml.file> <webxml.file>web.xml</webxml.file>
<finalName.war>tgoaipmh</finalName.war> <finalName.war>tgoaipmh</finalName.war>
</properties> </properties>
</profile> </profile>
</profiles> </profiles>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junit.version}</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId> <artifactId>spring-core</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId> <artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId> <artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId> <artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId> <artifactId>cxf-rt-rs-security-cors</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>info.textgrid.middleware</groupId> <groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId> <artifactId>oaipmh-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>tgoaipmh</finalName> <finalName>tgoaipmh</finalName>
<plugins> <plugins>
...@@ -100,5 +94,5 @@ ...@@ -100,5 +94,5 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
pom.xml
+ 10
− 5
View file @ 1f3ce6c4
...@@ -3,21 +3,26 @@ ...@@ -3,21 +3,26 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId> <groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh</artifactId> <artifactId>oaipmh</artifactId>
<version>1.1.0-SNAPSHOT</version> <version>1.1.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>TextGrid :: TG-OAI-PMH :: Parent</name> <name>TextGrid :: TG-OAI-PMH :: Parent</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.host.url>https://ci.bibforge.org/sonar</sonar.host.url> <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> <spring.version>3.1.2.RELEASE</spring.version>
<textgrid.httpclients.version>1.3.0-SNAPSHOT</textgrid.httpclients.version> <textgrid.httpclients.version>1.3.0-SNAPSHOT</textgrid.httpclients.version>
<felix.version>2.3.4</felix.version> <felix.version>2.3.4</felix.version>
<jetty.version>6.1.15</jetty.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-runtime.version>3.2</antlr-runtime.version>
<antlr-maven-plugin.version>3.2</antlr-maven-plugin.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> </properties>
<build> <build>
...@@ -28,8 +33,8 @@ ...@@ -28,8 +33,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version> <version>2.0.2</version>
<configuration> <configuration>
<source>1.6</source> <source>${jdk.version}</source>
<target>1.6</target> <target>${jdk.version}</target>
<fork>true</fork> <fork>true</fork>
<showDeprecation>true</showDeprecation> <showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>
......
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