Skip to content

Commit 02142d0

Browse files
committed
ARIES-2165: Update parent pom and build proxy on Java 11, 17 and 21 adding objensis
1 parent b7b96f7 commit 02142d0

File tree

31 files changed

+252
-773
lines changed

31 files changed

+252
-773
lines changed

.github/workflows/blueprint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ on:
1717
paths:
1818
- parent/**
1919
- testsupport/**
20-
- proxy/**
2120
- versioning/**
2221
- util/**
2322
- quiesce/**
23+
- proxy/**
2424
- blueprint/**
2525
- .github/workflows/blueprint.yml
2626
push:
@@ -54,9 +54,6 @@ jobs:
5454
- name: Build testsupport
5555
shell: bash
5656
run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport
57-
- name: Build proxy
58-
shell: bash
59-
run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f proxy
6057
- name: Build versioning
6158
shell: bash
6259
run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning
@@ -66,6 +63,9 @@ jobs:
6663
- name: Build quiesce
6764
shell: bash
6865
run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f quiesce
66+
- name: Build proxy
67+
shell: bash
68+
run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f proxy
6969
- name: Build blueprint
7070
shell: bash
7171
run: mvn -U -e -B -ntp clean install -f blueprint

.github/workflows/proxy.yml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ on:
1717
paths:
1818
- parent/**
1919
- testsupport/**
20+
- versioning/**
21+
- util/**
2022
- proxy/**
2123
- .github/workflows/proxy.yml
2224
push:
@@ -32,24 +34,36 @@ jobs:
3234
strategy:
3335
fail-fast: false
3436
matrix:
35-
java: [ 8 ]
37+
java: [ 8, 11, 17, 21 ]
3638
os: [ ubuntu-latest ]
3739
name: JDK${{ matrix.java }} ${{ matrix.os }}
3840
runs-on: ${{ matrix.os }}
3941
steps:
4042
- name: Git Checkout
4143
uses: actions/checkout@v5
42-
- name: Set up Java
44+
- name: Set up Java 8
4345
uses: actions/setup-java@v5
4446
with:
4547
distribution: 'temurin'
46-
java-version: ${{ matrix.java }}
48+
java-version: 8
4749
- name: Build parent
4850
shell: bash
49-
run: mvn -U -e -B -ntp clean install -f parent
51+
run: mvn -V -U -e -B -ntp clean install -f parent
5052
- name: Build testsupport
5153
shell: bash
52-
run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport
54+
run: mvn -V -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
58+
- name: Build util
59+
shell: bash
60+
run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util
61+
- name: Set up Java ${{ matrix.java }}
62+
uses: actions/setup-java@v4
63+
with:
64+
distribution: 'temurin'
65+
java-version: ${{ matrix.java }}
66+
if: ${{ 8 != matrix.java }}
5367
- name: Build proxy
5468
shell: bash
55-
run: mvn -U -e -B -ntp clean install -f proxy
69+
run: mvn -V -U -e -B -ntp clean install -f proxy

blueprint/itests/blueprint-itests/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
<commons-jexl.version>2.1.1</commons-jexl.version>
5858
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
5959
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
60+
<objenesis.version>3.4</objenesis.version>
6061
<org.apache.aries.proxy.version>1.1.15-SNAPSHOT</org.apache.aries.proxy.version>
6162
<org.apache.aries.quiesce.api.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.api.version>
6263
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
@@ -108,6 +109,12 @@
108109
<artifactId>org.apache.aries.proxy</artifactId>
109110
<version>${org.apache.aries.proxy.version}</version>
110111
</dependency>
112+
<dependency>
113+
<groupId>org.objenesis</groupId>
114+
<artifactId>objenesis</artifactId>
115+
<version>${objenesis.version}</version>
116+
<scope>test</scope>
117+
</dependency>
111118
<dependency>
112119
<groupId>org.apache.servicemix.bundles</groupId>
113120
<artifactId>org.apache.servicemix.bundles.spring-context</artifactId>

blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public static Option blueprintBundles(boolean startBlueprint) {
6565
mvnBundle("org.apache.felix", "org.apache.felix.configadmin"),
6666
mvnBundle("org.ops4j.pax.url", "pax-url-aether"),
6767
mvnBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
68+
mvnBundle("org.objenesis", "objenesis"),
6869
mvnBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
6970
mvnBundle("org.apache.commons", "commons-jexl"),
7071
mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.jexl.evaluator"),

jmx/jmx-itests/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<asm.version>9.9</asm.version>
4242
<commons-jexl.version>2.1.1</commons-jexl.version>
4343
<javax.inject.version>1</javax.inject.version>
44+
<objenesis.version>3.4</objenesis.version>
4445
<org.apache.aries.blueprint.jexl.evaluator.version>1.1.1-SNAPSHOT</org.apache.aries.blueprint.jexl.evaluator.version>
4546
<org.apache.aries.blueprint.sample.version>1.0.1-SNAPSHOT</org.apache.aries.blueprint.sample.version>
4647
<org.apache.aries.blueprint.version>1.3.0-SNAPSHOT</org.apache.aries.blueprint.version>
@@ -144,6 +145,12 @@
144145
<version>${org.apache.aries.proxy.version}</version>
145146
<scope>test</scope>
146147
</dependency>
148+
<dependency>
149+
<groupId>org.objenesis</groupId>
150+
<artifactId>objenesis</artifactId>
151+
<version>${objenesis.version}</version>
152+
<scope>test</scope>
153+
</dependency>
147154
<dependency>
148155
<groupId>org.ow2.asm</groupId>
149156
<artifactId>asm</artifactId>

jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public Option[] configuration() {
7979
protected Option blueprint() {
8080
return composite(
8181
addAsmBundles(),
82+
mavenBundle("org.objenesis", "objenesis").versionAsInProject(),
8283
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
8384
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
8485
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.jexl.evaluator").versionAsInProject(),

proxy/proxy-api/LICENSE

Lines changed: 0 additions & 203 deletions
This file was deleted.

proxy/proxy-api/NOTICE

Lines changed: 0 additions & 8 deletions
This file was deleted.

proxy/proxy-api/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.aries</groupId>
2626
<artifactId>parent</artifactId>
27-
<version>2.1.1</version>
27+
<version>3.0.0</version>
2828
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

@@ -51,18 +51,13 @@
5151
</aries.osgi.export.pkg>
5252
<aries.osgi.private.pkg/>
5353
<lastReleaseVersion>1.1.1</lastReleaseVersion>
54-
55-
<!-- Skip version check for release 1.1.0 as the plugin does not handle the case
56-
of removing a dpendency correctly -->
57-
<aries.skip.version.check>true</aries.skip.version.check>
58-
<osgi.core.version>4.3.1</osgi.core.version>
54+
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
5955
</properties>
6056

6157
<dependencies>
6258
<dependency>
6359
<groupId>org.osgi</groupId>
6460
<artifactId>osgi.core</artifactId>
65-
<version>${osgi.core.version}</version>
6661
<scope>provided</scope>
6762
</dependency>
6863
</dependencies>

0 commit comments

Comments
 (0)