Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • dariah-de/dariah-de-aggregator-services
1 result
Show changes
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 11b6e24b
......@@ -6,3 +6,4 @@ src/main/resources/git.properties
/maven-eclipse.xml
/.externalToolBuilders/
/bin/
/pom.xml.versionsBackup
.project deleted 100644 → 0
View file @ 2a4ed029
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>aggregator-1.4.16-SNAPSHOT</name>
<comment>The TextGrid Aggregator is a service that can walk aggregations (including editions and collections) and export the objects therein to various formats, e.g., HTML, TEI corpus, EPUB, and ZIP. It can also be used to transform single files (it is the component that is responsible for HTML rendering of TEI objects in TextGrid) and export search results as ZIP files. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
</buildCommand>
<buildCommand>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
<value>&lt;project&gt;/.externalToolBuilders/Maven_Ant_Builder.launch</value>
</dictionary>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
</natures>
</projectDescription>
\ No newline at end of file
pom.xml
View file @ 11b6e24b
......@@ -8,7 +8,6 @@
<version>1.5.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>TextGrid Aggregator Service</name>
<developers>
<developer>
<id>vitt</id>
......@@ -19,43 +18,40 @@
<organizationUrl>https://www.germanistik.uni-wuerzburg.de/lehrstuehle/computerphilologie/</organizationUrl>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java-source-version>1.8</java-source-version>
<java-target-version>1.8</java-target-version>
<!-- Referenced from .gitlab-ci.yml for use in git submodule -->
<tei-stylesheet-version>v7.33.0</tei-stylesheet-version>
<build-helper-maven-plugin-version>1.5</build-helper-maven-plugin-version>
<commons-io-version>2.7</commons-io-version>
<link-rewriter-version>0.4.1-RELEASE</link-rewriter-version>
<saxon-version>9.5.1-5</saxon-version> <!-- XXX mind dependency from epubcheck -->
<cxf-version>3.5.2</cxf-version>
<confclient-version>4.1.0</confclient-version>
<cxf-version>3.5.2</cxf-version>
<cyclonedx-maven-plugin.version>2.7.0</cyclonedx-maven-plugin.version>
<tgsearch-version>4.0.5</tgsearch-version>
<tgcrud-version>11.7.0</tgcrud-version>
<epubcheck-version>4.0.0-alpha11</epubcheck-version>
<git-commit-id-plugin-version>2.1.15</git-commit-id-plugin-version>
<guava-version>15.0</guava-version>
<icu4j-version>51.1</icu4j-version>
<junit-version>4.13.2</junit-version>
<servlet-api-version>3.1.0</servlet-api-version>
<spring-version>5.3.21</spring-version>
<git-commit-id-plugin-version>2.1.15</git-commit-id-plugin-version>
<lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
<link-rewriter-version>0.4.1-RELEASE</link-rewriter-version>
<maven-compiler-plugin-version>3.9.0</maven-compiler-plugin-version>
<maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
<maven-failsafe-plugin-version>2.8.1</maven-failsafe-plugin-version>
<maven-project-info-reports-plugin>2.8</maven-project-info-reports-plugin>
<maven-site-plugin-version>3.4</maven-site-plugin-version>
<tomcat6-maven-plugin-version>2.1</tomcat6-maven-plugin-version>
<build-helper-maven-plugin-version>1.5</build-helper-maven-plugin-version>
<maven-surefire-plugin-version>2.14</maven-surefire-plugin-version>
<maven-war-plugin-version>3.3.2</maven-war-plugin-version>
<maven-project-info-reports-plugin>2.8</maven-project-info-reports-plugin>
<saxon-version>9.5.1-5</saxon-version> <!-- XXX mind dependency from epubcheck -->
<servlet-api-version>3.1.0</servlet-api-version>
<sphinx-maven-plugin-version>1.0.3</sphinx-maven-plugin-version>
<icu4j-version>51.1</icu4j-version>
<spring-version>5.3.21</spring-version>
<tei-stylesheet-version>v7.33.0</tei-stylesheet-version>
<tgcrud-version>11.7.0</tgcrud-version>
<tgsearch-version>4.0.5</tgsearch-version>
<tomcat6-maven-plugin-version>2.1</tomcat6-maven-plugin-version>
<vafer-version>1.4</vafer-version>
<epubcheck-version>4.0.0-alpha11</epubcheck-version>
<xmlunit-version>1.5</xmlunit-version>
<lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
<!-- The following properties are used for configuring the web service
and can be overridden in profiles -->
<aggregator.endpoint.published>http://localhost:13000/aggregator</aggregator.endpoint.published>
......@@ -63,39 +59,13 @@
<aggregator.textgridrep.dev>https://dev.textgridlab.org/1.0/confserv</aggregator.textgridrep.dev>
<aggregator.classifier />
</properties>
<repositories>
<repository>
<id>maven-dariah-public</id>
<name>GWDG Nexus DARIAH-DE Repository</name>
<url> https://nexus.gwdg.de/repository/maven-dariah-public/</url>
</repository>
<!--
<repository>
<id>dh.nexus.releases</id>
<name>Cophi Nexus Releases</name>
<url>https://dev.digital-humanities.de/nexus/content/repositories/releases</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>dh.nexus.snapshots</id>
<name>Cophi Nexus snapshots</name>
<url>http://dev.digital-humanities.de/nexus/content/repositories/snapshots</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
-->
</repositories>
<distributionManagement>
<snapshotRepository>
<id>maven-dariah-public</id>
......@@ -108,7 +78,6 @@
<url>https://nexus.gwdg.de/repository/maven-dariah-public/</url>
</repository>
</distributionManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
......@@ -181,6 +150,13 @@
<artifactId>cxf-rt-rs-service-description</artifactId>
<version>${cxf-version}</version>
</dependency>
<!-- Trying to generate WADL again, maybe with this module? See https://cxf.apache.org/docs/jaxrs-services-description.html#JAXRSServicesDescription-java2wadlMavenplugin?
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-java2wadl-plugin</artifactId>
<version>${cxf-version}</version>
</dependency>
-->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
......@@ -218,10 +194,7 @@
<version>${xmlunit-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
......@@ -263,7 +236,7 @@
<wtpversion>2.0</wtpversion>
</configuration>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
<!--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>
......@@ -470,23 +443,23 @@
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-reports-plugin}</version>
<reportSets>
<reportSet>
<reports />
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.tomdz.maven</groupId>
<artifactId>sphinx-maven-plugin</artifactId>
<version>${sphinx-maven-plugin-version}</version>
<configuration>
<sourceDirectory>${basedir}/docs</sourceDirectory>
</configuration>
</plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-reports-plugin}</version>
<reportSets>
<reportSet>
<reports />
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.tomdz.maven</groupId>
<artifactId>sphinx-maven-plugin</artifactId>
<version>${sphinx-maven-plugin-version}</version>
<configuration>
<sourceDirectory>${basedir}/docs</sourceDirectory>
</configuration>
</plugin>
</plugins>
</reporting>
<profiles>
......@@ -643,4 +616,4 @@
<url>https://gitlab.gwdg.de/dariah-de/dariah-de-aggragator-services/pipelines</url>
</ciManagement>
<url>https://gitlab.gwdg.de/dariah-de/dariah-de-aggragator-services</url>
</project>
</project>
\ No newline at end of file