Skip to content

Commit

Permalink
Update asm to 9.7 and jacoco to 0.8.12
Browse files Browse the repository at this point in the history
  • Loading branch information
merks committed Apr 3, 2024
1 parent 0189961 commit 46110e3
Show file tree
Hide file tree
Showing 11 changed files with 157 additions and 145 deletions.
20 changes: 10 additions & 10 deletions maven-osgi/tp/Maven.target
Expand Up @@ -3,7 +3,7 @@
<target name="Maven" sequenceNumber="1">
<locations>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
<feature id="org.eclipse.orbit.maven.osgi.all" label="Orbit Maven OSGi All" provider-name="Eclipse Orbit" version="4.32.0.v20240401-1000">
<feature id="org.eclipse.orbit.maven.osgi.all" label="Orbit Maven OSGi All" provider-name="Eclipse Orbit" version="4.32.0.v20240403-0700">
<description>This feature's dependencies are pulled directly from Maven central.</description>
<copyright>
Copyright (c) 2024 Eclipse contributors and others.
Expand All @@ -16,7 +16,7 @@ https://www.eclipse.org/legal/epl-2.0/
SPDX-License-Identifier: EPL-2.0
</copyright>
<license url="https://www.eclipse.org/legal/epl-2.0/"/>
<!-- SHA1 41070a95d1399e43f802bc1ac4519f300cab7892 -->
<!-- SHA1 e6b762b58e128019deac68c8490d67722c39d3d6 -->
</feature>
<dependencies>
<dependency>
Expand Down Expand Up @@ -1067,19 +1067,19 @@ SPDX-License-Identifier: EPL-2.0
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.agent</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.core</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.report</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -1475,31 +1475,31 @@ SPDX-License-Identifier: EPL-2.0
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions maven-osgi/tp/other/MavenSupplement.target
Expand Up @@ -559,19 +559,19 @@
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.agent</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.core</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.report</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down
10 changes: 5 additions & 5 deletions report/maven-osgi/cdt/REPORT.md
Expand Up @@ -20,11 +20,11 @@
- [org.mockito](https://repo1.maven.org/maven2/org/mockito/)
- [mockito-core](https://repo1.maven.org/maven2/org/mockito/mockito-core/) **[5.4.0](https://repo1.maven.org/maven2/org/mockito/mockito-core/5.4.0)** < [5.11.0](https://repo1.maven.org/maven2/org/mockito/mockito-core/5.11.0/)
- [org.ow2.asm](https://repo1.maven.org/maven2/org/ow2/asm/)
- [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.5)** < [9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.6/)
- [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.5)** < [9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.6/)
- [asm-commons](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.5)** < [9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.6/)
- [asm-tree](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.5)** < [9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.6/)
- [asm-util](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.5)** < [9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.6/)
- [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.5)** < [9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.7/)
- [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.5)** < [9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.7/)
- [asm-commons](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.5)** < [9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.7/)
- [asm-tree](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.5)** < [9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.7/)
- [asm-util](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.5)** < [9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.7/)
- [org.slf4j](https://repo1.maven.org/maven2/org/slf4j/)
- [slf4j-api](https://repo1.maven.org/maven2/org/slf4j/slf4j-api/) **[2.0.7](https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.7)** < [2.0.12](https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.12/)
- [slf4j-simple](https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/) **[2.0.7](https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/2.0.7)** < [2.0.12](https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/2.0.12/)
Expand Down
10 changes: 5 additions & 5 deletions report/maven-osgi/cdt/updated.target
Expand Up @@ -154,31 +154,31 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down
16 changes: 8 additions & 8 deletions report/maven-osgi/merged-target/REPORT.md
Expand Up @@ -297,9 +297,9 @@
- [org.hamcrest](https://repo1.maven.org/maven2/org/hamcrest/)
- [hamcrest](https://repo1.maven.org/maven2/org/hamcrest/hamcrest/) **[2.2](https://repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2)**
- [org.jacoco](https://repo1.maven.org/maven2/org/jacoco/)
- [org.jacoco.agent](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/) **[0.8.11](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.11)**
- [org.jacoco.core](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/) **[0.8.11](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.8.11)**
- [org.jacoco.report](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/) **[0.8.11](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.8.11)**
- [org.jacoco.agent](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/) **[0.8.12](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12)**
- [org.jacoco.core](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/) **[0.8.12](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.8.12)**
- [org.jacoco.report](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/) **[0.8.12](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.8.12)**
- [org.javassist](https://repo1.maven.org/maven2/org/javassist/)
- [javassist](https://repo1.maven.org/maven2/org/javassist/javassist/) **[3.30.2-GA](https://repo1.maven.org/maven2/org/javassist/javassist/3.30.2-GA)**
- [org.json](https://repo1.maven.org/maven2/org/json/)
Expand Down Expand Up @@ -381,11 +381,11 @@
- [org.osgi.util.tracker](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.tracker/) **[1.5.4](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.tracker/1.5.4)**
- [org.osgi.util.xml](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.xml/) **[1.0.2](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.xml/1.0.2)**
- [org.ow2.asm](https://repo1.maven.org/maven2/org/ow2/asm/)
- [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.6)**
- [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.6)**
- [asm-commons](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.6)**
- [asm-tree](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.6)**
- [asm-util](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.6)**
- [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.7)**
- [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.7)**
- [asm-commons](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.7)**
- [asm-tree](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.7)**
- [asm-util](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.7)**
- [org.ow2.sat4j](https://repo1.maven.org/maven2/org/ow2/sat4j/)
- [org.ow2.sat4j.core](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.core/) **[2.3.6](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.core/2.3.6)**
- [org.ow2.sat4j.pb](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.pb/) **[2.3.6](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.pb/2.3.6)**
Expand Down
10 changes: 5 additions & 5 deletions report/maven-osgi/platform/REPORT.md
Expand Up @@ -156,11 +156,11 @@
- [org.osgi.util.pushstream](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.pushstream/) **[1.1.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.pushstream/1.1.0)**
- [org.osgi.util.xml](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.xml/) **[1.0.2](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.xml/1.0.2)**
- [org.ow2.asm](https://repo1.maven.org/maven2/org/ow2/asm/)
- [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.6)**
- [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.6)**
- [asm-commons](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.6)**
- [asm-tree](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.6)**
- [asm-util](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.6)**
- [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.7)**
- [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.7)**
- [asm-commons](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.7)**
- [asm-tree](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.7)**
- [asm-util](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.7)**
- [org.ow2.sat4j](https://repo1.maven.org/maven2/org/ow2/sat4j/)
- [org.ow2.sat4j.core](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.core/) **[2.3.6](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.core/2.3.6)**
- [org.ow2.sat4j.pb](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.pb/) **[2.3.6](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.pb/2.3.6)**
Expand Down
106 changes: 56 additions & 50 deletions report/maven-osgi/platform/original.target
Expand Up @@ -54,8 +54,8 @@

<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
<!-- Check version in "<EMF>/features" directory -->
<unit id="org.eclipse.emf.common.feature.group" version="2.31.0.v20231210-0956"/>
<unit id="org.eclipse.emf.common.source.feature.group" version="2.31.0.v20231210-0956"/>
` <unit id="org.eclipse.emf.common.feature.group" version="2.31.0.v20240314-0928"/>
<unit id="org.eclipse.emf.common.source.feature.group" version="2.31.0.v20240314-0928"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="2.37.0.v20240203-0859"/>
<unit id="org.eclipse.emf.ecore.source.feature.group" version="2.37.0.v20240203-0859"/>
<!-- For org.eclipse.ui.tools, and PDE's spy dependencies as of Eclipse 4.22 -->
Expand All @@ -66,7 +66,7 @@
<unit id="org.eclipse.emf.databinding.source.feature.group" version="1.11.0.v20231208-1346"/>
<unit id="org.eclipse.emf.databinding.edit.feature.group" version="1.11.0.v20231208-1346"/>
<unit id="org.eclipse.emf.databinding.edit.source.feature.group" version="1.11.0.v20231208-1346"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.37.0"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202404020819"/>
</location>

<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
Expand Down Expand Up @@ -358,31 +358,31 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.6</version>
<version>9.7</version>
<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -401,6 +401,24 @@
<version>1.1.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.contract</artifactId>
<version>1.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.extender</artifactId>
<version>1.0.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.service</artifactId>
<version>1.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
Expand Down Expand Up @@ -533,21 +551,6 @@
<version>1.0.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.service</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.extender</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.contract</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="BND" missingManifest="error" type="Maven">
Expand Down Expand Up @@ -588,6 +591,24 @@
<version>7.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>bndtools.api</artifactId>
<version>7.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.headless.build.manager</artifactId>
<version>7.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.headless.build.plugin.gradle</artifactId>
<version>7.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.templates.template</artifactId>
Expand All @@ -600,33 +621,18 @@
<version>7.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>bndtools.api</artifactId>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.headless.build.manager</artifactId>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.versioncontrol.ignores.manager</artifactId>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.headless.build.plugin.gradle</artifactId>
<version>7.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.versioncontrol.ignores.plugin.git</artifactId>
<version>7.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.versioncontrol.ignores.manager</artifactId>
<version>7.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.versioncontrol.ignores.plugin.git</artifactId>
<version>7.0.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Apache Felix" missingManifest="error" type="Maven">
Expand Down

0 comments on commit 46110e3

Please sign in to comment.