Skip to content

Commit

Permalink
Merge pull request #1250 from eclipse-passage/947
Browse files Browse the repository at this point in the history
[#947] Runtime: upgrade OSHI library
  • Loading branch information
eparovyshnaya authored Nov 15, 2023
2 parents 1d864df + aae13ad commit 9e7c1cd
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 87 deletions.
32 changes: 24 additions & 8 deletions releng/org.eclipse.passage.ldc.repository/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,34 @@
id="org.eclipse.passage.ldc.feature.source">
<category name="org.eclipse.passage.ldc.category.source" />
</feature>
<bundle id="bcpg" />
<bundle id="bcpg.source" />
<bundle id="bcpkix" />
<bundle id="bcpkix.source" />
<bundle id="bcprov" />
<bundle id="bcprov.source" />
<bundle id="bcutil" />
<bundle id="bcutil.source" />
<bundle id="com.fasterxml.jackson.core.jackson-annotations"/>
<bundle id="com.fasterxml.jackson.core.jackson-annotations.source"/>
<bundle id="com.fasterxml.jackson.core.jackson-core"/>
<bundle id="com.fasterxml.jackson.core.jackson-core.source"/>
<bundle id="com.fasterxml.jackson.core.jackson-databind"/>
<bundle id="com.fasterxml.jackson.core.jackson-databind.source"/>
<bundle id="org.bouncycastle.bcpg" />
<bundle id="org.bouncycastle.bcpg.source" />
<bundle id="org.bouncycastle.bcpkix" />
<bundle id="org.bouncycastle.bcpkix.source" />
<bundle id="org.bouncycastle.bcprov" />
<bundle id="org.bouncycastle.bcprov.source" />
<bundle id="org.bouncycastle.bcutil" />
<bundle id="org.bouncycastle.bcutil.source" />
<bundle id="com.github.oshi.oshi-core" />
<bundle id="com.github.oshi.oshi-core.source" />
<bundle id="com.sun.jna" />
<bundle id="com.sun.jna.source" />
<bundle id="com.sun.jna.platform" />
<bundle id="com.sun.jna.platform.source" />
<bundle id="jakarta.activation-api" />
<bundle id="jakarta.activation-api.source" />
<bundle id="jakarta.annotation-api" />
<bundle id="jakarta.annotation-api.source" />
<bundle id="jakarta.servlet-api" />
<bundle id="jakarta.servlet-api.source" />
<bundle id="slf4j.api" />
<bundle id="slf4j.api.source" />
<bundle id="slf4j.nop" />
<bundle id="slf4j.nop.source" />
</site>
32 changes: 24 additions & 8 deletions releng/org.eclipse.passage.lic.repository/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,34 @@
id="org.eclipse.passage.lic.jetty.feature.source">
<category name="org.eclipse.passage.lic.category.source" />
</feature>
<bundle id="bcpg" />
<bundle id="bcpg.source" />
<bundle id="bcpkix" />
<bundle id="bcpkix.source" />
<bundle id="bcprov" />
<bundle id="bcprov.source" />
<bundle id="bcutil" />
<bundle id="bcutil.source" />
<bundle id="com.fasterxml.jackson.core.jackson-annotations"/>
<bundle id="com.fasterxml.jackson.core.jackson-annotations.source"/>
<bundle id="com.fasterxml.jackson.core.jackson-core"/>
<bundle id="com.fasterxml.jackson.core.jackson-core.source"/>
<bundle id="com.fasterxml.jackson.core.jackson-databind"/>
<bundle id="com.fasterxml.jackson.core.jackson-databind.source"/>
<bundle id="org.bouncycastle.bcpg" />
<bundle id="org.bouncycastle.bcpg.source" />
<bundle id="org.bouncycastle.bcpkix" />
<bundle id="org.bouncycastle.bcpkix.source" />
<bundle id="org.bouncycastle.bcprov" />
<bundle id="org.bouncycastle.bcprov.source" />
<bundle id="org.bouncycastle.bcutil" />
<bundle id="org.bouncycastle.bcutil.source" />
<bundle id="com.github.oshi.oshi-core" />
<bundle id="com.github.oshi.oshi-core.source" />
<bundle id="com.sun.jna" />
<bundle id="com.sun.jna.source" />
<bundle id="com.sun.jna.platform" />
<bundle id="com.sun.jna.platform.source" />
<bundle id="jakarta.activation-api" />
<bundle id="jakarta.activation-api.source" />
<bundle id="jakarta.annotation-api" />
<bundle id="jakarta.annotation-api.source" />
<bundle id="jakarta.servlet-api" />
<bundle id="jakarta.servlet-api.source" />
<bundle id="slf4j.api" />
<bundle id="slf4j.api.source" />
<bundle id="slf4j.nop" />
<bundle id="slf4j.nop.source" />
</site>
87 changes: 16 additions & 71 deletions releng/org.eclipse.passage.target/org.eclipse.passage.target.target
Original file line number Diff line number Diff line change
Expand Up @@ -30,86 +30,31 @@
<unit id="org.eclipse.emfforms.setup.base" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.34.0/"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202311070643/"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410/"/>
<unit id="org.eclipse.emf.query.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935/"/>
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202305230712/"/>
<unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334/"/>
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202305230839/"/>
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.18.0/"/>
<unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5/"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/sirius/updates/releases/7.2.0/2023-03/"/>
<unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0M1/"/>
<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
<unit id="org.apache.commons.csv" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/>
<unit id="bcpg" version="0.0.0"/>
<unit id="bcpkix" version="0.0.0"/>
<unit id="bcprov" version="0.0.0"/>
<unit id="bcutil" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
<unit id="jakarta.servlet" version="0.0.0"/>
<unit id="javax.activation" version="0.0.0"/>
<unit id="org.apache.commons.csv" version="0.0.0"/>
<unit id="org.bouncycastle.bcpg" version="0.0.0"/>
<unit id="org.bouncycastle.bcpkix" version="0.0.0"/>
<unit id="org.bouncycastle.bcprov" version="0.0.0"/>
<unit id="org.bouncycastle.bcutil" version="0.0.0"/>
<unit id="com.github.oshi.oshi-core" version="0.0.0"/>
<unit id="com.sun.jna" version="0.0.0"/>
<unit id="com.sun.jna.platform" version="0.0.0"/>
<unit id="jakarta.activation-api" version="0.0.0"/>
<unit id="jakarta.annotation-api" version="1.3.5"/>
<unit id="jakarta.servlet-api" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest/"/>
<unit id="com.sun.jna" version="5.13.0.v20230812-1000"/>
<unit id="com.sun.jna.platform" version="5.13.0"/>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
<dependencies>
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>6.2.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>1.7.36</version>
<type>jar</type>
</dependency>
</dependencies>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.nop" version="0.0.0"/>
</location>
</locations>
</target>

0 comments on commit 9e7c1cd

Please sign in to comment.