Merge pull request openhab#13 from dvanherbergen/master

Update to new p2 repository
digitaldan · Jan 21, 2016 · e7edd52 · e7edd52
2 parents 5d92d16 + bdd664b
commit e7edd52
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -56,6 +56,7 @@
         <maven.compiler.target>1.7</maven.compiler.target>
         <maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
 
+        <ohdr.version>1.0.0</ohdr.version>
         <esh.version>0.8.0.b2</esh.version>
         <shk.version>1.2</shk.version>
         <dep.karaf.version>4.0.3</dep.karaf.version>
@@ -157,38 +158,76 @@
     </build>
 
     <repositories>
+        <!-- openHAB releases -->
         <repository>
             <id>jcenter</id>
             <name>JCenter Repository</name>
             <url>https://jcenter.bintray.com/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
         </repository>
-        <repository>
-            <id>shk-bintray</id>
-            <name>Bintray Repository for shk</name>
-            <url>https://dl.bintray.com/maggu2810/maven</url>
-        </repository>             
+
+        <!-- openHAB snapshots -->
         <repository>
             <id>jfrog</id>
             <name>JFrog OSS Repository</name>
             <url>http://oss.jfrog.org/libs-snapshot/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
             <snapshots>
                 <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
+
+        <!-- ESH releases -->
+        <repository>
+            <id>eclipse-releases</id>
+            <name>Eclipse Release Repository</name>
+            <layout>default</layout>
+            <url>https://repo.eclipse.org/content/repositories/releases/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
             </snapshots>
         </repository>
+
+        <!-- ESH Snapshots -->
         <repository>
             <id>eclipse-snapshots</id>
             <name>Eclipse Snapshot Repository</name>
             <layout>default</layout>
             <url>https://repo.eclipse.org/content/repositories/snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
             <snapshots>
                 <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
             </snapshots>
         </repository>
+
+        <!-- SHK releases -->
         <repository>
-            <id>eclipse-releases</id>
-            <name>Eclipse Release Repository</name>
-            <layout>default</layout>
-            <url>https://repo.eclipse.org/content/repositories/releases/</url>
+            <id>shk-bintray</id>
+            <name>Bintray Repository for shk</name>
+            <url>https://dl.bintray.com/maggu2810/maven</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
         </repository>
     </repositories>
 

diff --git a/poms/tycho/pom.xml b/poms/tycho/pom.xml
@@ -44,14 +44,6 @@
                     <resolver>p2</resolver>
                     <ignoreTychoRepositories>true</ignoreTychoRepositories>
                     <pomDependencies>consider</pomDependencies>
-                    <target>
-                        <artifact>
-                            <groupId>org.openhab.core</groupId>
-                            <artifactId>targetplatform</artifactId>
-                            <version>${project.version}</version>
-                            <classifier>openhab</classifier>
-                        </artifact>
-                    </target>
                     <environments>
                         <environment>
                             <os>linux</os>
@@ -185,15 +177,21 @@
     </profiles>
 
 	<repositories>
-		<repository>
-			<id>eclipse</id>
-			<name>Eclipse Snapshot Repository</name>
-			<layout>default</layout>
-			<url>https://repo.eclipse.org/content/repositories/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
+
+        <!-- SmartHome p2 repository -->
+        <repository>
+            <id>p2-smarthome</id>
+            <url>http://download.eclipse.org/smarthome/updates-stable</url>
+            <layout>p2</layout>
+        </repository>
+
+        <!-- openHAB dependencies p2 repository -->
+        <repository>
+            <id>p2-openhab-deps-repo</id>
+            <url>http://repository-openhab.forge.cloudbees.com/release/openhab-deps-repo/${ohdr.version}</url>
+            <layout>p2</layout>
+        </repository>
+
 	</repositories>
 
 </project>