Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor!: Remove org.eclipse.kura.wire.component.conditional.provider from codebase #5358

Closed
wants to merge 2 commits into from
Closed

refactor!: Remove org.eclipse.kura.wire.component.conditional.provider from codebase #5358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62daf02
refactor!: Remove org.eclipse.kura.wire.component.conditional.provide…
MMaiero Sep 17, 2024
07307aa
Merge branch 'develop' into refactor_remove-org.eclipse.kura.wire.com…
pierantoniomerlino Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion kura/distrib/config/kura.build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 0 additions & 19 deletions kura/distrib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
20 changes: 0 additions & 20 deletions kura/distrib/src/main/ant/build_equinox_distrib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,6 @@

<!-- Wires bundles config -->
<antcall target="wires-config" />
<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-config" />
Expand Down Expand Up @@ -689,7 +685,6 @@ fi]]>
<antcall target="deployment-hooks-jar" />

<antcall target="wires-jar" />
<antcall target="wires-jar-nashorn-js-engine" />

<antcall target="misc-jar" />

Expand Down Expand Up @@ -1293,13 +1288,6 @@ fi]]>
</propertyfile>
</target>

<target name="wires-config-nashorn-js-engine" if="is.nashorn.conditional.component.present">
<propertyfile file="${project.build.directory}/${build.output.name}/config.ini">
<entry key="osgi.bundles" operation="+"
value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/org.eclipse.kura.wire.component.conditional.provider_${org.eclipse.kura.wire.component.conditional.provider.version}.jar@5:start" />
</propertyfile>
</target>

<target name="h2db-config">
<propertyfile
file="${project.build.directory}/${build.output.name}/config.ini">
Expand Down Expand Up @@ -1440,14 +1428,6 @@ fi]]>
</zip>
</target>

<target name="wires-jar-nashorn-js-engine" if="is.nashorn.conditional.component.present">
<zip destfile="${project.build.directory}/${build.output.name}.zip" update="true">
<zipfileset
file="${project.build.directory}/plugins/org.eclipse.kura.wire.component.conditional.provider_${org.eclipse.kura.wire.component.conditional.provider.version}.jar"
prefix="${build.output.name}/${plugins.folder}" />
</zip>
</target>

<!-- Camel config targets -->
<target name="camel-config">
<propertyfile
Expand Down
1 change: 0 additions & 1 deletion kura/distrib/src/main/resources/common/Kura_Emulator.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
1 change: 0 additions & 1 deletion kura/emulator/org.eclipse.kura.emulator/src/main/resources/Kura_Emulator.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
22 changes: 0 additions & 22 deletions kura/org.eclipse.kura.wire.component.conditional.provider/META-INF/MANIFEST.MF
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions kura/org.eclipse.kura.wire.component.conditional.provider/OSGI-INF/ConditionalComponent.xml
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions ...re.component.conditional.provider/OSGI-INF/metatype/org.eclipse.kura.wire.Conditional.xml
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions kura/org.eclipse.kura.wire.component.conditional.provider/about.html
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions kura/org.eclipse.kura.wire.component.conditional.provider/build.properties
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions kura/org.eclipse.kura.wire.component.conditional.provider/pom.xml
View file
Open in desktop

This file was deleted.

Loading