-
-
Notifications
You must be signed in to change notification settings - Fork 389
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Wouter Born <github@maindrain.net>
- Loading branch information
Showing
10 changed files
with
940 additions
and
920 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,85 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
|
|
||
| <modelVersion>4.0.0</modelVersion> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>pom-distributions</artifactId> | ||
| <version>4.2.0-SNAPSHOT</version> | ||
| </parent> | ||
| <parent> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>pom-distributions</artifactId> | ||
| <version>4.2.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>openhab-addons</artifactId> | ||
| <packaging>kar</packaging> | ||
| <artifactId>openhab-addons</artifactId> | ||
| <packaging>kar</packaging> | ||
|
|
||
| <name>openHAB Add-ons Aggregator</name> | ||
| <name>openHAB Add-ons Aggregator</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>addons</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.addons.features.karaf</groupId> | ||
| <artifactId>org.openhab.addons.features.karaf.openhab-addons</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.addons.features.karaf</groupId> | ||
| <artifactId>openhab-binding-zigbee</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.ui.features</groupId> | ||
| <artifactId>org.openhab.ui.features</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| </dependencies> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>addons</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.addons.features.karaf</groupId> | ||
| <artifactId>org.openhab.addons.features.karaf.openhab-addons</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.addons.features.karaf</groupId> | ||
| <artifactId>openhab-binding-zigbee</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.ui.features</groupId> | ||
| <artifactId>org.openhab.ui.features</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.karaf.tooling</groupId> | ||
| <artifactId>karaf-maven-plugin</artifactId> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <startLevel>80</startLevel> | ||
| <enableGeneration>true</enableGeneration> | ||
| <aggregateFeatures>true</aggregateFeatures> | ||
| <!-- <resolver>(obr)</resolver> --> | ||
| <checkDependencyChange>true</checkDependencyChange> | ||
| <failOnDependencyChange>false</failOnDependencyChange> | ||
| <logDependencyChanges>true</logDependencyChanges> | ||
| <overwriteChangedDependencies>true</overwriteChangedDependencies> | ||
| <ignoreDependencyFlag>true</ignoreDependencyFlag> | ||
| <archive> | ||
| <index>true</index> | ||
| <manifestEntries> | ||
| <Karaf-Feature-Start>false</Karaf-Feature-Start> | ||
| </manifestEntries> | ||
| </archive> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>generate-features-file</id> | ||
| <phase>generate-resources</phase> | ||
| <goals> | ||
| <goal>features-generate-descriptor</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.karaf.tooling</groupId> | ||
| <artifactId>karaf-maven-plugin</artifactId> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <startLevel>80</startLevel> | ||
| <enableGeneration>true</enableGeneration> | ||
| <aggregateFeatures>true</aggregateFeatures> | ||
| <!-- <resolver>(obr)</resolver> --> | ||
| <checkDependencyChange>true</checkDependencyChange> | ||
| <failOnDependencyChange>false</failOnDependencyChange> | ||
| <logDependencyChanges>true</logDependencyChanges> | ||
| <overwriteChangedDependencies>true</overwriteChangedDependencies> | ||
| <ignoreDependencyFlag>true</ignoreDependencyFlag> | ||
| <archive> | ||
| <index>true</index> | ||
| <manifestEntries> | ||
| <Karaf-Feature-Start>false</Karaf-Feature-Start> | ||
| </manifestEntries> | ||
| </archive> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>generate-features-file</id> | ||
| <goals> | ||
| <goal>features-generate-descriptor</goal> | ||
| </goals> | ||
| <phase>generate-resources</phase> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,42 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>pom-distributions</artifactId> | ||
| <version>4.2.0-SNAPSHOT</version> | ||
| </parent> | ||
| <parent> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>pom-distributions</artifactId> | ||
| <version>4.2.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>openhab-demo</artifactId> | ||
| <packaging>pom</packaging> | ||
| <artifactId>openhab-demo</artifactId> | ||
| <packaging>pom</packaging> | ||
|
|
||
| <name>openHAB Demo</name> | ||
| <name>openHAB Demo</name> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>archive</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| <configuration> | ||
| <descriptors> | ||
| <descriptor>src/main/descriptors/archive.xml</descriptor> | ||
| </descriptors> | ||
| <appendAssemblyId>false</appendAssemblyId> | ||
| <tarLongFileMode>posix</tarLongFileMode> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>archive</id> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| <phase>package</phase> | ||
| <configuration> | ||
| <descriptors> | ||
| <descriptor>src/main/descriptors/archive.xml</descriptor> | ||
| </descriptors> | ||
| <appendAssemblyId>false</appendAssemblyId> | ||
| <tarLongFileMode>posix</tarLongFileMode> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,78 +1,80 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
|
|
||
| <modelVersion>4.0.0</modelVersion> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>pom-distributions</artifactId> | ||
| <version>4.2.0-SNAPSHOT</version> | ||
| </parent> | ||
| <parent> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>pom-distributions</artifactId> | ||
| <version>4.2.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>openhab-verify</artifactId> | ||
| <packaging>pom</packaging> | ||
| <artifactId>openhab-verify</artifactId> | ||
| <packaging>pom</packaging> | ||
|
|
||
| <name>openHAB Feature Verification</name> | ||
| <name>openHAB Feature Verification</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.karaf.features</groupId> | ||
| <artifactId>framework</artifactId> | ||
| <version>${karaf.version}</version> | ||
| <type>kar</type> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>openhab-addons</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>kar</type> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>distro-kar</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>kar</type> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.karaf.features</groupId> | ||
| <artifactId>framework</artifactId> | ||
| <version>${karaf.version}</version> | ||
| <type>kar</type> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>openhab-addons</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>kar</type> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>distro-kar</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>kar</type> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.karaf.tooling</groupId> | ||
| <artifactId>karaf-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>verify</id> | ||
| <phase>process-resources</phase> | ||
| <goals> | ||
| <goal>verify</goal> | ||
| </goals> | ||
| <configuration> | ||
| <descriptors> | ||
| <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor> | ||
| <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor> | ||
| <descriptor>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</descriptor> | ||
| <descriptor>mvn:${project.groupId}/addons/${project.version}/xml/features</descriptor> | ||
| <descriptor>mvn:${project.groupId}/distro/${project.version}/xml/features</descriptor> | ||
| </descriptors> | ||
| <distribution>org.apache.karaf.features:framework</distribution> | ||
| <javase>${oh.java.version}</javase> | ||
| <framework> | ||
| <feature>framework</feature> | ||
| </framework> | ||
| <features> | ||
| <feature>openhab-*</feature> | ||
| </features> | ||
| <verifyTransitive>false</verifyTransitive> | ||
| <ignoreMissingConditions>true</ignoreMissingConditions> | ||
| <fail>first</fail> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.karaf.tooling</groupId> | ||
| <artifactId>karaf-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>verify</id> | ||
| <goals> | ||
| <goal>verify</goal> | ||
| </goals> | ||
| <phase>process-resources</phase> | ||
| <configuration> | ||
| <descriptors> | ||
| <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor> | ||
| <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor> | ||
| <descriptor>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</descriptor> | ||
| <descriptor>mvn:${project.groupId}/addons/${project.version}/xml/features</descriptor> | ||
| <descriptor>mvn:${project.groupId}/distro/${project.version}/xml/features</descriptor> | ||
| </descriptors> | ||
| <distribution>org.apache.karaf.features:framework</distribution> | ||
| <javase>${oh.java.version}</javase> | ||
| <framework> | ||
| <feature>framework</feature> | ||
| </framework> | ||
| <features> | ||
| <feature>openhab-*</feature> | ||
| </features> | ||
| <verifyTransitive>false</verifyTransitive> | ||
| <ignoreMissingConditions>true</ignoreMissingConditions> | ||
| <fail>first</fail> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
Oops, something went wrong.