Changing org.onlab.onos package to org.onosproject
Change-Id: Ic81421faa27acdcff045add47d9e0a715cd4f575
diff --git a/tools/build/conf/pom.xml b/tools/build/conf/pom.xml
index 4865705..bab81ca 100644
--- a/tools/build/conf/pom.xml
+++ b/tools/build/conf/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.onlab.tools</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-build-conf</artifactId>
<version>1.0</version>
diff --git a/tools/build/conf/src/main/resources/onos/findbugs-suppressions.xml b/tools/build/conf/src/main/resources/onos/findbugs-suppressions.xml
index eb5a385..2ebfa1d 100644
--- a/tools/build/conf/src/main/resources/onos/findbugs-suppressions.xml
+++ b/tools/build/conf/src/main/resources/onos/findbugs-suppressions.xml
@@ -18,13 +18,13 @@
<!-- False positives on calls to CompletableFuture methods with a null
parameter -->
<Match>
- <Class name="~org\.onlab\.onos\.store\.service\.impl\..*" />
+ <Class name="~org\.onosproject\.store\.service\.impl\..*" />
<Bug pattern="NP_NONNULL_PARAM_VIOLATION" />
</Match>
<!-- Filter out testing application -->
<Match>
- <Class name="~org\.onlab\.onos\.foo\..*" />
+ <Class name="~org\.onosproject\.foo\..*" />
</Match>
</FindBugsFilter>
diff --git a/tools/build/onos-package b/tools/build/onos-package
index 9368cb4..9bc8fd5 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -47,15 +47,15 @@
$ONOS_ROOT/tools/package/bin/onos > bin/onos
# Stage the ONOS bundles
-mkdir -p $KARAF_DIST/system/org/onlab
-cp -r $M2_REPO/org/onlab $KARAF_DIST/system/org/
+mkdir -p $KARAF_DIST/system/org/onosproject
+cp -r $M2_REPO/org/onosproject $KARAF_DIST/system/org/
export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-foo}"
# ONOS Patching ----------------------------------------------------------------
# Patch the Apache Karaf distribution file to add ONOS features repository
-perl -pi.old -e "s|^(featuresRepositories=.*)|\1,mvn:org.onlab.onos/onos-features/$ONOS_POM_VERSION/xml/features|" \
+perl -pi.old -e "s|^(featuresRepositories=.*)|\1,mvn:org.onosproject/onos-features/$ONOS_POM_VERSION/xml/features|" \
$ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg
# Patch the Apache Karaf distribution file to load ONOS features
@@ -63,7 +63,7 @@
$ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg
# Patch the Apache Karaf distribution with ONOS branding bundle
-cp $M2_REPO/org/onlab/onos/onos-branding/$ONOS_POM_VERSION/onos-branding-*.jar \
+cp $M2_REPO/org/onosproject/onos-branding/$ONOS_POM_VERSION/onos-branding-*.jar \
$ONOS_STAGE/$KARAF_DIST/lib
# Patch in the ONOS version file