홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
2dec354e 1 parent b1170bd2

Extending the versioning to cover BUCK artifacts. 

Adding ability to version extraneous stuff.

Change-Id: I2e18dafd6d8705504ab01000d6707037415dfd0c
(cherry picked from commit 251016df)
Inline Side-by-side
Showing 5 changed files with 27 additions and 6 deletions
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
20 <feature>onos-api</feature> 20 <feature>onos-api</feature>
21 <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle> 21 <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
22 22
23 - <bundle>mvn:org.onosproject/openflowj/0.9.3.onos-SNAPSHOT</bundle> 23 + <bundle>mvn:org.onosproject/openflowj/0.9.4.onos</bundle>
24 <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle> 24 <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle>
25 -
26 </feature> 25 </feature>
27 </features> 26 </features>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
19 description="${project.description}"> 19 description="${project.description}">
20 <feature>onos-api</feature> 20 <feature>onos-api</feature>
21 - <bundle>mvn:org.onosproject/openflowj/0.9.3.onos-SNAPSHOT</bundle> 21 + <bundle>mvn:org.onosproject/openflowj/0.9.4.onos</bundle>
22 <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle> 22 <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle>
23 <bundle>mvn:${project.groupId}/onos-of-ctl/${project.version}</bundle> 23 <bundle>mvn:${project.groupId}/onos-of-ctl/${project.version}</bundle>
24 24
......
...@@ -17,6 +17,8 @@ cd $ONOS_ROOT ...@@ -17,6 +17,8 @@ cd $ONOS_ROOT
17 17
18 # Augment the version of the main pom and the modules nested underneath. 18 # Augment the version of the main pom and the modules nested underneath.
19 mvn versions:set -DnewVersion=$NEW_VERSION versions:commit 19 mvn versions:set -DnewVersion=$NEW_VERSION versions:commit
20 +mvn -f lib/pom.xml versions:set -DnewVersion=$NEW_VERSION versions:commit
21 +sed -i "" -E "1,/<version>/s/<version>[^<]*</<version>$NEW_VERSION</g" pom.xml
20 22
21 # Augment the version of the Java API pom files and the overview.html file. 23 # Augment the version of the Java API pom files and the overview.html file.
22 for pom in docs/internal.xml docs/external.xml; do 24 for pom in docs/internal.xml docs/external.xml; do
...@@ -46,3 +48,10 @@ sed -i "" -E "s/-DarchetypeVersion=[^\"]*/-DarchetypeVersion=$NEW_VERSION/g" $ON ...@@ -46,3 +48,10 @@ sed -i "" -E "s/-DarchetypeVersion=[^\"]*/-DarchetypeVersion=$NEW_VERSION/g" $ON
46 perl -i -0pe "s#<artifactId>cord-gui<.*\n.*version>#<artifactId>cord-gui</artifactId>\n <version>$NEW_VERSION</version>#" $ONOS_ROOT/apps/demo/cord-gui/pom.xml 48 perl -i -0pe "s#<artifactId>cord-gui<.*\n.*version>#<artifactId>cord-gui</artifactId>\n <version>$NEW_VERSION</version>#" $ONOS_ROOT/apps/demo/cord-gui/pom.xml
47 sed -i "" -E "s#demo/cord-gui/target/cord-gui-.*\.war#demo/cord-gui/target/cord-gui-$NEW_VERSION.war#" $ONOS_ROOT/apps/demo/cord-gui/src/scripts/pullwar.sh 49 sed -i "" -E "s#demo/cord-gui/target/cord-gui-.*\.war#demo/cord-gui/target/cord-gui-$NEW_VERSION.war#" $ONOS_ROOT/apps/demo/cord-gui/src/scripts/pullwar.sh
48 sed -i "" -E "s#CORD=./cord-gui-.*\.war#CORD=./cord-gui-$NEW_VERSION.war#" $ONOS_ROOT/apps/demo/cord-gui/src/scripts/run.me 50 sed -i "" -E "s#CORD=./cord-gui-.*\.war#CORD=./cord-gui-$NEW_VERSION.war#" $ONOS_ROOT/apps/demo/cord-gui/src/scripts/run.me
51 +
52 +# Version the BUCK artifacts
53 +sed -i "" -E "s#/org/onosproject/onos-features/.*/#/org/onosproject/onos-features/$NEW_VERSION/#" $ONOS_ROOT/buck-tools/onos_stage.py
54 +sed -i "" -E "s#onos-features-.*-features.xml#onos-features-$NEW_VERSION-features.xml#" $ONOS_ROOT/buck-tools/onos_stage.py
55 +
56 +sed -i "" -E "s#ONOS_VERSION = .*#ONOS_VERSION = '$NEW_VERSION'#" $ONOS_ROOT/bucklets/onos.bucklet
57 +sed -i "" -E "s#ONOS_VERSION = .*#ONOS_VERSION = '$NEW_VERSION'#" $ONOS_ROOT/bucklets/onos_app.bucklet
......
...@@ -9,8 +9,11 @@ aux=$(mktemp) ...@@ -9,8 +9,11 @@ aux=$(mktemp)
9 trap "rm -f $aux 2>/dev/null" EXIT 9 trap "rm -f $aux 2>/dev/null" EXIT
10 10
11 cd $ONOS_ROOT 11 cd $ONOS_ROOT
12 -grep -r SNAPSHOT . | \ 12 +find . -type f | \
13 - egrep -v -f $ONOS_ROOT/tools/build/onos-validate-change-version.excludes >$aux 13 + egrep -v -f $ONOS_ROOT/tools/build/onos-validate-change-version.excludes | \
14 + xargs grep SNAPSHOT >$aux
15 +
16 + # FIXME: deal properly with files with white-space in them
14 17
15 if [ -s $aux ]; then 18 if [ -s $aux ]; then
16 echo "There are files containing SNAPSHOT references:" 19 echo "There are files containing SNAPSHOT references:"
......
1 \./build.log 1 \./build.log
2 \./.git 2 \./.git
3 -\./target/ 3 +/target/
4 +\.iml$
5 +\./buck-out/
6 +\./lib/BUCK
7 +\./lib/deps.json
8 +\./bucklets/maven_jar\.bucklet
9 +\./tools/build/libgen
10 +\./utils/osgiwrap/
4 \./tools/build/onos-validate-change-version 11 \./tools/build/onos-validate-change-version
5 \./tools/build/onos-change-version 12 \./tools/build/onos-change-version
6 \./tools/build/onos-release 13 \./tools/build/onos-release
...@@ -19,3 +26,6 @@ ...@@ -19,3 +26,6 @@
19 \./protocols/ospf/ 26 \./protocols/ospf/
20 \./protocols/snmp/ 27 \./protocols/snmp/
21 \./providers/snmp/ 28 \./providers/snmp/
29 +\./providers/bmv2/
30 +\./drivers/bmv2/
31 +\./apps/kafka-integration/
...\ No newline at end of file ...\ No newline at end of file
......