demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 21:31:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Preparations towards a reproducible release build (#259)

Browse Source 
- using an ESH release build (0.10.0.b1)
- added ESH release p2 repos for release builds
- removed targetplatform, which afaics isn't used at all anymore

Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer 2017-12-14 23:48:55 +01:00 committed by GitHub
parent bfa6c9ad06
commit 371d743bff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 2603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bundles/org.openhab.ui.dashboard/src/main/java/org/openhab/ui/dashboard/internal/DashboardService.java
View File

@ -236,7 +236,6 @@ public class DashboardService {
* @param key key to get locale from
* @return localized text for the key
*/
private String getLocalizedText(String key) {
Locale useLocale = localeProvider.getLocale() == null ? Locale.ENGLISH : localeProvider.getLocale();

1
pom.xml
View File

@ -60,7 +60,6 @@
<module>poms/tycho</module>
<module>bundles</module>
<module>features</module>
<module>targetplatform</module>
</modules>

2
poms/pom.xml
View File

@ -57,7 +57,7 @@
<groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
<ohdr.version>1.0.19</ohdr.version>
<esh.version>0.10.0-SNAPSHOT</esh.version>
<esh.version>0.10.0.b1</esh.version>
<repo.version>2.2.x</repo.version>
<karaf.version>4.1.3</karaf.version>
<jetty.version>9.3.22.v20171030</jetty.version>

24
poms/tycho/pom.xml
View File

@ -214,11 +214,31 @@
<repositories>
<!-- SmartHome p2 repository -->
<!-- SmartHome p2 snapshot repository -->
<repository>
<id>p2-smarthome</id>
<id>p2-smarthome-snapshot</id>
<url>https://openhab.jfrog.io/openhab/eclipse-smarthome-stable</url>
<layout>p2</layout>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<!-- SmartHome p2 release repository -->
<repository>
<id>p2-smarthome-release</id>
<url>http://download.eclipse.org/smarthome/updates-release/${esh.version}</url>
<layout>p2</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<!-- openHAB dependencies p2 repository -->

11
targetplatform/.project
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>targetplatform</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>

2515
targetplatform/openHAB2.setup
View File

File diff suppressed because one or more lines are too long

27
targetplatform/openhab.target
View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="openHAB Target Platform" sequenceNumber="177">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.openhab.feature.p2.feature.group" version="0.0.0"/>
<repository location="https://dl.bintray.com/openhab/p2/openhab-core/2.2.x"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.smarthome.feature.runtime.automation.feature.group" version="0.0.0"/>
<unit id="org.eclipse.smarthome.feature.runtime.binding.feature.group" version="0.0.0"/>
<unit id="org.eclipse.smarthome.feature.runtime.console.equinox.feature.group" version="0.0.0"/>
<unit id="org.eclipse.smarthome.feature.runtime.core.feature.group" version="0.0.0"/>
<unit id="org.eclipse.smarthome.feature.runtime.rest.feature.group" version="0.0.0"/>
<unit id="org.eclipse.smarthome.feature.test.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/smarthome/updates-stable/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/eclipse/updates/4.7/R-4.7-201706120950"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.openhab.deps.runtime.feature.group" version="0.0.0"/>
<unit id="org.openhab.deps.test.feature.group" version="0.0.0"/>
<repository location="https://dl.bintray.com/openhab/p2/openhab-deps-repo/1.0.19"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
</target>

45
targetplatform/pom.xml
View File

@ -1,45 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.core</groupId>
<artifactId>pom</artifactId>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.openhab.core</groupId>
<artifactId>targetplatform</artifactId>
<name>openHAB Target Platform</name>
<packaging>pom</packaging>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>openhab.target</file>
<type>target</type>
<classifier>openhab</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>