forked from openhab/openhab-core
-
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.
Apply POM Code Convention (openhab#392)
Applies the POM Code Covention as used in OH2/ESH projects. See also: https://maven.apache.org/developers/conventions/code.html The executed command is: mvn \ com.github.ekryd.sortpom:sortpom-maven-plugin:sort \ -Dsort.keepBlankLines=true \ -Dsort.predefinedSortOrder=recommended_2008_06 Signed-off-by: Wouter Born <[email protected]>
- Loading branch information
1 parent
dbed3db
commit 8091914
Showing
21 changed files
with
1,449 additions
and
1,431 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
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,93 +1,94 @@ | ||
<?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 http://maven.apache.org/maven-v4_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 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
|
||
<modelVersion>4.0.0</modelVersion> | ||
<modelVersion>4.0.0</modelVersion> | ||
|
||
<parent> | ||
<groupId>org.openhab.core</groupId> | ||
<artifactId>pom-bundles</artifactId> | ||
<version>2.4.0-SNAPSHOT</version> | ||
</parent> | ||
<parent> | ||
<groupId>org.openhab.core</groupId> | ||
<artifactId>pom-bundles</artifactId> | ||
<version>2.4.0-SNAPSHOT</version> | ||
</parent> | ||
|
||
<artifactId>org.openhab.core.karaf</artifactId> | ||
<artifactId>org.openhab.core.karaf</artifactId> | ||
<packaging>eclipse-plugin</packaging> | ||
|
||
<name>openHAB Karaf Integration</name> | ||
<packaging>eclipse-plugin</packaging> | ||
<name>openHAB Karaf Integration</name> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>org.apache.karaf.features</groupId> | ||
<artifactId>org.apache.karaf.features.core</artifactId> | ||
<version>${karaf.version}</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.karaf.shell</groupId> | ||
<artifactId>org.apache.karaf.shell.core</artifactId> | ||
<version>${karaf.version}</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.karaf.wrapper</groupId> | ||
<artifactId>org.apache.karaf.wrapper.core</artifactId> | ||
<version>${karaf.version}</version> | ||
</dependency> | ||
</dependencies> | ||
<dependencies> | ||
<dependency> | ||
<groupId>org.apache.karaf.features</groupId> | ||
<artifactId>org.apache.karaf.features.core</artifactId> | ||
<version>${karaf.version}</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.karaf.shell</groupId> | ||
<artifactId>org.apache.karaf.shell.core</artifactId> | ||
<version>${karaf.version}</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.karaf.wrapper</groupId> | ||
<artifactId>org.apache.karaf.wrapper.core</artifactId> | ||
<version>${karaf.version}</version> | ||
</dependency> | ||
</dependencies> | ||
|
||
<build> | ||
<pluginManagement> | ||
<plugins> | ||
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> | ||
<plugin> | ||
<groupId>org.eclipse.m2e</groupId> | ||
<artifactId>lifecycle-mapping</artifactId> | ||
<version>1.0.0</version> | ||
<configuration> | ||
<lifecycleMappingMetadata> | ||
<pluginExecutions> | ||
<pluginExecution> | ||
<pluginExecutionFilter> | ||
<groupId>org.eclipse.tycho</groupId> | ||
<artifactId>tycho-compiler-plugin</artifactId> | ||
<versionRange>[1.0.0,)</versionRange> | ||
<goals> | ||
<goal>compile</goal> | ||
</goals> | ||
</pluginExecutionFilter> | ||
<action> | ||
<ignore/> | ||
</action> | ||
</pluginExecution> | ||
<pluginExecution> | ||
<pluginExecutionFilter> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-compiler-plugin</artifactId> | ||
<versionRange>[3.6.1,)</versionRange> | ||
<goals> | ||
<goal>compile</goal> | ||
</goals> | ||
</pluginExecutionFilter> | ||
<action> | ||
<ignore/> | ||
</action> | ||
</pluginExecution> | ||
<pluginExecution> | ||
<pluginExecutionFilter> | ||
<groupId>org.eclipse.tycho</groupId> | ||
<artifactId>tycho-packaging-plugin</artifactId> | ||
<versionRange>[1.0.0,)</versionRange> | ||
<goals> | ||
<goal>build-qualifier</goal> | ||
<goal>validate-id</goal> | ||
<goal>validate-version</goal> | ||
</goals> | ||
</pluginExecutionFilter> | ||
<action> | ||
<ignore/> | ||
</action> | ||
</pluginExecution> | ||
</pluginExecutions> | ||
</lifecycleMappingMetadata> | ||
</configuration> | ||
</plugin> | ||
</plugins> | ||
</pluginManagement> | ||
</build> | ||
<build> | ||
<pluginManagement> | ||
<plugins> | ||
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> | ||
<plugin> | ||
<groupId>org.eclipse.m2e</groupId> | ||
<artifactId>lifecycle-mapping</artifactId> | ||
<version>1.0.0</version> | ||
<configuration> | ||
<lifecycleMappingMetadata> | ||
<pluginExecutions> | ||
<pluginExecution> | ||
<pluginExecutionFilter> | ||
<groupId>org.eclipse.tycho</groupId> | ||
<artifactId>tycho-compiler-plugin</artifactId> | ||
<versionRange>[1.0.0,)</versionRange> | ||
<goals> | ||
<goal>compile</goal> | ||
</goals> | ||
</pluginExecutionFilter> | ||
<action> | ||
<ignore></ignore> | ||
</action> | ||
</pluginExecution> | ||
<pluginExecution> | ||
<pluginExecutionFilter> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-compiler-plugin</artifactId> | ||
<versionRange>[3.6.1,)</versionRange> | ||
<goals> | ||
<goal>compile</goal> | ||
</goals> | ||
</pluginExecutionFilter> | ||
<action> | ||
<ignore></ignore> | ||
</action> | ||
</pluginExecution> | ||
<pluginExecution> | ||
<pluginExecutionFilter> | ||
<groupId>org.eclipse.tycho</groupId> | ||
<artifactId>tycho-packaging-plugin</artifactId> | ||
<versionRange>[1.0.0,)</versionRange> | ||
<goals> | ||
<goal>build-qualifier</goal> | ||
<goal>validate-id</goal> | ||
<goal>validate-version</goal> | ||
</goals> | ||
</pluginExecutionFilter> | ||
<action> | ||
<ignore></ignore> | ||
</action> | ||
</pluginExecution> | ||
</pluginExecutions> | ||
</lifecycleMappingMetadata> | ||
</configuration> | ||
</plugin> | ||
</plugins> | ||
</pluginManagement> | ||
</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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,65 +1,66 @@ | ||
<?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 http://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 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
|
||
<parent> | ||
<groupId>org.openhab.core</groupId> | ||
<artifactId>pom-bundles</artifactId> | ||
<version>2.4.0-SNAPSHOT</version> | ||
</parent> | ||
<parent> | ||
<groupId>org.openhab.core</groupId> | ||
<artifactId>pom-bundles</artifactId> | ||
<version>2.4.0-SNAPSHOT</version> | ||
</parent> | ||
|
||
<artifactId>org.openhab.io.jetty.certificate</artifactId> | ||
<name>openHAB SSL Certificate Generator</name> | ||
<artifactId>org.openhab.io.jetty.certificate</artifactId> | ||
|
||
<packaging>eclipse-plugin</packaging> | ||
<packaging>eclipse-plugin</packaging> | ||
<name>openHAB SSL Certificate Generator</name> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>org.bouncycastle</groupId> | ||
<artifactId>bcpkix-jdk15on</artifactId> | ||
<version>1.52</version> | ||
</dependency> | ||
</dependencies> | ||
<dependencies> | ||
<dependency> | ||
<groupId>org.bouncycastle</groupId> | ||
<artifactId>bcpkix-jdk15on</artifactId> | ||
<version>1.52</version> | ||
</dependency> | ||
</dependencies> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-shade-plugin</artifactId> | ||
<version>2.4.1</version> | ||
<configuration> | ||
<artifactSet> | ||
<includes> | ||
<include>org.bouncycastle:*</include> | ||
</includes> | ||
</artifactSet> | ||
<filters> | ||
<filter> | ||
<artifact>org.bouncycastle:*</artifact> | ||
<excludes> | ||
<!-- Exclude the JAR signing files --> | ||
<exclude>META-INF/BCKEY.*</exclude> | ||
</excludes> | ||
</filter> | ||
</filters> | ||
<minimizeJar>true</minimizeJar> | ||
<transformers> | ||
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> | ||
<manifestEntries> | ||
<Bundle-Classpath>.</Bundle-Classpath> | ||
</manifestEntries> | ||
</transformer> | ||
</transformers> | ||
</configuration> | ||
<executions> | ||
<execution> | ||
<phase>package</phase> | ||
<goals> | ||
<goal>shade</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-shade-plugin</artifactId> | ||
<version>2.4.1</version> | ||
<configuration> | ||
<artifactSet> | ||
<includes> | ||
<include>org.bouncycastle:*</include> | ||
</includes> | ||
</artifactSet> | ||
<filters> | ||
<filter> | ||
<artifact>org.bouncycastle:*</artifact> | ||
<excludes> | ||
<!-- Exclude the JAR signing files --> | ||
<exclude>META-INF/BCKEY.*</exclude> | ||
</excludes> | ||
</filter> | ||
</filters> | ||
<minimizeJar>true</minimizeJar> | ||
<transformers> | ||
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> | ||
<manifestEntries> | ||
<Bundle-Classpath>.</Bundle-Classpath> | ||
</manifestEntries> | ||
</transformer> | ||
</transformers> | ||
</configuration> | ||
<executions> | ||
<execution> | ||
<goals> | ||
<goal>shade</goal> | ||
</goals> | ||
<phase>package</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,14 +1,15 @@ | ||
<?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 http://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 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<groupId>org.openhab.core</groupId> | ||
<artifactId>pom-bundles</artifactId> | ||
<version>2.4.0-SNAPSHOT</version> | ||
</parent> | ||
|
||
<packaging>eclipse-plugin</packaging> | ||
<parent> | ||
<groupId>org.openhab.core</groupId> | ||
<artifactId>pom-bundles</artifactId> | ||
<version>2.4.0-SNAPSHOT</version> | ||
</parent> | ||
<artifactId>org.openhab.io.rest.docs</artifactId> | ||
|
||
<artifactId>org.openhab.io.rest.docs</artifactId> | ||
<name>openHAB REST API Documentation</name> | ||
<packaging>eclipse-plugin</packaging> | ||
<name>openHAB REST API Documentation</name> | ||
|
||
</project> |
Oops, something went wrong.