Skip to content

Commit

Permalink
Upgrade to 4.0.0 core-release (#508)
Browse files Browse the repository at this point in the history 
Signed-off-by: Jan N. Klug <github@klug.nrw>
  • Loading branch information
@J-N-K
J-N-K committed Jul 24, 2023
1 parent 6b62ea8 commit c41b8ef
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 85 deletions.
4 changes: 2 additions & 2 deletions ...ain/java/org/smarthomej/binding/androiddebugbridge/internal/AndroidDebugBridgeDevice.java
View file
Expand Up @@ -464,8 +464,8 @@ private String runAdbShell(String... args)
} catch (IOException | IllegalStateException e) {
String message = e.getMessage();
if (!EXCEPTION_STREAM_CLOSED.equals(message) && //
!EXCEPTION_CONNECT_MUST_BE_CALLED_FIRST.equals(message) && //
!EXCEPTION_STREAM_OPEN_ACTIVELY_REJECTED_BY_REMOTE_PEER.equals(message)) {
!EXCEPTION_CONNECT_MUST_BE_CALLED_FIRST.equals(message) && //
!EXCEPTION_STREAM_OPEN_ACTIVELY_REJECTED_BY_REMOTE_PEER.equals(message)) {
throw e;
}
}
Expand Down
15 changes: 8 additions & 7 deletions pom.xml
View file
Expand Up @@ -78,15 +78,16 @@
<maven.compiler.target>${oh.java.version}</maven.compiler.target>
<maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>

<ohc.version>4.0.0-SNAPSHOT</ohc.version>
<ohc.version>4.0.0</ohc.version>
<bnd.version>6.4.0</bnd.version>
<commons.net.version>3.7.2</commons.net.version>
<eea.version>2.4.0</eea.version>
<karaf.version>4.4.3</karaf.version>
<sat.version>0.12.0</sat.version>
<sat.version>0.15.0</sat.version>
<slf4j.version>1.7.32</slf4j.version>
<spotless.version>2.28.0</spotless.version>
<spotless.eclipse.version>4.21.0</spotless.eclipse.version>
<spotless.version>2.37.0</spotless.version>
<spotless.eclipse.version>4.25</spotless.eclipse.version>
<spotless.eclipse.wtp.version>4.21.0</spotless.eclipse.wtp.version>

<bnd.importpackage/>
<bnd.exportpackage/>
Expand Down Expand Up @@ -608,7 +609,7 @@ Import-Package: \\
<files>
<file>openhab_wst_xml_files.prefs</file>
</files>
<version>${spotless.eclipse.version}</version>
<version>${spotless.eclipse.wtp.version}</version>
</eclipseWtp>
<trimTrailingWhitespace/>
<endWithNewline/>
Expand All @@ -623,7 +624,7 @@ Import-Package: \\
<files>
<file>openhab_wst_feature_file.prefs</file>
</files>
<version>${spotless.eclipse.version}</version>
<version>${spotless.eclipse.wtp.version}</version>
</eclipseWtp>
<trimTrailingWhitespace/>
<endWithNewline/>
Expand All @@ -638,7 +639,7 @@ Import-Package: \\
<files>
<file>openhab_wst_pom_file.prefs</file>
</files>
<version>${spotless.eclipse.version}</version>
<version>${spotless.eclipse.wtp.version}</version>
</eclipseWtp>
<trimTrailingWhitespace/>
<endWithNewline/>
Expand Down
79 changes: 3 additions & 76 deletions tools/static-code-analysis/checkstyle/rules.xml
View file
Expand Up @@ -36,24 +36,6 @@
<property name="severity" value="error"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.ExportInternalPackageCheck">
<property name="severity" value="error"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.ManifestExternalLibrariesCheck">
<property name="severity" value="error"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.BuildPropertiesExternalLibrariesCheck">
<property name="severity" value="error"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.OutsideOfLibExternalLibrariesCheck">
<property name="severity" value="error"/>
<property name="ignoredDirectories"
value="${checkstyle.outsideOfLibExternalLibrariesCheck.ignoredDirectories}" default="target,bin"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.readme.MarkdownCheck">
<property name="severity" value="warning"/>
</module>
Expand All @@ -68,57 +50,12 @@
<property name="fileTypes" value="${checkstyle.onlyTabIndentationCheck.fileTypes}" default="xml,json"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.RequireBundleCheck">
<property name="severity" value="error"/>
<property name="allowedRequireBundles" value="${checkstyle.requireBundleCheck.allowedBundles}"
default="org.junit,org.mockito,org.hamcrest"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.BundleVendorCheck">
<property name="severity" value="warning"/>
<property name="allowedValues" value="${checkstyle.bundleVendorCheck.allowedValues}" default="openHAB"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.ManifestJavaVersionCheck">
<property name="severity" value="warning"/>
<property name="allowedValues" value="JavaSE-1.8"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.ManifestLineLengthCheck">
<property name="severity" value="warning"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.RequiredFilesCheck">
<property name="severity" value="error"/>
<property name="extensions" value="${checkstyle.requiredFilesCheck.extensions}"
default="html,properties,xml,MF"/>
default="xml"/>
<!-- Relative path to the root directory of the module -->
<property name="requiredFiles" value="${checkstyle.requiredFilesCheck.files}"
default="build.properties,pom.xml,META-INF/MANIFEST.MF"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.BuildPropertiesCheck">
<property name="severity" value="warning"/>
<!-- Other bin.includes values will be checked from a specific Checks (e.g.ServiceComponentManifestCheck) -->
<!-- The bin.includes values must end with the "/" character -->
<property name="expectedBinIncludesValues" value="META-INF/,."/>
<!-- output.. and source.. properties allow skipping the "/" character at the end of the value -->
<property name="possibleOutputValues" value="target/classes,target/test-classes"/>
<property name="possibleSourceValues"
value="src/main/java,src/main/resources,src/test/java,src/test/resources,src/main/groovy,src/test/groovy"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.ServiceComponentManifestCheck">
<property name="severity" value="error"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.ImportExportedPackagesCheck">
<property name="severity" value="warning"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.ManifestPackageVersionCheck">
<property name="severity" value="warning"/>
<property name="ignoreImportedPackages" value="org.junit.*"/>
<property name="requiredFiles" value="${checkstyle.requiredFilesCheck.files}" default="pom.xml"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.OhInfXmlLabelCheck">
Expand All @@ -130,7 +67,7 @@
<module name="org.openhab.tools.analysis.checkstyle.OhInfXmlValidationCheck">
<property name="severity" value="error"/>
<property name="thingSchema" value="https://openhab.org/schemas/thing-description-1.0.0.xsd"/>
<property name="bindingSchema" value="https://openhab.org/schemas/binding-1.0.0.xsd"/>
<property name="addonSchema" value="https://openhab.org/schemas/addon-1.0.0.xsd"/>
<property name="configSchema" value="https://openhab.org/schemas/config-description-1.0.0.xsd"/>
</module>

Expand All @@ -143,16 +80,6 @@
<property name="checkPomVersion" value="${checkstyle.pomXmlCheck.checkPomVersion}" default="true"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.PackageExportsNameCheck">
<property name="severity" value="error"/>
<property name="sourceDirectories" value="src/main/java"/>
<property name="excludedPackages" value=".*.internal.*"/>
</module>

<module name="org.openhab.tools.analysis.checkstyle.AnnotationDependencyCheck">
<property name="severity" value="warning"/>
</module>

<module name="TreeWalker">
<!-- See http://checkstyle.sourceforge.net/config_coding.html#IllegalThrows -->
<module name="IllegalThrows">
Expand Down

0 comments on commit c41b8ef

Please sign in to comment.