Commit 4464713b authored by Stefan Funk's avatar Stefan Funk
Browse files

Merge branch 'release/3.3.0'

parents a0edaceb e66f449c
......@@ -7,7 +7,7 @@
<parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>common</artifactId>
<version>3.2.9</version>
<version>3.3.0</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>cli-tools</artifactId>
......
......@@ -6,7 +6,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>info.textgrid.middleware</groupId>
<version>3.2.9</version>
<version>3.3.0</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>confclient</artifactId>
......@@ -26,7 +26,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<!-- 1.3 SNAPSHOT is actually patched and locally packaged with maven-bundle-plugin
<!-- 1.3 SNAPSHOT is actually patched and locally packaged with maven-bundle-plugin
2.3.4, to prevent circualar osgi import -->
<version>1.3.3</version>
</dependency>
......
......@@ -5,12 +5,12 @@
<parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>common</artifactId>
<version>3.2.9</version>
<version>3.3.0</version>
</parent>
<groupId>info.textgrid.utils</groupId>
<artifactId>esutils</artifactId>
<packaging>jar</packaging>
<name>TextGrid :: ElasticSearch Utilities</name>
<name>DARIAHDE :: ElasticSearch Utilities</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......
......@@ -7,7 +7,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>info.textgrid.middleware</groupId>
<version>3.2.9</version>
<version>3.3.0</version>
</parent>
<groupId>info.textgrid.utils</groupId>
<artifactId>httpclients</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>info.textgrid.middleware</groupId>
<version>3.2.9</version>
<version>3.3.0</version>
</parent>
<groupId>info.textgrid.namespaces</groupId>
<artifactId>metadata-core-jaxb</artifactId>
......@@ -25,7 +25,7 @@
<build>
<finalName>metadata-core-jaxb</finalName>
<plugins>
<!-- this task checks if the metadata-schema and related files are up
<!-- this task checks if the metadata-schema and related files are up
to date, if not reload from textgridlab.org -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......
......@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>common</artifactId>
<groupId>info.textgrid.middleware</groupId>
<name>TextGrid :: Common Tools and Packages</name>
<version>3.2.9</version>
<name>DARIAHDE :: Common Tools and Packages</name>
<version>3.3.0</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......@@ -21,7 +21,7 @@
<url>https://projects.gwdg.de/projects/common</url>
</scm>
<issueManagement>
<system>chili</system>
<system>projects.gwdg.de</system>
<url>https://projects.gwdg.de/projects/tg/work_packages</url>
</issueManagement>
<organization>
......@@ -40,7 +40,7 @@
<repositories>
<repository>
<id>dariah.nexus.releases</id>
<name>DARIAH Nexus Release Repository</name>
<name>DARIAH-DE Nexus Release Repository</name>
<url>https://ci.de.dariah.eu/nexus/content/repositories/releases</url>
<releases>
<enabled>true</enabled>
......@@ -51,7 +51,7 @@
</repository>
<repository>
<id>dariah.nexus.snapshots</id>
<name>Archiva Managed Snapshot Repository</name>
<name>DARIAH-DE Nexus Snapshot Repository</name>
<url>https://ci.de.dariah.eu/nexus/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
......
......@@ -4,7 +4,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>info.textgrid.middleware</groupId>
<version>3.2.9</version>
<version>3.3.0</version>
</parent>
<groupId>info.textgrid.namespaces</groupId>
<artifactId>projectfile-jaxb</artifactId>
......@@ -25,12 +25,12 @@
<build>
<finalName>projectfile-jaxb</finalName>
<plugins>
<!-- this task checks if the metadata-schema is up to date, if not reload
<!-- this task checks if the metadata-schema is up to date, if not reload
from www.textgrid.de -->
<!--plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version> <executions> <execution> <id>do-get</id> <phase>initialize</phase>
<goals> <goal>run</goal> </goals> <configuration> <tasks> <get usetimestamp="true"
src="http://textgridlab.org/schema/textgrid-metadata_2010.xsd" dest="src/main/resources/textgrid-metadata_2010.xsd"
<!--plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version> <executions> <execution> <id>do-get</id> <phase>initialize</phase>
<goals> <goal>run</goal> </goals> <configuration> <tasks> <get usetimestamp="true"
src="http://textgridlab.org/schema/textgrid-metadata_2010.xsd" dest="src/main/resources/textgrid-metadata_2010.xsd"
/> </tasks> </configuration> </execution> </executions> </plugin -->
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
......
......@@ -8,7 +8,7 @@
<parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>common</artifactId>
<version>3.2.9</version>
<version>3.3.0</version>
</parent>
<groupId>info.textgrid.middleware.clients</groupId>
......@@ -35,8 +35,6 @@
<artifactId>tgcrud-client</artifactId>
<version>${tgcrud-client.version}</version>
</dependency>
<!-- <dependency> <groupId>info.textgrid.middleware</groupId> <artifactId>confclient</artifactId>
<version>2.0.0</version> </dependency> -->
<dependency>
<groupId>info.textgrid.middleware</groupId>
<artifactId>tgauth-client</artifactId>
......
Supports Markdown
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