Skip to content

Commit

Permalink
lot of build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@salvatore-coppola
salvatore-coppola committed Dec 18, 2024
1 parent da8ac58 commit 4f65695
Show file tree
Hide file tree
Showing 13 changed files with 264 additions and 144 deletions.
184 changes: 92 additions & 92 deletions kura/distrib/pom.xml
View file

Large diffs are not rendered by default.

169 changes: 136 additions & 33 deletions kura/distrib/src/main/ant/build_equinox_distrib.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@


<condition property="kura.osgi.repo"
value="../../target-platform/p2-repo-equinox_3.16.0/target/source">
value="../../target-platform/p2-repo-equinox/target/source">
<or>
<not>
<isset property="kura.osgi" />
Expand All @@ -144,7 +144,7 @@

<copy file="src/main/resources/${build.name}/snapshot_0.xml"
tofile="${project.build.directory}/${build.output.name}/snapshot_0.xml" failonerror="false" />
<copy file="src/main/osgi/equinox_3.16.0/configuration/config.ini"
<copy file="src/main/osgi/equinox/configuration/config.ini"
tofile="${project.build.directory}/${build.output.name}/config.ini" />

<!-- Copy jdk.dio files -->
Expand Down Expand Up @@ -649,54 +649,162 @@ fi]]>
<param name="start.level" value="6" />
<param name="start" value="" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.cm_${org.osgi.service.cm.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.component_${org.osgi.service.component.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.coordinator_${org.osgi.service.coordinator.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.device_${org.osgi.service.device.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.event_${org.osgi.service.event.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.log.stream_${org.osgi.service.log.stream.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.metatype_${org.osgi.service.metatype.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.prefs_${org.osgi.service.prefs.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.provisioning_${org.osgi.service.provisioning.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.upnp_${org.osgi.service.upnp.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.useradmin_${org.osgi.service.useradmin.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.wireadmin_${org.osgi.service.wireadmin.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.util.function_${org.osgi.util.function.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.util.measurement_${org.osgi.util.measurement.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.util.position_${org.osgi.util.position.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.util.promise_${org.osgi.util.promise.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.util.pushstream_${org.osgi.util.pushstream.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.util.xml_${org.osgi.util.xml.version}.jar"/>
<param name="start.level" value="2"/>
<param name="start" value=""/>
<param name="upgrader" value="true"/>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.apache.felix.http.jetty_${org.apache.felix.http.jetty.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.apache.felix.http.servlet-api_${org.apache.felix.http.servlet-api.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="jersey-media-json-jackson_${org.glassfish.jersey.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="jersey-media-multipart_${org.glassfish.jersey.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="jackson-jakarta-rs-json-provider_${com.fasterxml.jackson.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="jackson-jakarta-rs-base_${com.fasterxml.jackson.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="jackson-annotations_${com.fasterxml.jackson.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="jackson-module-jakarta-xmlbind-annotations_${com.fasterxml.jackson.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="jackson-core_${com.fasterxml.jackson.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="jackson-databind_${com.fasterxml.jackson.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
Expand All @@ -706,7 +814,7 @@ fi]]>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.eclipse.kura.sun.misc_${org.eclipse.kura.sun.misc.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="" />
</antcall>
<antcall target="install-plugin">
Expand All @@ -729,11 +837,6 @@ fi]]>
<param name="start.level" value="1" />
<param name="start" value="" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.eclipse.equinox.ds_${org.eclipse.equinox.ds.version}.jar" />
<param name="start.level" value="1" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.eclipse.equinox.event_${org.eclipse.equinox.event.version}.jar" />
<param name="start.level" value="1" />
Expand All @@ -756,46 +859,51 @@ fi]]>
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.http.whiteboard_${org.osgi.service.http.whiteboard.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.servlet_${org.osgi.service.servlet.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="jakarta.ws.rs-api_${jakarta.ws.rs-api.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="5" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.osgi.service.jakartars_${org.osgi.service.jakartars.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="5" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.eclipse.osgitech.rest_${org.eclipse.osgi-technology.rest.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="5" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.eclipse.osgitech.rest.config_${org.eclipse.osgi-technology.rest.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="5" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.eclipse.osgitech.rest.sse_${org.eclipse.osgi-technology.rest.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="5" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.eclipse.osgitech.rest.jetty_${org.eclipse.osgi-technology.rest.version}.jar" />
<param name="start.level" value="1" />
<param name="start.level" value="5" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.eclipse.osgitech.rest.servlet.whiteboard_${org.eclipse.osgi-technology.rest.version}.jar" />
<param name="start.level" value="5" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.apache.felix.scr_${org.apache.felix.scr.version}.jar" />
<param name="start.level" value="1" />
<param name="start" value="s" />
</antcall>
Expand All @@ -804,11 +912,6 @@ fi]]>
<param name="start.level" value="2" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.apache.felix.scr_${org.apache.felix.scr.version}.jar" />
<param name="start.level" value="5" />
<param name="start" value="" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.apache.felix.gogo.command_${org.apache.felix.gogo.command.version}.jar" />
<param name="start.level" value="5" />
Expand Down Expand Up @@ -895,12 +998,12 @@ fi]]>
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.eclipse.jetty.ee8.jetty-ee8-servlet_${org.eclipse.jetty.ee8.jetty-ee8-servlet.version}.jar" />
<param name="bundle.file" value="org.eclipse.jetty.ee8.jetty-ee8-servlet_${org.eclipse.jetty.version}.jar" />
<param name="start.level" value="5" />
<param name="start" value="s" />
</antcall>
<antcall target="install-plugin">
<param name="bundle.file" value="org.eclipse.jetty.ee8.jetty-ee8-nested_${org.eclipse.jetty.ee8.jetty-ee8-nested.version}.jar" />
<param name="bundle.file" value="org.eclipse.jetty.ee8.jetty-ee8-nested_${org.eclipse.jetty.version}.jar" />
<param name="start.level" value="5" />
<param name="start" value="s" />
</antcall>
Expand Down
2 changes: 1 addition & 1 deletion ...i/equinox_3.16.0/configuration/config.ini → ...ain/osgi/equinox/configuration/config.ini
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Configuration File
osgi.framework=file\:plugins/org.eclipse.osgi_3.16.0.v20200828-0759.jar
osgi.framework=file\:plugins/org.eclipse.osgi_3.21.0.v20240717-2103.jar
equinox.use.ds=true
osgi.nl=en_us
osgi.clean=true
Expand Down
2 changes: 1 addition & 1 deletion ...i/equinox_3.16.0/configwindows/config.ini → ...ain/osgi/equinox/configwindows/config.ini
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Configuration File
osgi.framework=file\:plugins/org.eclipse.osgi_3.16.0.v20200828-0759.jar
osgi.framework=file\:plugins/org.eclipse.osgi_3.21.0.v20240717-2103.jar
equinox.use.ds=true
osgi.nl=en_us
osgi.clean=true
Expand Down
2 changes: 1 addition & 1 deletion kura/distrib/src/main/resources/docker-alpine-x86_64-nn/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ COPY --from=kura_base /kura-install/kura_*_docker-x86_64-nn_installer.sh /kura-i

ENV \
KURA_DIR=/opt/eclipse/kura \
LAUNCHER_VERSION="1.5.800.v20200727-1323"
LAUNCHER_VERSION="1.6.900.v20240613-2009"



Expand Down
2 changes: 1 addition & 1 deletion kura/distrib/src/main/resources/docker-ubi8-x86_64-nn/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ COPY --from=kura_base /kura-install/kura_*_docker-x86_64-nn_installer.sh /kura-i
ENV \
KURA_DIR=/opt/eclipse/kura \
SKIP_JAVA_VERSION_CHECK=true \
LAUNCHER_VERSION="1.5.800.v20200727-1323"
LAUNCHER_VERSION="1.6.900.v20240613-2009"

RUN true && \
rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
Expand Down
7 changes: 3 additions & 4 deletions kura/examples/org.eclipse.kura.example.rest.authentication.provider/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
Service-Component: OSGI-INF/*.xml
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Import-Package: javax.annotation;version="1.2.0",
javax.servlet.http;version="3.1.0",
javax.ws.rs.container;version="2.0.1",
javax.ws.rs.core;version="2.0.1",
Import-Package: jakarta.annotation;version="2.1.0",
jakarta.servlet.http;version="5.0.0",
jakarta.ws.rs.container;version="3.1.0",
org.eclipse.kura.audit;version="[1.0,2.0)",
org.eclipse.kura.crypto;version="[1.3,2.0)",
org.eclipse.kura.rest.auth;version="[1.0,1.1)",
Expand Down
9 changes: 4 additions & 5 deletions kura/examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
<module>org.eclipse.kura.example.wire.math.trig</module>
<module>org.eclipse.kura.example.driver.sensehat</module>
<module>org.eclipse.kura.wire.devel.component.provider</module>
<module>org.eclipse.kura.example.web.extension</module>
<module>org.eclipse.kura.example.gpio.led</module>
<module>org.eclipse.kura.example.tamper.detection</module>
<module>org.eclipse.kura.example.rest.authentication.provider</module>
Expand Down Expand Up @@ -156,9 +155,9 @@
</activation>
<repositories>
<repository>
<id>p2-repo-equinox_3.16.0</id>
<id>p2-repo-equinox</id>
<layout>p2</layout>
<url>file:///${kura.basedir}/target-definition/equinox_3.16.0/repository/</url>
<url>file:///${kura.basedir}/target-definition/equinox/repository/</url>
</repository>
</repositories>
</profile>
Expand All @@ -172,9 +171,9 @@
</activation>
<repositories>
<repository>
<id>p2-repo-equinox_3.16.0</id>
<id>p2-repo-equinox</id>
<layout>p2</layout>
<url>file:///${kura.basedir}/target-definition/equinox_3.16.0/repository/</url>
<url>file:///${kura.basedir}/target-definition/equinox/repository/</url>
</repository>
</repositories>
</profile>
Expand Down
4 changes: 2 additions & 2 deletions kura/features/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@

<repositories>
<repository>
<id>p2-repo-equinox_3.16.0</id>
<id>p2-repo-equinox</id>
<layout>p2</layout>
<url>file:///${basedir}/../../../target-platform/p2-repo-equinox_3.16.0/target/repository/</url>
<url>file:///${basedir}/../../../target-platform/p2-repo-equinox/target/repository/</url>
</repository>
<repository>
<id>p2-repo-common</id>
Expand Down
2 changes: 1 addition & 1 deletion kura/tools/archetype/example/src/main/resources/META-INF/maven/archetype-metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>target-definition/equinox_3.16.0</directory>
<directory>target-definition/equinox</directory>
<includes>
<include>**/*.xml</include>
</includes>
Expand Down
Loading

0 comments on commit 4f65695

Please sign in to comment.