Skip to content

Commit 1bc5a39

Browse files
Remove pax-web patching by openhab-util library
This patching step has no longer worked for quite a while. `findResources` was removed from pax-web upstream in January 2020 (commit `cf6861615`, part of the PAXWEB-1190 Http/Whiteboard refactor), replaced by the current `findEntries(...)` methods - over a year and a half *before* pax-web `8.0.0` GA even shipped (September 2021). Every pax-web version openHAB has used since, including `8.0.35`/`8.0.36` (pre-migration) and `11.1.2` (this branch), has no method by that name. `ClassAdapter`'s method-matching (`"findResources".equals(name)`) therefore never fires, and `ClassPathUtilPatcher` has no verification step - it always prints `"Finished updating ..."` and exits 0 regardless of whether anything was actually patched. Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent e39caf9 commit 1bc5a39

1 file changed

Lines changed: 0 additions & 35 deletions

File tree

distributions/openhab/pom.xml

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,6 @@
8282
</includes>
8383
</resource>
8484
</resources>
85-
<pluginManagement>
86-
<plugins>
87-
<plugin>
88-
<groupId>org.codehaus.mojo</groupId>
89-
<artifactId>exec-maven-plugin</artifactId>
90-
<version>3.6.3</version>
91-
<dependencies>
92-
<dependency>
93-
<groupId>org.openhab.util</groupId>
94-
<artifactId>pax-web-patch</artifactId>
95-
<version>1.0.1</version>
96-
</dependency>
97-
</dependencies>
98-
</plugin>
99-
</plugins>
100-
</pluginManagement>
10185

10286
<plugins>
10387
<plugin>
@@ -241,25 +225,6 @@
241225
<archiveTarGz>false</archiveTarGz>
242226
</configuration>
243227
</plugin>
244-
<plugin>
245-
<groupId>org.codehaus.mojo</groupId>
246-
<artifactId>exec-maven-plugin</artifactId>
247-
<configuration>
248-
<mainClass>org.openhab.patch.ClassPathUtilPatcher</mainClass>
249-
<arguments>
250-
<argument>${project.basedir}/target/assembly/system/org/ops4j/pax/web/pax-web-api</argument>
251-
</arguments>
252-
<includePluginDependencies>True</includePluginDependencies>
253-
</configuration>
254-
<executions>
255-
<execution>
256-
<goals>
257-
<goal>java</goal>
258-
</goals>
259-
<phase>prepare-package</phase>
260-
</execution>
261-
</executions>
262-
</plugin>
263228
<plugin>
264229
<groupId>org.apache.maven.plugins</groupId>
265230
<artifactId>maven-assembly-plugin</artifactId>

0 commit comments

Comments
 (0)