refactor!: Remove org.eclipse.kura.wire.component.conditional.provide…

…r from codebase (#5367) Signed-off-by: MMaiero <[email protected]>
eclipse-kura · Sep 24, 2024 · 2a24ff2 · 2a24ff2
1 parent 3835604
commit 2a24ff2
Show file tree

Hide file tree

Showing 20 changed files with 1 addition and 697 deletions.
diff --git a/kura/distrib/config/kura.build.properties b/kura/distrib/config/kura.build.properties
@@ -99,7 +99,6 @@ org.eclipse.kura.hook.file.move.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.misc.cloudcat.version=2.0.0-SNAPSHOT
 org.eclipse.kura.json.marshaller.unmarshaller.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.xml.marshaller.unmarshaller.provider.version=2.0.0-SNAPSHOT
-org.eclipse.kura.wire.component.conditional.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.wire.component.join.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.http.server.manager.version=2.0.0-SNAPSHOT

diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml
@@ -148,11 +148,6 @@
                                     <artifactId>org.eclipse.kura.wire.script.filter.provider</artifactId>
                                     <version>${org.eclipse.kura.wire.script.filter.provider.version}</version>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.eclipse.kura</groupId>
-                                    <artifactId>org.eclipse.kura.wire.component.conditional.provider</artifactId>
-                                    <version>${org.eclipse.kura.wire.component.conditional.provider.version}</version>
-                                </artifactItem>
                             </artifactItems>
                             <stripVersion>true</stripVersion>
                             <outputDirectory>${project.basedir}/target/plugins</outputDirectory>
@@ -868,7 +863,6 @@
                             <skip>${skip.js.nashorn.engine.components}</skip>
                             <target>
                                 <move file="target/plugins/org.eclipse.kura.wire.script.filter.provider.jar" tofile="target/plugins/org.eclipse.kura.wire.script.filter.provider_${org.eclipse.kura.wire.script.filter.provider.version}.jar" />
-                                <move file="target/plugins/org.eclipse.kura.wire.component.conditional.provider.jar" tofile="target/plugins/org.eclipse.kura.wire.component.conditional.provider_${org.eclipse.kura.wire.component.conditional.provider.version}.jar" />
                             </target>
                         </configuration>
                     </execution>
@@ -1981,19 +1975,6 @@
                         <artifactId>maven-antrun-plugin</artifactId>
                         <version>1.8</version>
                         <executions>
-                            <execution>
-                                <id>prep-tp-js-engine</id>
-                                <phase>prepare-package</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <skip>${skip.js.nashorn.engine.components}</skip>
-                                    <target>
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.component.conditional.provider_${org.eclipse.kura.wire.component.conditional.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                    </target>
-                                </configuration>
-                            </execution>
                             <execution>
                                 <id>prep-tp</id>
                                 <phase>prepare-package</phase>

diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml
@@ -208,10 +208,6 @@
 
         <!-- Wires bundles config -->
         <antcall target="wires-plugins" />
-        <available
-            file="${project.build.directory}/plugins/org.eclipse.kura.wire.component.conditional.provider_${org.eclipse.kura.wire.component.conditional.provider.version}.jar"
-            property="is.nashorn.conditional.component.present" />
-        <antcall target="wires-config-nashorn-js-engine" />
 
         <!-- Miscellaneous bundles config -->
         <antcall target="misc-plugins" />
@@ -1488,14 +1484,6 @@ fi]]>
         </antcall>
     </target>
 
-    <target name="wires-config-nashorn-js-engine" if="is.nashorn.conditional.component.present">
-        <antcall target="install-plugin">
-            <param name="bundle.file" value="org.eclipse.kura.wire.component.conditional.provider_${org.eclipse.kura.wire.component.conditional.provider.version}.jar" />
-            <param name="start.level" value="5" />
-            <param name="start" value="s" />
-        </antcall>
-    </target>
-
     <target name="h2db-plugins">
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.eclipse.kura.db.h2db.provider_${org.eclipse.kura.db.h2db.provider.version}.jar" />

diff --git a/kura/distrib/src/main/resources/common/Kura_Emulator.launch b/kura/distrib/src/main/resources/common/Kura_Emulator.launch
@@ -167,7 +167,6 @@
         <setEntry value="org.eclipse.kura.useradmin.store@default:default"/>
         <setEntry value="org.eclipse.kura.util@default:default"/>
         <setEntry value="org.eclipse.kura.web2@default:default"/>
-        <setEntry value="org.eclipse.kura.wire.component.conditional.provider@default:default"/>
         <setEntry value="org.eclipse.kura.wire.component.join.provider@default:default"/>
         <setEntry value="org.eclipse.kura.wire.component.provider@default:default"/>
         <setEntry value="org.eclipse.kura.wire.db.component.provider@default:default"/>

diff --git a/kura/emulator/org.eclipse.kura.emulator/src/main/resources/Kura_Emulator.launch b/kura/emulator/org.eclipse.kura.emulator/src/main/resources/Kura_Emulator.launch
@@ -161,7 +161,6 @@
         <setEntry value="org.eclipse.kura.useradmin.store@default:default"/>
         <setEntry value="org.eclipse.kura.util@default:default"/>
         <setEntry value="org.eclipse.kura.web2@default:default"/>
-        <setEntry value="org.eclipse.kura.wire.component.conditional.provider@default:default"/>
         <setEntry value="org.eclipse.kura.wire.component.join.provider@default:default"/>
         <setEntry value="org.eclipse.kura.wire.component.provider@default:default"/>
         <setEntry value="org.eclipse.kura.wire.db.component.provider@default:default"/>

diff --git a/kura/org.eclipse.kura.wire.component.conditional.provider/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.wire.component.conditional.provider/META-INF/MANIFEST.MF
diff --git a/kura/org.eclipse.kura.wire.component.conditional.provider/OSGI-INF/ConditionalComponent.xml b/kura/org.eclipse.kura.wire.component.conditional.provider/OSGI-INF/ConditionalComponent.xml
diff --git a/...re.component.conditional.provider/OSGI-INF/metatype/org.eclipse.kura.wire.Conditional.xml b/...re.component.conditional.provider/OSGI-INF/metatype/org.eclipse.kura.wire.Conditional.xml
diff --git a/kura/org.eclipse.kura.wire.component.conditional.provider/about.html b/kura/org.eclipse.kura.wire.component.conditional.provider/about.html
diff --git a/kura/org.eclipse.kura.wire.component.conditional.provider/build.properties b/kura/org.eclipse.kura.wire.component.conditional.provider/build.properties
diff --git a/kura/org.eclipse.kura.wire.component.conditional.provider/pom.xml b/kura/org.eclipse.kura.wire.component.conditional.provider/pom.xml