Skip to content
Snippets Groups Projects
Commit 44d0a956 authored by mbrodhu's avatar mbrodhu
Browse files

Merge branch 'master' of git.projects.gwdg.de:oai-pmh

parents b5f91a95 266001d0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
oaipmh-core/pom.xml
+ 150
− 152
View file @ 44d0a956
<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>
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
<version>1.3.25-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId>
<version>1.3.25-SNAPSHOT</version>
<packaging>jar</packaging>
<name>TextGrid :: TG-OAI-PMH :: Core</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>info.textgrid.middleware</groupId>
<artifactId>tgcrud-common</artifactId>
<version>${tgcrud.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</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>${elasticsearch.version}</version>
</dependency>
<dependency>
<groupId>info.textgrid.utils</groupId>
<artifactId>httpclients</artifactId>
<version>${textgrid.httpclients.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>nexus.snapshots</id>
<name>DARIA nexus public Repository</name>
<url>http://dev.dariah.eu/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<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.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>oaipmhDCSchema-xjc</id>
<goals>
<goal>xjc</goal>
</goals>
<configuration>
<schemaFile>oai_dc.xsd</schemaFile>
<packageName>info.textgrid.middleware.oaidc</packageName>
<schemaDirectory>src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>oai_dc.xsd</include>
</schemaIncludes>
<generateDirectory>${project.build.directory}/generated-sources/xjc1</generateDirectory>
<staleFile>${project.build.directory}/jaxb2/.oaiDCSchemaXjcStaleFlag</staleFile>
<clearOutputDir>false</clearOutputDir>
</configuration>
</execution>
<execution>
<id>oaipmhSchema-xjc</id>
<goals>
<goal>xjc</goal>
</goals>
<configuration>
<schemaFile>oai_pmh.xsd</schemaFile>
<packageName>info.textgrid.middleware.oaipmh</packageName>
<schemaDirectory>src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>oai_pmh.xsd</include>
</schemaIncludes>
<generateDirectory>${project.build.directory}/generated-sources/xjc2</generateDirectory>
<staleFile>${project.build.directory}/jaxb2/.oaipmhSchemaXjcStaleFlag</staleFile>
<clearOutputDir>false</clearOutputDir>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
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>
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
<version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId>
<version>2.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>DARIAHDE :: OAI-PMH :: Core</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>info.textgrid.middleware</groupId>
<artifactId>tgcrud-common</artifactId>
<version>${tgcrud.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</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>${elasticsearch.version}</version>
</dependency>
<dependency>
<groupId>info.textgrid.utils</groupId>
<artifactId>httpclients</artifactId>
<version>${textgrid.httpclients.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>nexus.snapshots</id>
<name>DARIA nexus public Repository</name>
<url>http://dev.dariah.eu/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<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.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>oaipmhDCSchema-xjc</id>
<goals>
<goal>xjc</goal>
</goals>
<configuration>
<schemaFile>oai_dc.xsd</schemaFile>
<packageName>info.textgrid.middleware.oaidc</packageName>
<schemaDirectory>src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>oai_dc.xsd</include>
</schemaIncludes>
<generateDirectory>${project.build.directory}/generated-sources/xjc1</generateDirectory>
<staleFile>${project.build.directory}/jaxb2/.oaiDCSchemaXjcStaleFlag</staleFile>
<clearOutputDir>false</clearOutputDir>
</configuration>
</execution>
<execution>
<id>oaipmhSchema-xjc</id>
<goals>
<goal>xjc</goal>
</goals>
<configuration>
<schemaFile>oai_pmh.xsd</schemaFile>
<packageName>info.textgrid.middleware.oaipmh</packageName>
<schemaDirectory>src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>oai_pmh.xsd</include>
</schemaIncludes>
<generateDirectory>${project.build.directory}/generated-sources/xjc2</generateDirectory>
<staleFile>${project.build.directory}/jaxb2/.oaipmhSchemaXjcStaleFlag</staleFile>
<clearOutputDir>false</clearOutputDir>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
oaipmh-webapp/pom.xml
+ 39
− 36
View file @ 44d0a956
......@@ -4,13 +4,13 @@
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
<version>1.3.25-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-webapp</artifactId>
<packaging>war</packaging>
<version>1.3.25-SNAPSHOT</version>
<name>TextGrid :: OAI-PMH :: Webapp</name>
<version>2.1.0-SNAPSHOT</version>
<name>DARIAHDE :: OAI-PMH :: Webapp</name>
<url>http://maven.apache.org</url>
<profiles>
<profile>
......@@ -23,39 +23,42 @@
<finalName.war>tgoaipmh</finalName.war>
</properties>
</profile>
<profile>
<id>textgrid.deb</id>
<build>
<plugins>
<plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
<version>1.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jdeb</goal>
</goals>
<configuration>
<snapshotExpand>true</snapshotExpand>
<dataSet>
<data>
<type>file</type>
<src>${project.build.directory}/${project.build.finalName}.war</src>
<mapper>
<type>perm</type>
<prefix>/var/textgrid/webapps</prefix>
</mapper>
</data>
</dataSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>textgrid.deb</id>
<build>
<plugins>
<plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
<version>1.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jdeb</goal>
</goals>
<configuration>
<snapshotExpand>true</snapshotExpand>
<dataSet>
<data>
<type>directory</type>
<src>${project.build.directory}/${project.build.finalName}</src>
<mapper>
<type>perm</type>
<prefix>/var/textgrid/webapps/${project.build.finalName}</prefix>
<user>root</user>
<group>tomcat7</group>
<filemode>755</filemode>
</mapper>
</data>
</dataSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencies>
<dependency>
......
pom.xml
+ 49
− 5
View file @ 44d0a956
......@@ -3,15 +3,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh</artifactId>
<version>1.3.25-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TextGrid :: TG-OAI-PMH :: Parent</name>
<name>DARIAHDE :: OAI-PMH</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cxf.version>3.0.3</cxf.version>
<tgcrud.version>5.5.9-SNAPSHOT</tgcrud.version>
<tgcrud.version>6.0.0</tgcrud.version>
<spring.version>4.0.2.RELEASE</spring.version>
<textgrid.httpclients.version>1.3.0-SNAPSHOT</textgrid.httpclients.version>
<textgrid.httpclients.version>2.0.0</textgrid.httpclients.version>
<jetty.version>6.1.15</jetty.version>
<elasticsearch.version>1.3.6</elasticsearch.version>
<antlr-runtime.version>3.2</antlr-runtime.version>
......@@ -19,7 +19,28 @@
<slf4j.version>1.7.5</slf4j.version>
<junit.version>4.11</junit.version>
<jdk.version>1.7</jdk.version>
</properties>
</properties>
<url>https://projects.gwdg.de/projects/oai-pmh</url>
<scm>
<connection>scm:git@git.projects.gwdg.de:oai-pmh.git</connection>
<developerConnection>scm:git@git.projects.gwdg.de:oai-pmh.git</developerConnection>
<url>https://projects.gwdg.de/projects/oai-pmh</url>
</scm>
<issueManagement>
<system>chili</system>
<url>https://projects.gwdg.de/projects/tg/issues</url>
</issueManagement>
<licenses>
<license>
<name>GNU LESSER GENERAL PUBLIC LICENSE</name>
<url>http://www.gnu.org/licenses/lgpl-3.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<organization>
<name>SUB Göttingen</name>
<url>http://www.sub.uni-goettingen.de</url>
</organization>
<build>
<defaultGoal>package</defaultGoal>
<plugins>
......@@ -56,4 +77,27 @@
<module>oaipmh-core</module>
<module>oaipmh-webapp</module>
</modules>
<repositories>
<repository>
<id>nexus.dariah</id>
<name>DARIAH Nexus Public Repository</name>
<url>http://dev.dariah.eu/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<distributionManagement>
<snapshotRepository>
<id>dariah.nexus.snapshots</id>
<url>http://dev.dariah.eu/nexus/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>dariah.nexus.releases</id>
<url>http://dev.dariah.eu/nexus/content/repositories/releases</url>
</repository>
</distributionManagement>
</project>
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