Maintenance of integration branches

Rebases are done weekly, usually on Monday.

camel-2.21.x branch

# Build Camel master branch
cd camel
git fetch upstream # upstream is git@github.com:apache/camel.git
git checkout master
git reset --hard upstream/master
mvn clean install -DskipTests

# Push Camel to your fork to mark which revision you used
git push origin master # origin is git@github.com:${your_github_username}/camel.git

# Rebase WildFly Camel
cd ../wildfly-camel
git fetch upstream # upstream is git@github.com:wildfly-extras/wildfly-camel.git
git checkout camel-2.21.x
git reset --hard upstream/camel-2.21.x
git rebase upstream/master
mvn clean install -Dts.all

git push upstream camel-2.21.x -f

wildfly-11.x

cd wildfly
git fetch upstream # upstream is git@github.com:wildfly/wildfly.git
git checkout 11.x # or git checkout -b 11.x upstream/11.x # if done for the first time
git reset --hard upstream/11.x
mvn clean install -DskipTests -Prelease
# Push wildfly to your fork to mark which revision you used
git push origin 11.x # origin is git@github.com:${your_github_username}/wildfly.git

# Note that fuse-patch depends on wildfly
cd ../fuse-patch
git fetch upstream # upstream is git@github.com:wildfly-extras/fuse-patch.git
git checkout wildfly-11.1.x
git reset --hard upstream/wildfly-11.1.x
mvn clean install -DskipTests
# Push fuse-patch to your fork to mark which revision you used
git push origin wildfly-11.1.x # origin is git@github.com:${your_github_username}/wildfly.git

# wildfly-camel depends on both wildfly and fuse-patch
cd ../wildfly-camel
git checkout wildfly-11.x
git reset --hard upstream/wildfly-11.x
# make sure upstream/master is at the same revision as when you rebased camel-2.21.x above
git rebase upstream/master
mvn clean install -Dts.all
git push upstream wildfly-11.x -f

wildfly-12.x

cd wildfly
git fetch upstream # upstream is git@github.com:wildfly/wildfly.git
git checkout master
git reset --hard upstream/master
mvn clean install -DskipTests -Prelease
# Push wildfly to your fork to mark which revision you used
git push origin master # origin is git@github.com:${your_github_username}/wildfly.git

# Note that fuse-patch depends on wildfly
cd ../fuse-patch
git fetch upstream # upstream is git@github.com:wildfly-extras/fuse-patch.git
git checkout wildfly-12.x
git reset --hard upstream/wildfly-12.x
mvn clean install -DskipTests
# Push fuse-patch to your fork to mark which revision you used
git push origin wildfly-12.x # origin is git@github.com:${your_github_username}/wildfly.git

# wildfly-camel depends on both wildfly and fuse-patch
cd ../wildfly-camel
git fetch upstream # upstream is git@github.com:wildfly-extras/wildfly-camel.git
git checkout wildfly-12.x
git reset --hard upstream/wildfly-12.x
git rebase upstream/master
mvn clean install -Dts.all
git push upstream wildfly-12.x -f