forked from openhab/openhab-distro
-
Notifications
You must be signed in to change notification settings - Fork 0
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: Kai Kreuzer <[email protected]>
- Loading branch information
1 parent
b1c1118
commit ec701c3
Showing
9 changed files
with
240 additions
and
251 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,102 +1,102 @@ | ||
| <?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 http://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>2.0.0-SNAPSHOT</version> | ||
| </parent> | ||
| <parent> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>pom-distributions</artifactId> | ||
| <version>2.0.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>online-repo</artifactId> | ||
| <packaging>pom</packaging> | ||
| <artifactId>online-repo</artifactId> | ||
| <packaging>pom</packaging> | ||
|
|
||
| <name>openHAB Distribution</name> | ||
| <description>This is the distribution of openHAB</description> | ||
| <name>openHAB Distribution</name> | ||
| <description>This is the distribution of openHAB</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>openhab-addons</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>kar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>openhab-addons-legacy</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>kar</type> | ||
| </dependency> | ||
| </dependencies> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>openhab-addons</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>kar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>openhab-addons-legacy</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>kar</type> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-antrun-plugin</artifactId> | ||
| <version>1.8</version> | ||
| <executions> | ||
| <execution> | ||
| <phase>generate-resources</phase> | ||
| <configuration> | ||
| <tasks> | ||
| <echo message="unzipping file" /> | ||
| <unzip src="../openhab-addons/target/openhab-addons-${project.version}.kar" dest="target" /> | ||
| <unzip src="../openhab-addons-legacy/target/openhab-addons-legacy-${project.version}.kar" dest="target" /> | ||
| </tasks> | ||
| </configuration> | ||
| <goals> | ||
| <goal>run</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <artifactId>maven-antrun-plugin</artifactId> | ||
| <version>1.8</version> | ||
| <executions> | ||
| <execution> | ||
| <phase>generate-resources</phase> | ||
| <configuration> | ||
| <tasks> | ||
| <echo message="unzipping file" /> | ||
| <unzip src="../openhab-addons/target/openhab-addons-${project.version}.kar" dest="target" /> | ||
| <unzip src="../openhab-addons-legacy/target/openhab-addons-legacy-${project.version}.kar" dest="target" /> | ||
| </tasks> | ||
| </configuration> | ||
| <goals> | ||
| <goal>run</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <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>gnu</tarLongFileMode> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-resources-plugin</artifactId> | ||
| <version>2.4.3</version> | ||
| <executions> | ||
| <execution> | ||
| <id>default-resources</id> | ||
| <phase>process-resources</phase> | ||
| <goals> | ||
| <goal>resources</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${project.build.directory}</outputDirectory> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </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>gnu</tarLongFileMode> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-resources-plugin</artifactId> | ||
| <version>2.4.3</version> | ||
| <executions> | ||
| <execution> | ||
| <id>default-resources</id> | ||
| <phase>process-resources</phase> | ||
| <goals> | ||
| <goal>resources</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${project.build.directory}</outputDirectory> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
|
|
||
| <resources> | ||
| <resource> | ||
| <directory>src/main/filtered-resources</directory> | ||
| <filtering>true</filtering> | ||
| <includes> | ||
| <include>**/*</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
| </build> | ||
| <resources> | ||
| <resource> | ||
| <directory>src/main/filtered-resources</directory> | ||
| <filtering>true</filtering> | ||
| <includes> | ||
| <include>**/*</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
| </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
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
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
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,67 +1,67 @@ | ||
| <?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 http://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-features</artifactId> | ||
| <version>2.0.0-SNAPSHOT</version> | ||
| </parent> | ||
| <parent> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>pom-features</artifactId> | ||
| <version>2.0.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>addons</artifactId> | ||
| <packaging>feature</packaging> | ||
| <artifactId>addons</artifactId> | ||
| <packaging>feature</packaging> | ||
|
|
||
| <name>openHAB Add-ons</name> | ||
| <name>openHAB Add-ons</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.eclipse.smarthome</groupId> | ||
| <artifactId>esh-ext</artifactId> | ||
| <version>${esh.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>addons-esh</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.addons</groupId> | ||
| <artifactId>openhab2-addons</artifactId> | ||
| <version>${oh2.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.addons</groupId> | ||
| <artifactId>openhab-addons</artifactId> | ||
| <version>${oh1.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| </dependencies> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.eclipse.smarthome</groupId> | ||
| <artifactId>esh-ext</artifactId> | ||
| <version>${esh.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.distro</groupId> | ||
| <artifactId>addons-esh</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.addons</groupId> | ||
| <artifactId>openhab2-addons</artifactId> | ||
| <version>${oh2.version}</version> | ||
| <classifier>features</classifier> | ||
| <type>xml</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.openhab.addons</groupId> | ||
| <artifactId>openhab-addons</artifactId> | ||
| <version>${oh1.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> | ||
| <aggregateFeatures>true</aggregateFeatures> | ||
| <!-- <resolver>(obr)</resolver> --> | ||
| <checkDependencyChange>true</checkDependencyChange> | ||
| <failOnDependencyChange>false</failOnDependencyChange> | ||
| <logDependencyChanges>true</logDependencyChanges> | ||
| <overwriteChangedDependencies>true</overwriteChangedDependencies> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.karaf.tooling</groupId> | ||
| <artifactId>karaf-maven-plugin</artifactId> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <startLevel>80</startLevel> | ||
| <aggregateFeatures>true</aggregateFeatures> | ||
| <!-- <resolver>(obr)</resolver> --> | ||
| <checkDependencyChange>true</checkDependencyChange> | ||
| <failOnDependencyChange>false</failOnDependencyChange> | ||
| <logDependencyChanges>true</logDependencyChanges> | ||
| <overwriteChangedDependencies>true</overwriteChangedDependencies> | ||
| </configuration> | ||
| </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
Oops, something went wrong.