switched snapshot online repo to artifactory (openhab#449)

Signed-off-by: Kai Kreuzer <[email protected]>
laygond · Apr 29, 2017 · 168bc53 · 168bc53
1 parent e17d680
commit 168bc53
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/distributions/online-repo/src/main/filtered-resources/publish-artifactory.sh b/distributions/online-repo/src/main/filtered-resources/publish-artifactory.sh
@@ -24,7 +24,7 @@ function main() {
   cd $DIRNAME
 
   echo "Uploading archive $PACKAGE_ARCHIVE"
-  response=$(curl -s -u ${ARTIFACTORY_USER}:${ARTIFACTORY_API_KEY} -H "X-Explode-Archive-Atomic: true" -X PUT "${ARTIFACTORY_URL}/repo.zip" -T ${PACKAGE_ARCHIVE} )
+  response=$(curl -s -u ${ARTIFACTORY_USER}:${ARTIFACTORY_API_KEY} -H "X-Explode-Archive-Atomic: true" -X PUT "${ARTIFACTORY_URL}/${PACKAGE_VERSION}/repo.zip" -T ${PACKAGE_ARCHIVE} )
   echo "Upload finished: $response"
 }
 

diff --git a/distributions/openhab/src/main/filtered-resources/userdata/etc/org.ops4j.pax.url.mvn.cfg b/distributions/openhab/src/main/filtered-resources/userdata/etc/org.ops4j.pax.url.mvn.cfg
@@ -77,4 +77,4 @@ org.ops4j.pax.url.mvn.defaultRepositories=\
 # This contains the openhab, smart home and default repositories.
 #
 org.ops4j.pax.url.mvn.repositories= \
-	https://dl.bintray.com/openhab/mvn/online-repo/${online.repo.version}@id=openhab@snapshots
+	${online.repo}@id=openhab@snapshots
diff --git a/distributions/openhab/src/main/filtered-resources/userdata/etc/version.properties b/distributions/openhab/src/main/filtered-resources/userdata/etc/version.properties
@@ -1,7 +1,7 @@
 openHAB Distribution Version Information
 ----------------------------------------
 build-no        : ${build.number}
-online-repo     : https://dl.bintray.com/openhab/mvn/online-repo/${online.repo.version}
+online-repo     : ${online.repo}
 
 Repository        Version
 ----------------------------------------

diff --git a/features/addons-esh/src/main/feature/feature.xml b/features/addons-esh/src/main/feature/feature.xml
@@ -117,7 +117,7 @@
         <bundle>mvn:org.openhab.core/org.openhab.io.rest.docs/${project.version}</bundle>
     </feature>
 
-    <feature name="openhab-misc-marketplace" description="IoT Marketplace" version="${project.version}">
+    <feature name="openhab-misc-market" description="Eclipse IoT Market" version="${project.version}">
         <feature>openhab-runtime-base</feature>
         <feature>esh-extensionservice-marketplace</feature>
     </feature>

diff --git a/pom.xml b/pom.xml
@@ -48,8 +48,8 @@
 
     <properties>
         <build.number>- local build -</build.number>
-        <online.repo.version>2.1.nightly</online.repo.version>
-		<online.repo>https://openhab.jfrog.io/openhab/online-repo-snapshot/${online.repo.version}@id=openhab@snapshots</online.repo>
+        <online.repo.version>2.1</online.repo.version>
+        <online.repo>https://openhab.jfrog.io/openhab/online-repo-snapshot/${online.repo.version}</online.repo>
 
         <esh.version>0.9.0-SNAPSHOT</esh.version>
         <ohc.version>2.1.0-SNAPSHOT</ohc.version>