This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch add-ejb-workflow in repository https://gitbox.apache.org/repos/asf/aries.git
commit 4a3b2a70b0a19ea2c0ab83fc1b24e9595ad8b443 Author: Dominik Przybysz <[email protected]> AuthorDate: Tue Jan 14 23:36:10 2025 +0100 [MAINTENANCE] Add EJB workflow --- .github/workflows/ejb.yml | 52 ++++++++++++++++++++++ README.md | 2 +- ejb/ejb-modeller-itest/pom.xml | 4 +- ejb/openejb-extender-itest/pom.xml | 34 ++++++++++---- .../extender/itest/AbstractOpenEJBTest.java | 5 ++- 5 files changed, 85 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ejb.yml b/.github/workflows/ejb.yml new file mode 100644 index 000000000..d35f28c37 --- /dev/null +++ b/.github/workflows/ejb.yml @@ -0,0 +1,52 @@ +# 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: EJB - CI Build + +on: + pull_request: + paths: + - parent/** + - testsupport/** + - proxy/** + - ejb/** + - .github/workflows/ejb.yml + push: + branches: + - 'trunk' + +env: + LC_ALL: en_US.UTF-8 + +jobs: + JDKxx_Matrix: + timeout-minutes: 10 + strategy: + 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 testsupport/pom.xml + mvn -U -e -B -ntp clean install -f proxy/pom.xml + mvn -U -e -B -ntp clean install -f ejb/pom.xml diff --git a/README.md b/README.md index 25d950301..f0e0c5a5a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ See [Apache Aries Website](http://aries.apache.org/). - [](https://github.com/apache/aries/actions/workflows/async.yml) - [](https://github.com/apache/aries/actions/workflows/blueprint.yml) - [](https://github.com/apache/aries/actions/workflows/eba-maven-plugin.yml) -- EJB - Missing +- [](https://github.com/apache/aries/actions/workflows/ejb.yml) - [](https://github.com/apache/aries/actions/workflows/esa-ant-task.yml) - [](https://github.com/apache/aries/actions/workflows/esa-maven-plugin.yml) - [](https://github.com/apache/aries/actions/workflows/jmx.yml) diff --git a/ejb/ejb-modeller-itest/pom.xml b/ejb/ejb-modeller-itest/pom.xml index 68e170ef8..355dd3884 100644 --- a/ejb/ejb-modeller-itest/pom.xml +++ b/ejb/ejb-modeller-itest/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>2.0.0</version> + <version>2.1.1</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -90,7 +90,7 @@ <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version> <scannotation.version>1.0.2_1</scannotation.version> <tinybundles.version>2.0.0</tinybundles.version> - <url.version>1.6.0</url.version> + <url.version>2.5.3</url.version> <xbeansVersion>3.16</xbeansVersion> </properties> diff --git a/ejb/openejb-extender-itest/pom.xml b/ejb/openejb-extender-itest/pom.xml index 8d393686f..15566dd10 100644 --- a/ejb/openejb-extender-itest/pom.xml +++ b/ejb/openejb-extender-itest/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>2.0.0</version> + <version>2.1.1</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -40,7 +40,7 @@ </scm> <properties> - <asm-all.version>4.0</asm-all.version> + <asm.version>9.6</asm.version> <commons-beanutils.version>1.8.3</commons-beanutils.version> <commons-cli.version>1.2</commons-cli.version> <commons-collections.version>3.2.2</commons-collections.version> @@ -83,7 +83,7 @@ <org.apache.aries.jpa.api.version>1.0.0</org.apache.aries.jpa.api.version> <org.apache.aries.jpa.container.context.version>1.0.0</org.apache.aries.jpa.container.context.version> <org.apache.aries.jpa.container.version>1.0.0</org.apache.aries.jpa.container.version> - <org.apache.aries.proxy.version>1.0.0</org.apache.aries.proxy.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.apache.aries.transaction.manager.version>1.0.0</org.apache.aries.transaction.manager.version> <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> @@ -91,12 +91,12 @@ <org.apache.servicemix.bundles.jaxb-impl.version>2.2.1.1_2</org.apache.servicemix.bundles.jaxb-impl.version> <org.apache.servicemix.bundles.serp.version>1.13.1_2</org.apache.servicemix.bundles.serp.version> <org.apache.servicemix.bundles.wsdl4j-1.6.1.version>4.0-m1</org.apache.servicemix.bundles.wsdl4j-1.6.1.version> - <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version> + <org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version> <org.osgi.enterprise.version>4.2.0</org.osgi.enterprise.version> <pax-exam.version>3.4.0</pax-exam.version> <pax-logging-api.version>1.7.2</pax-logging-api.version> <pax-logging-service.version>1.7.2</pax-logging-service.version> - <pax-url-aether.version>1.6.0</pax-url-aether.version> + <pax-url-aether.version>2.5.3</pax-url-aether.version> <scannotation.version>1.0.2_1</scannotation.version> <xbeansVersion>3.8</xbeansVersion> </properties> @@ -110,7 +110,7 @@ <!-- framework --> <dependency> - <groupId>org.eclipse</groupId> + <groupId>org.eclipse.platform</groupId> <artifactId>org.eclipse.osgi</artifactId> <version>${org.eclipse.osgi.version}</version> <scope>test</scope> @@ -181,8 +181,26 @@ </dependency> <dependency> <groupId>org.ow2.asm</groupId> - <artifactId>asm-all</artifactId> - <version>${asm-all.version}</version> + <artifactId>asm</artifactId> + <version>${asm.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + <version>${asm.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + <version>${asm.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + <version>${asm.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java b/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java index 731021685..f74762661 100644 --- a/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java +++ b/ejb/openejb-extender-itest/src/test/java/org/apache/aries/ejb/openejb/extender/itest/AbstractOpenEJBTest.java @@ -44,7 +44,10 @@ public abstract class AbstractOpenEJBTest extends AbstractIntegrationTest { // Bundles mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(), mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(), - mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(), + mavenBundle("org.ow2.asm", "asm").versionAsInProject(), + mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(), + mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(), + mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(), mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(), mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager").versionAsInProject(), mavenBundle("org.osgi", "org.osgi.enterprise").versionAsInProject(),
