From 65f51ef0cec9b246e0f64cee3904e8ffa0c32f70 Mon Sep 17 00:00:00 2001
From: daniel <daniel.haag@uibk.ac.at>
Date: Tue, 4 Aug 2020 09:27:49 +0200
Subject: [PATCH] openolat#1: fixed regression from d07eed25b29
---
pom.xml | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index dae72ed9aac..ab600d0365b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,14 +29,12 @@
</licenses>
<distributionManagement>
<repository>
- <id>nexus.openolat</id>
- <name>OpenOLAT Internal Nexus Release Repository</name>
- <url>https://nexus.openolat.org/nexus/content/repositories/openolat</url>
+ <id>nmvn-lms</id>
+ <url>https://nmvn.uibk.ac.at/artifactory/olat-release-local</url>
</repository>
<snapshotRepository>
- <id>nexus.openolat</id>
- <name>OpenOLAT Internal Nexus Snapshot Repository</name>
- <url>https://nexus.openolat.org/nexus/content/repositories/openolat-snapshots</url>
+ <id>nmvn-lms</id>
+ <url>https://nmvn.uibk.ac.at/artifactory/olat-snapshot-local</url>
</snapshotRepository>
</distributionManagement>
<issueManagement>
@@ -44,9 +42,10 @@
<url>https://jira.openolat.org</url>
</issueManagement>
<scm>
- <url>https://github.com/OpenOLAT/OpenOLAT</url>
- <connection>scm:git:git://github.com/OpenOLAT/OpenOLAT.git</connection>
- <developerConnection>scm:git:git@github.com:OpenOLAT/OpenOLAT.git</developerConnection>
+ <connection>scm:git:git@git.uibk.ac.at:zid/dmlt/olat/openolat.git</connection>
+ <developerConnection>scm:git:git@git.uibk.ac.at:zid/dmlt/olat/openolat.git</developerConnection>
+ <url>https://git.uibk.ac.at/zid/dmlt/olat/openolat</url>
+ <tag>HEAD</tag>
</scm>
<mailingLists>
<mailingList>
@@ -586,6 +585,7 @@
<filtering>false</filtering>
</resource>
</webResources>
+ <webXml>src/main/webapp-tomcat/WEB-INF/web.xml</webXml>
</configuration>
</plugin>
</plugins>
@@ -1049,7 +1049,7 @@
<goal>execute</goal>
</goals>
<configuration>
- <url>jdbc:postgresql://localhost:${test.env.db.postgresql.host.port}/postgres</url>
+ <url>jdbc:postgresql://${test.env.db.postgresql.host.name}:${test.env.db.postgresql.host.port}/postgres</url>
<autocommit>true</autocommit>
<sqlCommand>drop database if exists ${test.env.db.name}</sqlCommand>
</configuration>
@@ -1064,7 +1064,7 @@
</goals>
<configuration>
<!-- need another database to drop the targeted one -->
- <url>jdbc:postgresql://localhost:${test.env.db.postgresql.host.port}/postgres</url>
+ <url>jdbc:postgresql://${test.env.db.postgresql.host.name}:${test.env.db.postgresql.host.port}/postgres</url>
<autocommit>true</autocommit>
<sqlCommand>drop database if exists ${test.env.db.name}</sqlCommand>
<!-- ignore error when database is not avaiable -->
@@ -1079,7 +1079,7 @@
<goal>execute</goal>
</goals>
<configuration>
- <url>jdbc:postgresql://localhost:${test.env.db.postgresql.host.port}/postgres</url>
+ <url>jdbc:postgresql://${test.env.db.postgresql.host.name}:${test.env.db.postgresql.host.port}/postgres</url>
<!-- no transaction -->
<autocommit>true</autocommit>
<sqlCommand>create database ${test.env.db.name}</sqlCommand>
@@ -1108,7 +1108,7 @@
<goal>execute</goal>
</goals>
<configuration>
- <url>jdbc:postgresql://localhost:${test.env.db.postgresql.host.port}/postgres</url>
+ <url>jdbc:postgresql://${test.env.db.postgresql.host.name}:${test.env.db.postgresql.host.port}/postgres</url>
<autocommit>true</autocommit>
<sqlCommand>drop database if exists ${test.env.db.name}</sqlCommand>
</configuration>
@@ -1250,6 +1250,8 @@
</pluginRepository>
</pluginRepositories>
<build>
+ <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
+
<!-- Useful maven commands: o mvn dependency:tree - check to see what other
dependencies get downloaded by an artifact o Maven lifecycle: Each phase
of the lifecycle can also be called independent - e.g. mvn process-resources
@@ -1318,8 +1320,10 @@
<phase>validate</phase>
</execution>
</executions>
+
<configuration>
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+ <useNativeGit>true</useNativeGit>
</configuration>
</plugin>
<plugin>
--
GitLab