From 62aa935418029caf16f1bd7729b27ff768c00a25 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Wed, 30 May 2018 20:34:59 +0000
Subject: [PATCH] remove distribution profile by default fix https://github.com/OpenIdentityPlatform/OpenAM/issues/40
---
opendj-packages/pom.xml | 4 ++--
.travis.yml | 4 +---
README.md | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 3afd241..84da216 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,13 +9,11 @@
sudo: required
services:
- docker
- env:
- - INSTALL_SUFFIX=-P\!man-pages,\!distribution #exclude modules for release:prepare (double slow build phase)
before_deploy:
- git config --local user.name "Open Identity Platform Community" && git config --local user.email "open-identity-platform-opendj@googlegroups.com"
- git checkout -f $TRAVIS_BRANCH
- git tag -f $git_version && git tag -d $git_version
- - mvn -q -B -DreleaseVersion="$git_version" -DignoreSnapshots=true -DpushChanges=false -DscmCommentPrefix="[ci skip] $git_version_last->$git_version " -DskipTests -Darguments=-DskipTests -Dresume=false release:prepare
+ - mvn -q -B -DreleaseVersion="$git_version" -DignoreSnapshots=true -DpushChanges=false -DscmCommentPrefix="[ci skip] $git_version_last->$git_version " -DskipTests -Darguments=-DskipTests -Dresume=false -P distribution release:prepare
- git push --quiet --force https://$GITHUBKEY@github.com/$TRAVIS_REPO_SLUG.git >/dev/null 2>&1
- git push --quiet --force https://$GITHUBKEY@github.com/$TRAVIS_REPO_SLUG.git $git_version >/dev/null 2>&1
deploy:
diff --git a/README.md b/README.md
index b87d6c6..450043b 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@
```bash
git clone --recursive https://github.com/OpenIdentityPlatform/OpenDJ.git
mvn clean install -f OpenDJ/forgerock-parent
-mvn clean install -f OpenDJ -P\!distribution
+mvn clean install -f OpenDJ
```
## How-to run after build
diff --git a/opendj-packages/pom.xml b/opendj-packages/pom.xml
index 4a2c67d..8b908e6 100644
--- a/opendj-packages/pom.xml
+++ b/opendj-packages/pom.xml
@@ -45,10 +45,10 @@
<profile>
<id>distribution</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<modules>
- <module>../opendj-doc-generated-ref</module>
+ <module>../opendj-doc-generated-ref</module>
<module>opendj-deb</module>
<module>opendj-rpm</module>
<module>opendj-svr4</module>
--
Gitblit v1.10.0