Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #14090: rudder-server-relay fail to build #1777

Merged
merged 1 commit into from
Jan 7, 2019
+7 −7
Merged

Fixes #14090: rudder-server-relay fail to build #1777

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions rudder-webapp/SOURCES/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,18 @@ maven/bin/mvn:
rudder.war: maven/bin/mvn rudder-sources endpoint.war
maven/bin/mvn -s settings-external.xml --batch-mode org.apache.maven.plugins:maven-dependency-plugin:3.0.0:copy -Dmaven.repo.local=.m2/repository -Dartifact=com.normation.rudder:rudder-web:$$(sed -n '/<parent>/,/<.parent>/s/.*<version>\(.*\)<.version>.*/\1/p' rudder-sources/rudder/pom.xml):war -DoutputDirectory=. && mv rudder-web*.war rudder.war $(NEXUS_IGNORE)
ifeq (false,$(NRM))
cd rudder-sources/rudder && maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
mv rudder-sources/rudder/rudder-web/target/rudder-web*.war rudder.war
[ ! -f rudder.war ] && cd rudder-sources/rudder && ../../maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
[ ! -f rudder.war ] && mv rudder-sources/rudder/rudder-web/target/rudder-web*.war rudder.war
endif

endpoint.war: maven/bin/mvn rudder-sources
maven/bin/mvn -s settings-external.xml --batch-mode org.apache.maven.plugins:maven-dependency-plugin:3.0.0:copy -Dmaven.repo.local=.m2/repository -Dartifact=com.normation.inventory:inventory-provisioning-web:$$(sed -n '/<parent>/,/<.parent>/s/.*<version>\(.*\)<.version>.*/\1/p' rudder-sources/ldap-inventory/pom.xml):war -DoutputDirectory=. && mv inventory-provisioning-web*.war endpoint.war $(NEXUS_IGNORE)
ifeq (false,$(NRM))
cd rudder-sources/rudder-parent-pom && maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
cd rudder-sources/rudder-commons && maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
cd rudder-sources/scala-ldap && maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
cd rudder-sources/ldap-inventory && maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
mv rudder-sources/rudder/rudder-web/target/inventory-provisioning-web*.war endpoint.war
[ ! -f endpoint.war ] && cd rudder-sources/rudder-parent-pom && ../../maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
[ ! -f endpoint.war ] && cd rudder-sources/rudder-commons && ../../maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
[ ! -f endpoint.war ] && cd rudder-sources/scala-ldap && ../../maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
[ ! -f endpoint.war ] && cd rudder-sources/ldap-inventory && ../../maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
[ ! -f endpoint.war ] && mv rudder-sources/rudder/rudder-web/target/inventory-provisioning-web*.war endpoint.war
endif

rudder-sources.tar.bz2:
Expand Down