Skip to content

Commit 96cf4f7

Browse files
sfioranisfiorani
authored
fix: format again
1 parent 6f2fbe0 commit 96cf4f7

File tree

3 files changed

+29
-16
lines changed

3 files changed

+29
-16
lines changed

‎kura/distrib/src/main/ant/build_equinox_distrib.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@
239239
</propertyfile>
240240

241241

242+
242243
<propertyfile
243244
file="${project.build.directory}/${build.output.name}/dpa.properties">
244245
<entry key="kura"
@@ -547,8 +548,7 @@ fi]]>
547548
file="${project.build.directory}/${build.output.name}/kura.properties"
548549
prefix="${build.output.name}/${framework.config.folder}/" />
549550

550-
<zipfileset dir="${kura.osgi.repo}/plugins/"
551-
prefix="${build.output.name}/${plugins.folder}">
551+
<zipfileset dir="${kura.osgi.repo}/plugins/" prefix="${build.output.name}/${plugins.folder}">
552552

553553
<!-- exclude source bundles -->
554554
<exclude name="*.source_*.jar" />
@@ -701,6 +701,7 @@ fi]]>
701701
</exec>
702702

703703

704+
704705
<!-- Get version information for the bundles/files in this build -->
705706
<echo
706707
message="Gathering version information for the bundles/files in ${build.name}" />
@@ -1687,4 +1688,4 @@ fi]]>
16871688
</zip>
16881689
</target>
16891690

1690-
</project>
1691+
</project>

‎kura/distrib/src/main/resources/common/Kura_Emulator_Linux.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@
2626
<booleanAttribute key="useCustomFeatures" value="false"/>
2727
<booleanAttribute key="useDefaultConfigArea" value="true"/>
2828
<stringAttribute key="workspace_bundles" value="org.eclipse.kura.demo.heater@default:default,org.eclipse.kura.emulator@default:true,org.eclipse.kura.example.camel.aggregation@2:default,org.eclipse.kura.example.camel.quickstart@2:default"/>
29-
</launchConfiguration>
29+
</launchConfiguration>

‎target-platform/p2-repo-equinox_3.12.50/pom.xml‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -195,21 +195,33 @@
195195
</goals>
196196
<configuration>
197197
<target>
198-
<move file="${project.build.directory}/source/plugins/org.apache.felix.dependencymanager.jar" tofile="${project.build.directory}/source/plugins/org.apache.felix.dependencymanager_${org.apache.felix.dependencymanager.version}.jar" />
199-
<move file="${project.build.directory}/source/plugins/org.apache.felix.deploymentadmin.jar" tofile="${project.build.directory}/source/plugins/org.apache.felix.deploymentadmin_${org.apache.felix.deploymentadmin.version}.jar" />
200-
<move file="${project.build.directory}/source/plugins/org.knowhowlab.osgi.monitoradmin.jar" tofile="${project.build.directory}/source/plugins/org.knowhowlab.osgi.monitoradmin_${org.knowhowlab.osgi.monitoradmin.version}.jar" />
201-
<move file="${project.build.directory}/source/plugins/jetty-http.jar" tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.http_${org.eclipse.jetty.http.version}.jar" />
202-
<move file="${project.build.directory}/source/plugins/jetty-continuation.jar" tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.continuation_${org.eclipse.jetty.continuation.version}.jar" />
203-
<move file="${project.build.directory}/source/plugins/jetty-io.jar" tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.io_${org.eclipse.jetty.io.version}.jar" />
204-
<move file="${project.build.directory}/source/plugins/jetty-security.jar" tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.security_${org.eclipse.jetty.security.version}.jar" />
205-
<move file="${project.build.directory}/source/plugins/jetty-server.jar" tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.server_${org.eclipse.jetty.server.version}.jar" />
206-
<move file="${project.build.directory}/source/plugins/jetty-servlet.jar" tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.servlet_${org.eclipse.jetty.servlet.version}.jar" />
207-
<move file="${project.build.directory}/source/plugins/jetty-util.jar" tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.util_${org.eclipse.jetty.util.version}.jar" />
208-
<move file="${project.build.directory}/source/plugins/jetty-util-ajax.jar" tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.util.ajax_${org.eclipse.jetty.util.ajax.version}.jar" />
198+
<move file="${project.build.directory}/source/plugins/org.apache.felix.dependencymanager.jar"
199+
tofile="${project.build.directory}/source/plugins/org.apache.felix.dependencymanager_${org.apache.felix.dependencymanager.version}.jar" />
200+
<move file="${project.build.directory}/source/plugins/org.apache.felix.deploymentadmin.jar"
201+
tofile="${project.build.directory}/source/plugins/org.apache.felix.deploymentadmin_${org.apache.felix.deploymentadmin.version}.jar" />
202+
<move file="${project.build.directory}/source/plugins/org.knowhowlab.osgi.monitoradmin.jar"
203+
tofile="${project.build.directory}/source/plugins/org.knowhowlab.osgi.monitoradmin_${org.knowhowlab.osgi.monitoradmin.version}.jar" />
204+
<move file="${project.build.directory}/source/plugins/jetty-http.jar"
205+
tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.http_${org.eclipse.jetty.http.version}.jar" />
206+
<move file="${project.build.directory}/source/plugins/jetty-continuation.jar"
207+
tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.continuation_${org.eclipse.jetty.continuation.version}.jar" />
208+
<move file="${project.build.directory}/source/plugins/jetty-io.jar"
209+
tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.io_${org.eclipse.jetty.io.version}.jar" />
210+
<move file="${project.build.directory}/source/plugins/jetty-security.jar"
211+
tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.security_${org.eclipse.jetty.security.version}.jar" />
212+
<move file="${project.build.directory}/source/plugins/jetty-server.jar"
213+
tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.server_${org.eclipse.jetty.server.version}.jar" />
214+
<move file="${project.build.directory}/source/plugins/jetty-servlet.jar"
215+
tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.servlet_${org.eclipse.jetty.servlet.version}.jar" />
216+
<move file="${project.build.directory}/source/plugins/jetty-util.jar"
217+
tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.util_${org.eclipse.jetty.util.version}.jar" />
218+
<move file="${project.build.directory}/source/plugins/jetty-util-ajax.jar"
219+
tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.util.ajax_${org.eclipse.jetty.util.ajax.version}.jar" />
209220
<!--
210221
use wireadming 1.0.800, remove this on full Equinox upgrade
211222
-->
212-
<move file="${project.build.directory}/source/plugins/org.eclipse.equinox.wireadmin.jar" tofile="${project.build.directory}/source/plugins/org.eclipse.equinox.wireadmin_${org.eclipse.equinox.wireadmin.version}.jar" />
223+
<move file="${project.build.directory}/source/plugins/org.eclipse.equinox.wireadmin.jar"
224+
tofile="${project.build.directory}/source/plugins/org.eclipse.equinox.wireadmin_${org.eclipse.equinox.wireadmin.version}.jar" />
213225
</target>
214226
</configuration>
215227
</execution>

0 commit comments

Comments
 (0)