Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/jndi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
paths:
- parent/**
- testsupport/**
- versioning/**
- util/**
- jndi/**
- .github/workflows/jndi.yml
Expand Down Expand Up @@ -51,6 +52,9 @@ jobs:
- name: Build testsupport
shell: bash
run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport
- name: Build versioning
shell: bash
run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning
- name: Build util
shell: bash
run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f util
Expand Down
2 changes: 1 addition & 1 deletion jmx/jmx-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
<org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
<org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
<osgi.cmpn.version>4.3.1</osgi.cmpn.version>
<pax-exam.version>4.13.5</pax-exam.version>
<pax-tinybundles.version>2.1.1</pax-tinybundles.version>
Expand Down
2 changes: 1 addition & 1 deletion jmx/jmx-whiteboard/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<mockito-core.version>4.11.0</mockito-core.version>
<org.apache.aries.jmx.core.version>1.1.9-SNAPSHOT</org.apache.aries.jmx.core.version>
<org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
<osgi.cmpn.version>4.3.1</osgi.cmpn.version>
<osgi.core.version>4.3.1</osgi.core.version>
<pax-exam.version>4.13.5</pax-exam.version>
Expand Down
2 changes: 1 addition & 1 deletion jndi/jndi-url-itest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
<org.apache.felix.fileinstall.version>3.7.4</org.apache.felix.fileinstall.version>
<org.apache.servicemix.bundles.cglib.version>3.3.0_1</org.apache.servicemix.bundles.cglib.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
<osgi.core.version>8.0.0</osgi.core.version>
<osgi.cmpn.version>7.0.0</osgi.cmpn.version>
<pax-exam.version>4.13.5</pax-exam.version>
Expand Down
2 changes: 1 addition & 1 deletion proxy/proxy-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<org.apache.aries.proxy.api.version>1.1.2-SNAPSHOT</org.apache.aries.proxy.api.version>
<org.apache.aries.proxy.version>1.1.15-SNAPSHOT</org.apache.aries.proxy.version>
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
<osgi.cmpn.version>4.3.1</osgi.cmpn.version>
<pax-exam.version>4.13.5</pax-exam.version>
<pax-logging.version>2.2.9</pax-logging.version>
Expand Down
2 changes: 1 addition & 1 deletion quiesce/quiesce-manager-itest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<org.apache.aries.quiesce.manager.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.manager.version>
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
<org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
<pax-exam.version>4.13.5</pax-exam.version>
<pax-url.version>2.6.16</pax-url.version>
</properties>
Expand Down
2 changes: 0 additions & 2 deletions samples/ariestrader/assemblies/equinox-test-harness/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

<properties>
<org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
</properties>

<dependencies>
Expand All @@ -42,7 +41,6 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${org.eclipse.osgi.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
Expand Down
2 changes: 0 additions & 2 deletions samples/blog/blog-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<java.source.version>8</java.source.version>

<commons-dbcp.version>1.4</commons-dbcp.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<pax-exam.version>4.13.5</pax-exam.version>
<pax-swissbox.version>1.7.0</pax-swissbox.version>
<pax-tinybundles.version>2.0.0</pax-tinybundles.version>
Expand All @@ -47,7 +46,6 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${org.eclipse.osgi.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down
2 changes: 0 additions & 2 deletions samples/blueprint/helloworld/helloworld-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@
<properties>
<cm.version>3.2.0-v20070116</cm.version>
<org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${org.eclipse.osgi.version}</version>
</dependency>

<dependency>
Expand Down
2 changes: 0 additions & 2 deletions samples/blueprint/helloworld/helloworld-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
<org.apache.aries.proxy.version>1.0.0</org.apache.aries.proxy.version>
<org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<pax-exam.version>4.13.5</pax-exam.version>
<pax-logging.version>1.12.12</pax-logging.version>
<pax-url.version>2.6.16</pax-url.version>
Expand All @@ -46,7 +45,6 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${org.eclipse.osgi.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
7 changes: 7 additions & 0 deletions samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
<commons-lang.version>2.6</commons-lang.version>
<commons-pool.version>1.6</commons-pool.version>
<org.apache.servicemix.bundles.serp.version>1.15.1_1</org.apache.servicemix.bundles.serp.version>
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>

<openjpa.version>2.2.2</openjpa.version>
<geronimo-jpa_2.0_spec.version>1.1</geronimo-jpa_2.0_spec.version>
Expand Down Expand Up @@ -419,6 +420,12 @@
<version>${javax.annotation-api.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${org.eclipse.osgi.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
2 changes: 1 addition & 1 deletion transaction/transaction-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
<org.apache.felix.coordinator.version>1.0.2</org.apache.felix.coordinator.version>
<org.apache.servicemix.bundles.javax-inject.version>1_3</org.apache.servicemix.bundles.javax-inject.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
<osgi.core.version>6.0.0</osgi.core.version>
<pax-swissbox.version>1.8.3</pax-swissbox.version>
<pax-exam.version>4.13.5</pax-exam.version>
Expand Down
2 changes: 1 addition & 1 deletion tutorials/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<org.apache.felix.gogo.jline.version>1.1.8</org.apache.felix.gogo.jline.version>
<org.apache.felix.gogo.runtime.version>1.1.6</org.apache.felix.gogo.runtime.version>
<org.eclipse.equinox.console.version>1.4.1000</org.eclipse.equinox.console.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
<org.osgi.version>3.0.0</org.osgi.version>
<pax-logging.version>2.2.9</pax-logging.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
<org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion web/web-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version>
<org.apache.aries.web.urlhandler.version>1.0.1-SNAPSHOT</org.apache.aries.web.urlhandler.version>
<org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
<pax-exam.version>4.13.5</pax-exam.version>
<pax-tinybundles.version>2.1.1</pax-tinybundles.version>
<pax-url.version>2.6.16</pax-url.version>
Expand Down
Loading