Skip to content

Commit b3faf4a

Browse files
authored
Merge pull request #686 from apache/dependabot/maven/org.eclipse.platform-org.eclipse.osgi-3.23.100
Bump org.eclipse.platform:org.eclipse.osgi from 3.15.300 to 3.23.100
2 parents 85414da + 4a01b47 commit b3faf4a

15 files changed

Lines changed: 20 additions & 17 deletions

File tree

.github/workflows/jndi.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ on:
1717
paths:
1818
- parent/**
1919
- testsupport/**
20+
- versioning/**
2021
- util/**
2122
- jndi/**
2223
- .github/workflows/jndi.yml
@@ -51,6 +52,9 @@ jobs:
5152
- name: Build testsupport
5253
shell: bash
5354
run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport
55+
- name: Build versioning
56+
shell: bash
57+
run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning
5458
- name: Build util
5559
shell: bash
5660
run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f util

jmx/jmx-itests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
5656
<org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
5757
<org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
58-
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
58+
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
5959
<osgi.cmpn.version>4.3.1</osgi.cmpn.version>
6060
<pax-exam.version>4.13.5</pax-exam.version>
6161
<pax-tinybundles.version>2.1.1</pax-tinybundles.version>

jmx/jmx-whiteboard/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<mockito-core.version>4.11.0</mockito-core.version>
8686
<org.apache.aries.jmx.core.version>1.1.9-SNAPSHOT</org.apache.aries.jmx.core.version>
8787
<org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
88-
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
88+
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
8989
<osgi.cmpn.version>4.3.1</osgi.cmpn.version>
9090
<osgi.core.version>4.3.1</osgi.core.version>
9191
<pax-exam.version>4.13.5</pax-exam.version>

jndi/jndi-url-itest/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
6161
<org.apache.felix.fileinstall.version>3.7.4</org.apache.felix.fileinstall.version>
6262
<org.apache.servicemix.bundles.cglib.version>3.3.0_1</org.apache.servicemix.bundles.cglib.version>
63-
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
63+
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
6464
<osgi.core.version>8.0.0</osgi.core.version>
6565
<osgi.cmpn.version>7.0.0</osgi.cmpn.version>
6666
<pax-exam.version>4.13.5</pax-exam.version>

proxy/proxy-itests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<org.apache.aries.proxy.api.version>1.1.2-SNAPSHOT</org.apache.aries.proxy.api.version>
5151
<org.apache.aries.proxy.version>1.1.15-SNAPSHOT</org.apache.aries.proxy.version>
5252
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
53-
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
53+
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
5454
<osgi.cmpn.version>4.3.1</osgi.cmpn.version>
5555
<pax-exam.version>4.13.5</pax-exam.version>
5656
<pax-logging.version>2.2.9</pax-logging.version>

quiesce/quiesce-manager-itest/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<org.apache.aries.quiesce.manager.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.manager.version>
4747
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
4848
<org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
49-
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
49+
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
5050
<pax-exam.version>4.13.5</pax-exam.version>
5151
<pax-url.version>2.6.16</pax-url.version>
5252
</properties>

samples/ariestrader/assemblies/equinox-test-harness/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
<properties>
3333
<org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
34-
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
3534
</properties>
3635

3736
<dependencies>
@@ -42,7 +41,6 @@
4241
<dependency>
4342
<groupId>org.eclipse.platform</groupId>
4443
<artifactId>org.eclipse.osgi</artifactId>
45-
<version>${org.eclipse.osgi.version}</version>
4644
</dependency>
4745
<dependency>
4846
<groupId>org.eclipse.equinox</groupId>

samples/blog/blog-itests/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<java.source.version>8</java.source.version>
3535

3636
<commons-dbcp.version>1.4</commons-dbcp.version>
37-
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
3837
<pax-exam.version>4.13.5</pax-exam.version>
3938
<pax-swissbox.version>1.7.0</pax-swissbox.version>
4039
<pax-tinybundles.version>2.0.0</pax-tinybundles.version>
@@ -47,7 +46,6 @@
4746
<dependency>
4847
<groupId>org.eclipse.platform</groupId>
4948
<artifactId>org.eclipse.osgi</artifactId>
50-
<version>${org.eclipse.osgi.version}</version>
5149
</dependency>
5250
<dependency>
5351
<groupId>org.osgi</groupId>

samples/blueprint/helloworld/helloworld-assembly/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,12 @@
3131
<properties>
3232
<cm.version>3.2.0-v20070116</cm.version>
3333
<org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
34-
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
3534
</properties>
3635

3736
<dependencies>
3837
<dependency>
3938
<groupId>org.eclipse.platform</groupId>
4039
<artifactId>org.eclipse.osgi</artifactId>
41-
<version>${org.eclipse.osgi.version}</version>
4240
</dependency>
4341

4442
<dependency>

samples/blueprint/helloworld/helloworld-itests/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
3737
<org.apache.aries.proxy.version>1.0.0</org.apache.aries.proxy.version>
3838
<org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
39-
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
4039
<pax-exam.version>4.13.5</pax-exam.version>
4140
<pax-logging.version>1.12.12</pax-logging.version>
4241
<pax-url.version>2.6.16</pax-url.version>
@@ -46,7 +45,6 @@
4645
<dependency>
4746
<groupId>org.eclipse.platform</groupId>
4847
<artifactId>org.eclipse.osgi</artifactId>
49-
<version>${org.eclipse.osgi.version}</version>
5048
<scope>provided</scope>
5149
</dependency>
5250

0 commit comments

Comments
 (0)