From 869f0f24717606581ee31adaa041aa0931fa2e67 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Mon, 09 Apr 2018 21:33:55 +0000
Subject: [PATCH] fix travis format
---
opendj-ldap-toolkit/src/test/resources/ldifdiff/ldifDiffAndModifyTestCase.ldif | 5 +++++
opendj-server-legacy/pom.xml | 1 +
.travis.yml | 5 ++---
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index d06b5ee..ae485e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,9 +62,8 @@
jdk: oraclejdk8
- os: osx
osx_image: xcode9.1
- env:
- - WINEPREFIX=~/.wine32
- - WINEARCH=win32 # wine on mac hangs
+ env:
+ - WINEPREFIX=~/.wine32 WINEARCH=win32 # wine on mac hangs
allow_failures:
- os: osx
branches:
diff --git a/opendj-ldap-toolkit/src/test/resources/ldifdiff/ldifDiffAndModifyTestCase.ldif b/opendj-ldap-toolkit/src/test/resources/ldifdiff/ldifDiffAndModifyTestCase.ldif
new file mode 100644
index 0000000..b2163ea
--- /dev/null
+++ b/opendj-ldap-toolkit/src/test/resources/ldifdiff/ldifDiffAndModifyTestCase.ldif
@@ -0,0 +1,5 @@
+dn: dc=example,dc=com
+objectClass: top
+objectClass: domain
+dc: example
+
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 69a2c91..d109eeb 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -711,6 +711,7 @@
<plugin>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.6</version>
<executions>
<!-- Package boostrap jar - contains only a manifest with classpath for the server -->
<execution>
--
Gitblit v1.10.0