Skip to content

Commit

Permalink
Accommodate TM4E's target platform changes
Browse files Browse the repository at this point in the history
It's relying purely on Orbit now and so snakeyaml-engine needs to be in
the MavenSupplement to prevent its removal from Maven.target.
  • Loading branch information
merks committed Feb 18, 2024
1 parent b3c9aed commit a4a7830
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 168 deletions.
1 change: 0 additions & 1 deletion maven-osgi/dependency-analyzer-arg.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//
platform=https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
windowbuilder=https://raw.githubusercontent.com/eclipse/windowbuilder/master/target-platform/mvn/wb-mvn.target
tm4e=https://raw.githubusercontent.com/eclipse/tm4e/master/target-platform/tm4e-target.target
m2e=https://raw.githubusercontent.com/eclipse-m2e/m2e-core/master/target-platform/target-platform.target
wwd=https://raw.githubusercontent.com/eclipse/wildwebdeveloper/master/target-platform/target-platform.target
linuxtools=https://raw.githubusercontent.com/eclipse-linuxtools/org.eclipse.linuxtools/master/releng/org.eclipse.linuxtools.target/linuxtools-e4.31.target
Expand Down
6 changes: 6 additions & 0 deletions maven-osgi/tp/other/MavenSupplement.target
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,12 @@
<version>2.0.12</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.snakeyaml</groupId>
<artifactId>snakeyaml-engine</artifactId>
<version>2.7</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
Expand Down
1 change: 0 additions & 1 deletion report/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ as well as from the locally-defined [supplement](../maven-osgi/tp/other/MavenSup
- [passage](maven-osgi/passage/REPORT.md)
- [platform](maven-osgi/platform/REPORT.md)
- [supplement](maven-osgi/supplement/REPORT.md)
- [tm4e](maven-osgi/tm4e/REPORT.md)
- [windowbuilder](maven-osgi/windowbuilder/REPORT.md)
- [wwd](maven-osgi/wwd/REPORT.md)

Expand Down
13 changes: 2 additions & 11 deletions report/maven-osgi/m2e/REPORT.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
# Target Platform: [m2e](https://raw.githubusercontent.com/eclipse-m2e/m2e-core/master/target-platform/target-platform.target)

## Minor Updates
- [ch.qos.logback](https://repo1.maven.org/maven2/ch/qos/logback/)
- [logback-classic](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/) **[1.4.14](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.4.14)** < [1.5.0](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.5.0/)
- [commons-codec](https://repo1.maven.org/maven2/commons-codec/)
- [commons-codec](https://repo1.maven.org/maven2/commons-codec/commons-codec/) **[1.16.0](https://repo1.maven.org/maven2/commons-codec/commons-codec/1.16.0)** < [1.16.1](https://repo1.maven.org/maven2/commons-codec/commons-codec/1.16.1/)

## Updates Applied
[updated.target](updated.target)

## Content
- [ch.qos.logback](https://repo1.maven.org/maven2/ch/qos/logback/)
- [logback-classic](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/) **[1.4.14](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.4.14)**
- [logback-classic](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/) **[1.5.0](https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.5.0)**
- [com.google.code.gson](https://repo1.maven.org/maven2/com/google/code/gson/)
- [gson](https://repo1.maven.org/maven2/com/google/code/gson/gson/) **[2.10.1](https://repo1.maven.org/maven2/com/google/code/gson/gson/2.10.1)**
- [com.google.guava](https://repo1.maven.org/maven2/com/google/guava/)
Expand All @@ -20,7 +11,7 @@
- [commons-cli](https://repo1.maven.org/maven2/commons-cli/)
- [commons-cli](https://repo1.maven.org/maven2/commons-cli/commons-cli/) **[1.6.0](https://repo1.maven.org/maven2/commons-cli/commons-cli/1.6.0)**
- [commons-codec](https://repo1.maven.org/maven2/commons-codec/)
- [commons-codec](https://repo1.maven.org/maven2/commons-codec/commons-codec/) **[1.16.0](https://repo1.maven.org/maven2/commons-codec/commons-codec/1.16.0)**
- [commons-codec](https://repo1.maven.org/maven2/commons-codec/commons-codec/) **[1.16.1](https://repo1.maven.org/maven2/commons-codec/commons-codec/1.16.1)**
- [io.takari.m2e.workspace](https://repo1.maven.org/maven2/io/takari/m2e/workspace/)
- [org.eclipse.m2e.workspace.cli](https://repo1.maven.org/maven2/io/takari/m2e/workspace/org.eclipse.m2e.workspace.cli/) **[0.3.1](https://repo1.maven.org/maven2/io/takari/m2e/workspace/org.eclipse.m2e.workspace.cli/0.3.1)**
- [org.apache.aries.spifly](https://repo1.maven.org/maven2/org/apache/aries/spifly/)
Expand Down
10 changes: 5 additions & 5 deletions report/maven-osgi/m2e/original.target
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.3/"/>
<repository location="https://download.eclipse.org/tm4e/releases/0.8.1/"/>
<repository location="https://download.eclipse.org/lsp4e/releases/0.24.5/"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/"/>
<repository location="https://download.eclipse.org/tm4e/releases/0.9.0/"/>
<repository location="https://download.eclipse.org/lsp4e/releases/0.24.8/"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.22.0/"/>
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
</location>
Expand All @@ -49,7 +49,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.4.14</version>
<version>1.5.0</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -89,7 +89,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.0</version>
<version>1.16.1</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions report/maven-osgi/m2e/updated.target
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.3/"/>
<repository location="https://download.eclipse.org/tm4e/releases/0.8.1/"/>
<repository location="https://download.eclipse.org/lsp4e/releases/0.24.5/"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/"/>
<repository location="https://download.eclipse.org/tm4e/releases/0.9.0/"/>
<repository location="https://download.eclipse.org/lsp4e/releases/0.24.8/"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.22.0/"/>
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
</location>
Expand Down
16 changes: 3 additions & 13 deletions report/maven-osgi/platform/REPORT.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
# Target Platform: [platform](https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target)

## Minor Updates
- [net.bytebuddy](https://repo1.maven.org/maven2/net/bytebuddy/)
- [byte-buddy](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/) **[1.14.11](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.11)** < [1.14.12](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.12/)
- [byte-buddy-agent](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/) **[1.14.11](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.11)** < [1.14.12](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.12/)
- [org.apache.sshd](https://repo1.maven.org/maven2/org/apache/sshd/)
- [sshd-osgi](https://repo1.maven.org/maven2/org/apache/sshd/sshd-osgi/) **[2.12.0](https://repo1.maven.org/maven2/org/apache/sshd/sshd-osgi/2.12.0)** < [2.12.1](https://repo1.maven.org/maven2/org/apache/sshd/sshd-osgi/2.12.1/)

## Major Updates
- [jakarta.el](https://repo1.maven.org/maven2/jakarta/el/)
- [jakarta.el-api](https://repo1.maven.org/maven2/jakarta/el/jakarta.el-api/) **[3.0.3](https://repo1.maven.org/maven2/jakarta/el/jakarta.el-api/3.0.3)** < [5.0.1](https://repo1.maven.org/maven2/jakarta/el/jakarta.el-api/5.0.1/)
Expand All @@ -18,9 +11,6 @@
- [apache-el](https://repo1.maven.org/maven2/org/mortbay/jasper/apache-el/) **[9.0.83.1](https://repo1.maven.org/maven2/org/mortbay/jasper/apache-el/9.0.83.1)** < [10.1.16](https://repo1.maven.org/maven2/org/mortbay/jasper/apache-el/10.1.16/)
- [apache-jsp](https://repo1.maven.org/maven2/org/mortbay/jasper/apache-jsp/) **[9.0.83.1](https://repo1.maven.org/maven2/org/mortbay/jasper/apache-jsp/9.0.83.1)** < [10.1.16](https://repo1.maven.org/maven2/org/mortbay/jasper/apache-jsp/10.1.16/)

## Updates Applied
[updated.target](updated.target)

## Content
- [biz.aQute.bnd](https://repo1.maven.org/maven2/biz/aQute/bnd/)
- [biz.aQute.bnd.annotation](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/) **[7.0.0](https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/7.0.0)**
Expand Down Expand Up @@ -64,8 +54,8 @@
- [javax.servlet.jsp](https://repo1.maven.org/maven2/javax/servlet/jsp/)
- [javax.servlet.jsp-api](https://repo1.maven.org/maven2/javax/servlet/jsp/javax.servlet.jsp-api/) **[2.3.3](https://repo1.maven.org/maven2/javax/servlet/jsp/javax.servlet.jsp-api/2.3.3)**
- [net.bytebuddy](https://repo1.maven.org/maven2/net/bytebuddy/)
- [byte-buddy](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/) **[1.14.11](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.11)**
- [byte-buddy-agent](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/) **[1.14.11](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.11)**
- [byte-buddy](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/) **[1.14.12](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.12)**
- [byte-buddy-agent](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/) **[1.14.12](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.12)**
- [net.java.dev.jna](https://repo1.maven.org/maven2/net/java/dev/jna/)
- [jna-platform](https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/) **[5.14.0](https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/5.14.0)**
- [org.apache.aries.spifly](https://repo1.maven.org/maven2/org/apache/aries/spifly/)
Expand All @@ -76,7 +66,7 @@
- [org.apache.felix.gogo.shell](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.gogo.shell/) **[1.1.4](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.gogo.shell/1.1.4)**
- [org.apache.felix.scr](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.scr/) **[2.2.10](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.scr/2.2.10)**
- [org.apache.sshd](https://repo1.maven.org/maven2/org/apache/sshd/)
- [sshd-osgi](https://repo1.maven.org/maven2/org/apache/sshd/sshd-osgi/) **[2.12.0](https://repo1.maven.org/maven2/org/apache/sshd/sshd-osgi/2.12.0)**
- [sshd-osgi](https://repo1.maven.org/maven2/org/apache/sshd/sshd-osgi/) **[2.12.1](https://repo1.maven.org/maven2/org/apache/sshd/sshd-osgi/2.12.1)**
- [org.apiguardian](https://repo1.maven.org/maven2/org/apiguardian/)
- [apiguardian-api](https://repo1.maven.org/maven2/org/apiguardian/apiguardian-api/) **[1.1.2](https://repo1.maven.org/maven2/org/apiguardian/apiguardian-api/1.1.2)**
- [org.assertj](https://repo1.maven.org/maven2/org/assertj/)
Expand Down
6 changes: 3 additions & 3 deletions report/maven-osgi/platform/original.target
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
<version>2.12.0</version>
<version>2.12.1</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -324,13 +324,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.11</version>
<version>1.14.12</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.11</version>
<version>1.14.12</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down
2 changes: 2 additions & 0 deletions report/maven-osgi/supplement/REPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,5 @@
- [org.slf4j](https://repo1.maven.org/maven2/org/slf4j/)
- [slf4j-nop](https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/) **[1.7.36](https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/1.7.36)**
- [slf4j-nop](https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/) **[2.0.12](https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/2.0.12)**
- [org.snakeyaml](https://repo1.maven.org/maven2/org/snakeyaml/)
- [snakeyaml-engine](https://repo1.maven.org/maven2/org/snakeyaml/snakeyaml-engine/) **[2.7](https://repo1.maven.org/maven2/org/snakeyaml/snakeyaml-engine/2.7)**
6 changes: 6 additions & 0 deletions report/maven-osgi/supplement/original.target
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,12 @@
<version>2.0.12</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.snakeyaml</groupId>
<artifactId>snakeyaml-engine</artifactId>
<version>2.7</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
Expand Down
6 changes: 6 additions & 0 deletions report/maven-osgi/supplement/updated.target
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,12 @@
<version>2.0.12</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.snakeyaml</groupId>
<artifactId>snakeyaml-engine</artifactId>
<version>2.7</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
Expand Down
7 changes: 0 additions & 7 deletions report/maven-osgi/tm4e/REPORT.md

This file was deleted.

62 changes: 0 additions & 62 deletions report/maven-osgi/tm4e/original.target

This file was deleted.

62 changes: 0 additions & 62 deletions report/maven-osgi/tm4e/updated.target

This file was deleted.

0 comments on commit a4a7830

Please sign in to comment.