Skip to content

Commit 5e9ce03

Browse files
alien11689alien11689
authored
Merge pull request #337 from apache/add-ejb-workflow
[MAINTENANCE] Add EJB workflow
2 parents 29c1ddb + 4a3b2a7 commit 5e9ce03

File tree

5 files changed

+85
-12
lines changed

5 files changed

+85
-12
lines changed

‎.github/workflows/ejb.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Licensed under the Apache License, Version 2.0 (the "License");
2+
# you may not use this file except in compliance with the License.
3+
# You may obtain a copy of the License at
4+
#
5+
# http://www.apache.org/licenses/LICENSE-2.0
6+
#
7+
# Unless required by applicable law or agreed to in writing, software
8+
# distributed under the License is distributed on an "AS IS" BASIS,
9+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
# See the License for the specific language governing permissions and
11+
# limitations under the License.
12+
13+
name: EJB - CI Build
14+
15+
on:
16+
pull_request:
17+
paths:
18+
- parent/**
19+
- testsupport/**
20+
- proxy/**
21+
- ejb/**
22+
- .github/workflows/ejb.yml
23+
push:
24+
branches:
25+
- 'trunk'
26+
27+
env:
28+
LC_ALL: en_US.UTF-8
29+
30+
jobs:
31+
JDKxx_Matrix:
32+
timeout-minutes: 10
33+
strategy:
34+
matrix:
35+
java: [ 8 ]
36+
os: [ ubuntu-latest ]
37+
name: JDK${{ matrix.java }} ${{ matrix.os }}
38+
runs-on: ${{ matrix.os }}
39+
steps:
40+
- name: Git Checkout
41+
uses: actions/checkout@v4
42+
- name: Set up Java
43+
uses: actions/setup-java@v4
44+
with:
45+
distribution: 'temurin'
46+
java-version: ${{ matrix.java }}
47+
- name: Build
48+
shell: bash
49+
run: |
50+
mvn -U -e -B -ntp clean install -f testsupport/pom.xml
51+
mvn -U -e -B -ntp clean install -f proxy/pom.xml
52+
mvn -U -e -B -ntp clean install -f ejb/pom.xml

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ See [Apache Aries Website](http://aries.apache.org/).
99
- [![Async - CI Build](https://github.com/apache/aries/actions/workflows/async.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/async.yml)
1010
- [![Blueprint - CI Build](https://github.com/apache/aries/actions/workflows/blueprint.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/blueprint.yml)
1111
- [![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)
12-
- EJB - Missing
12+
- [![EJB - CI Build](https://github.com/apache/aries/actions/workflows/ejb.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/ejb.yml)
1313
- [![esa-ant-task - CI Build](https://github.com/apache/aries/actions/workflows/esa-ant-task.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/esa-ant-task.yml)
1414
- [![esa-maven-plugin - CI Build](https://github.com/apache/aries/actions/workflows/esa-maven-plugin.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/esa-maven-plugin.yml)
1515
- [![JMX - CI Build](https://github.com/apache/aries/actions/workflows/jmx.yml/badge.svg)](https://github.com/apache/aries/actions/workflows/jmx.yml)

‎ejb/ejb-modeller-itest/pom.xml

+2-2
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.0.0</version>
27+
<version>2.1.1</version>
2828
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

@@ -90,7 +90,7 @@
9090
<org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
9191
<scannotation.version>1.0.2_1</scannotation.version>
9292
<tinybundles.version>2.0.0</tinybundles.version>
93-
<url.version>1.6.0</url.version>
93+
<url.version>2.5.3</url.version>
9494
<xbeansVersion>3.16</xbeansVersion>
9595
</properties>
9696

‎ejb/openejb-extender-itest/pom.xml

+26-8
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.0.0</version>
27+
<version>2.1.1</version>
2828
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

@@ -40,7 +40,7 @@
4040
</scm>
4141

4242
<properties>
43-
<asm-all.version>4.0</asm-all.version>
43+
<asm.version>9.6</asm.version>
4444
<commons-beanutils.version>1.8.3</commons-beanutils.version>
4545
<commons-cli.version>1.2</commons-cli.version>
4646
<commons-collections.version>3.2.2</commons-collections.version>
@@ -83,20 +83,20 @@
8383
<org.apache.aries.jpa.api.version>1.0.0</org.apache.aries.jpa.api.version>
8484
<org.apache.aries.jpa.container.context.version>1.0.0</org.apache.aries.jpa.container.context.version>
8585
<org.apache.aries.jpa.container.version>1.0.0</org.apache.aries.jpa.container.version>
86-
<org.apache.aries.proxy.version>1.0.0</org.apache.aries.proxy.version>
86+
<org.apache.aries.proxy.version>1.1.15-SNAPSHOT</org.apache.aries.proxy.version>
8787
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
8888
<org.apache.aries.transaction.manager.version>1.0.0</org.apache.aries.transaction.manager.version>
8989
<org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
9090
<org.apache.servicemix.bundles.javassist.version>3.12.1.ga_1</org.apache.servicemix.bundles.javassist.version>
9191
<org.apache.servicemix.bundles.jaxb-impl.version>2.2.1.1_2</org.apache.servicemix.bundles.jaxb-impl.version>
9292
<org.apache.servicemix.bundles.serp.version>1.13.1_2</org.apache.servicemix.bundles.serp.version>
9393
<org.apache.servicemix.bundles.wsdl4j-1.6.1.version>4.0-m1</org.apache.servicemix.bundles.wsdl4j-1.6.1.version>
94-
<org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
94+
<org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version>
9595
<org.osgi.enterprise.version>4.2.0</org.osgi.enterprise.version>
9696
<pax-exam.version>3.4.0</pax-exam.version>
9797
<pax-logging-api.version>1.7.2</pax-logging-api.version>
9898
<pax-logging-service.version>1.7.2</pax-logging-service.version>
99-
<pax-url-aether.version>1.6.0</pax-url-aether.version>
99+
<pax-url-aether.version>2.5.3</pax-url-aether.version>
100100
<scannotation.version>1.0.2_1</scannotation.version>
101101
<xbeansVersion>3.8</xbeansVersion>
102102
</properties>
@@ -110,7 +110,7 @@
110110

111111
<!-- framework -->
112112
<dependency>
113-
<groupId>org.eclipse</groupId>
113+
<groupId>org.eclipse.platform</groupId>
114114
<artifactId>org.eclipse.osgi</artifactId>
115115
<version>${org.eclipse.osgi.version}</version>
116116
<scope>test</scope>
@@ -181,8 +181,26 @@
181181
</dependency>
182182
<dependency>
183183
<groupId>org.ow2.asm</groupId>
184-
<artifactId>asm-all</artifactId>
185-
<version>${asm-all.version}</version>
184+
<artifactId>asm</artifactId>
185+
<version>${asm.version}</version>
186+
<scope>test</scope>
187+
</dependency>
188+
<dependency>
189+
<groupId>org.ow2.asm</groupId>
190+
<artifactId>asm-commons</artifactId>
191+
<version>${asm.version}</version>
192+
<scope>test</scope>
193+
</dependency>
194+
<dependency>
195+
<groupId>org.ow2.asm</groupId>
196+
<artifactId>asm-tree</artifactId>
197+
<version>${asm.version}</version>
198+
<scope>test</scope>
199+
</dependency>
200+
<dependency>
201+
<groupId>org.ow2.asm</groupId>
202+
<artifactId>asm-analysis</artifactId>
203+
<version>${asm.version}</version>
186204
<scope>test</scope>
187205
</dependency>
188206
<dependency>

‎ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ public static Option[] configuration() {
4444
// Bundles
4545
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
4646
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
47-
mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
47+
mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
48+
mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
49+
mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
50+
mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
4851
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
4952
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager").versionAsInProject(),
5053
mavenBundle("org.osgi", "org.osgi.enterprise").versionAsInProject(),

0 commit comments

Comments
 (0)