Merge pull request #424 from apache/ARIES-2165-build-application-with-java-8

alien11689 · web-flow · commit d8272a1a4168 · 2025-02-04T22:56:25.000+01:00
ARIES-2165: Build application with java 8
diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml
@@ -0,0 +1,50 @@
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+name: Appliaction - CI Build
+
+on:
+  pull_request:
+    paths:
+      - parent/**
+      - application/**
+      - .github/workflows/application.yml
+  push:
+    branches:
+      - 'trunk'
+
+env:
+  LC_ALL: en_US.UTF-8
+
+jobs:
+  JDKxx_Matrix:
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 8 ]
+        os: [ ubuntu-latest ]
+    name: JDK${{ matrix.java }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Git Checkout
+      uses: actions/checkout@v4
+    - name: Set up Java
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+    - name: Build
+      shell: bash
+      run: |
+        mvn -U -e -B -ntp clean install -f parent/pom.xml
+        mvn -U -e -B -ntp clean install -f application/pom.xml
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ model.
 
 See [Apache Aries Website](http://aries.apache.org/).
 
-- Application - the implementation is using `org.osgi.service.framework` from Eclipse Equinox that is [available only in versions 3.5..3.7](https://bugs.eclipse.org/bugs/show_bug.cgi?id=345790)
+- [![Application - CI Build](https://github.com/apache/aries/actions/workflows/application.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/application.yml) - the implementation is using `org.osgi.service.framework` from Eclipse Equinox that is [available only in versions 3.5..3.7](https://bugs.eclipse.org/bugs/show_bug.cgi?id=345790)
 - [![Async - CI Build](https://github.com/apache/aries/actions/workflows/async.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/async.yml)
 - [![Blueprint - CI Build](https://github.com/apache/aries/actions/workflows/blueprint.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/blueprint.yml)
 - [![eba-maven-plugin - CI Build](https://github.com/apache/aries/actions/workflows/eba-maven-plugin.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/eba-maven-plugin.yml)
diff --git a/application/application-itests/pom.xml b/application/application-itests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.2-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -46,8 +46,9 @@
     <properties>
         <asm-all.version>5.0.3</asm-all.version>
         <depends-maven-plugin.version>1.3</depends-maven-plugin.version>
-        <exam.version>4.5.0</exam.version>
+        <exam.version>4.13.5</exam.version>
         <geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
+        <javax.inject.version>1</javax.inject.version>
         <org.apache.aries.application.default.local.platform.version>1.0.0</org.apache.aries.application.default.local.platform.version>
         <org.apache.aries.application.management.version>1.0.0</org.apache.aries.application.management.version>
         <org.apache.aries.application.resolve.transform.cm.version>1.0.0</org.apache.aries.application.resolve.transform.cm.version>
@@ -61,14 +62,14 @@
         <org.apache.aries.application.runtime.version>1.0.0</org.apache.aries.application.runtime.version>
         <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
         <org.apache.aries.blueprint.version>1.0.0</org.apache.aries.blueprint.version>
-        <org.apache.aries.proxy.version>1.0.2-SNAPSHOT</org.apache.aries.proxy.version>
-        <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
+        <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version>
+<!--        <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>-->
         <org.apache.aries.transaction.blueprint.version>1.0.0</org.apache.aries.transaction.blueprint.version>
         <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
         <org.apache.felix.bundlerepository.version>1.6.4</org.apache.felix.bundlerepository.version>
         <org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
         <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
-        <url.version>2.2.0</url.version>
+        <url.version>2.5.3</url.version>
     </properties>
 
     <dependencies>
@@ -128,12 +129,13 @@
             <version>${url.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.aries.testsupport</groupId>
-            <artifactId>org.apache.aries.testsupport.unit</artifactId>
-            <version>${org.apache.aries.testsupport.unit.version}</version>
-            <scope>test</scope>
-        </dependency>
+<!--        TODO ARIES-2165 Use testsupport dependency when application runs on newer eclispe -->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.aries.testsupport</groupId>-->
+<!--            <artifactId>org.apache.aries.testsupport.unit</artifactId>-->
+<!--            <version>${org.apache.aries.testsupport.unit.version}</version>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
 
         <!-- bundles -->
         <dependency>
@@ -264,6 +266,11 @@
             <version>${geronimo-jta_1.1_spec.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>${javax.inject.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -288,7 +295,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>pertest</forkMode>
+                    <forkCount>1</forkCount>
+                    <reuseForks>false</reuseForks>
                     <excludes>
                         <exclude>**/*$*</exclude>
                         <exclude>**/Abstract*.java</exclude>
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
@@ -147,6 +147,8 @@ public static Option[] configuration() {
         return options(
 
                 // framework / core bundles
+                mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
+                mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
 
@@ -155,7 +157,7 @@ public static Option[] configuration() {
 
                 // Bundles
                 junitBundles(),
-                mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+                // mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
                 mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(),
                 mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils").versionAsInProject(),
                 mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management").versionAsInProject(),
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
@@ -124,6 +124,7 @@ public static Option[] configuration() {
 
                 // framework / core bundles
                 mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
+                mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
 
@@ -132,7 +133,7 @@ public static Option[] configuration() {
 
                 // Bundles
                 junitBundles(),
-                mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+                // mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
                 mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(),
                 mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils").versionAsInProject(),
                 mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management").versionAsInProject(),
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
@@ -367,6 +367,7 @@ public static Option[] configuration() throws Exception {
 
                 // framework / core bundles
                 mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
+                mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
 
@@ -378,7 +379,7 @@ public static Option[] configuration() throws Exception {
 
                 // Bundles
                 junitBundles(),
-                mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+                // mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
 
                 // Bundles
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
@@ -315,6 +315,7 @@ public static Option[] configuration() {
 
                 // framework / core bundles
                 mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
+                mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
 
@@ -326,7 +327,7 @@ public static Option[] configuration() {
 
                 // Bundles
                 junitBundles(),
-                mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+                // mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
 
                 // Bundles
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
@@ -174,6 +174,7 @@ public static Option[] configuration() {
 
                 // framework / core bundles
                 mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
+                mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
 
@@ -182,7 +183,7 @@ public static Option[] configuration() {
 
                 // Bundles
                 junitBundles(),
-                mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+                // mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
 
                 // Bundles
                 mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(),
@@ -197,6 +198,7 @@ public static Option[] configuration() {
                 mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller").versionAsInProject(),
                 mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management").versionAsInProject(),
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
+//                mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.cm").versionAsInProject().start(),
                 mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
                 mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject());
     }
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
@@ -155,6 +155,7 @@ public static Option[] configuration() {
 
                 // framework / core bundles
                 mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
+                mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
 
@@ -163,7 +164,7 @@ public static Option[] configuration() {
 
                 // Bundles
                 junitBundles(),
-                mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+                // mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
 
                 // Bundles
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
@@ -532,6 +532,7 @@ public static Option[] configuration() {
 
                 // framework / core bundles
                 mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
+                mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
 
@@ -540,7 +541,7 @@ public static Option[] configuration() {
 
                 // Bundles
                 junitBundles(),
-                mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+                // mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
 
                 // Bundles
                 mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(),
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
@@ -318,6 +318,7 @@ public static Option[] configuration() {
 
                 // framework / core bundles
                 mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
+                mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
 
@@ -326,7 +327,7 @@ public static Option[] configuration() {
 
                 // Bundles
                 junitBundles(),
-                mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+                // mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
 
                 // Bundles
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
@@ -256,6 +256,7 @@ public static Option[] configuration() {
 
                 // framework / core bundles
                 mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
+                mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
 
@@ -267,7 +268,7 @@ public static Option[] configuration() {
 
                 // Bundles
                 junitBundles(),
-                mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+                // mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
                 mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
                 mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
diff --git a/application/application-itests/src/test/java/org/apache/aries/itest b/application/application-itests/src/test/java/org/apache/aries/itest
@@ -0,0 +1 @@
+../../../../../../../../testsupport/testsupport-unit/src/main/java/org/apache/aries/itest
diff --git a/application/application-itests/src/test/java/org/apache/aries/unittest b/application/application-itests/src/test/java/org/apache/aries/unittest
@@ -0,0 +1 @@
+../../../../../../../../testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest
diff --git a/application/application-resolve-transform-cm-itests/pom.xml b/application/application-resolve-transform-cm-itests/pom.xml
@@ -50,16 +50,17 @@
 
         <asm-all.version>5.0.3</asm-all.version>
         <depends-maven-plugin.version>1.3</depends-maven-plugin.version>
+        <javax.inject.version>1</javax.inject.version>
         <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
         <org.apache.aries.application.resolve.transform.cm.version>1.0.0</org.apache.aries.application.resolve.transform.cm.version>
         <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
         <org.apache.aries.blueprint.version>1.0.0</org.apache.aries.blueprint.version>
-        <org.apache.aries.proxy.version>1.0.2-SNAPSHOT</org.apache.aries.proxy.version>
-        <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
+        <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version>
+<!--        <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>-->
         <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
         <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
         <pax-exam.version>3.4.0</pax-exam.version>
-        <pax-url-aether.version>1.6.0</pax-url-aether.version>
+        <pax-url-aether.version>2.5.3</pax-url-aether.version>
     </properties>
 
     <dependencies>
@@ -165,12 +166,17 @@
             <version>${pax-url-aether.version}</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.aries.testsupport</groupId>
-            <artifactId>org.apache.aries.testsupport.unit</artifactId>
-            <version>${org.apache.aries.testsupport.unit.version}</version>
-            <scope>test</scope>
+<!--        TODO ARIES-2165 Use testsupport dependency when application runs on newer eclispe -->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.aries.testsupport</groupId>-->
+<!--            <artifactId>org.apache.aries.testsupport.unit</artifactId>-->
+<!--            <version>${org.apache.aries.testsupport.unit.version}</version>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>${javax.inject.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java b/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java
@@ -149,7 +149,7 @@ public Option[] configuration() throws Exception {
         return options(
         		baseOptions(),
                 mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
-                mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+//                mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
                 mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
                 mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
diff --git a/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/itest b/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/itest
diff --git a/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/unittest b/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/unittest
diff --git a/application/application-tooling-repository-generator/pom.xml b/application/application-tooling-repository-generator/pom.xml
diff --git a/application/pom.xml b/application/pom.xml
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../../../../../../testsupport/testsupport-unit/src/main/java/org/apache/aries/itest`