You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by al...@apache.org on 2025/04/23 18:19:40 UTC
(aries) branch ARIES-2165-build-application-with-java-11-17-21 created (now 80ba4c1dc)
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a change to branch ARIES-2165-build-application-with-java-11-17-21
in repository https://gitbox.apache.org/repos/asf/aries.git
at 80ba4c1dc ARIES-2165: Build application with Java 11, 17 and 21
This branch includes the following new commits:
new bb6ff7f56 ARIES-2177: Update dependencies in left application modules
new 80ba4c1dc ARIES-2165: Build application with Java 11, 17 and 21
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(aries) 01/02: ARIES-2177: Update dependencies in left application modules
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch ARIES-2165-build-application-with-java-11-17-21
in repository https://gitbox.apache.org/repos/asf/aries.git
commit bb6ff7f561d527b7b4443dcc1d99d4d438f64c52
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Wed Apr 23 19:44:41 2025 +0200
ARIES-2177: Update dependencies in left application modules
---
application/application-api/pom.xml | 5 +++--
.../application-modeller-common-test/pom.xml | 10 +++++-----
.../aries/application/modelling/ModellerTest.java | 2 --
.../application/modelling/impl/ParserProxyTest.java | 5 ++---
application/application-modeller/pom.xml | 21 +++++----------------
application/application-utils/pom.xml | 14 ++++----------
6 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/application/application-api/pom.xml b/application/application-api/pom.xml
index 6a04c81f3..328c757fb 100644
--- a/application/application-api/pom.xml
+++ b/application/application-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -55,8 +55,9 @@
</aries.osgi.export.pkg>
<aries.osgi.private.pkg/>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
+ <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
- <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
+ <org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version>
<osgi.core.version>4.3.1</osgi.core.version>
</properties>
diff --git a/application/application-modeller-common-test/pom.xml b/application/application-modeller-common-test/pom.xml
index 88425f3c3..6687d3789 100644
--- a/application/application-modeller-common-test/pom.xml
+++ b/application/application-modeller-common-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -44,8 +44,8 @@
</scm>
<properties>
- <application-modeller-standalone.version>1.0.0</application-modeller-standalone.version>
- <org.apache.aries.blueprint.core.version>1.0.0</org.apache.aries.blueprint.core.version>
+ <org.apache.aries.application.modeller.version>1.0.1-SNAPSHOT</org.apache.aries.application.modeller.version>
+ <org.apache.aries.blueprint.core.version>1.2.0</org.apache.aries.blueprint.core.version>
<org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
<osgi.cmpn.version>5.0.0</osgi.cmpn.version>
<osgi.core.version>6.0.0</osgi.core.version>
@@ -54,8 +54,8 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.application</groupId>
- <artifactId>application-modeller-standalone</artifactId>
- <version>${application-modeller-standalone.version}</version>
+ <artifactId>org.apache.aries.application.modeller</artifactId>
+ <version>${org.apache.aries.application.modeller.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/application/application-modeller-common-test/src/test/java/org/apache/aries/application/modelling/ModellerTest.java b/application/application-modeller-common-test/src/test/java/org/apache/aries/application/modelling/ModellerTest.java
index d84064027..2e6c5b4a4 100644
--- a/application/application-modeller-common-test/src/test/java/org/apache/aries/application/modelling/ModellerTest.java
+++ b/application/application-modeller-common-test/src/test/java/org/apache/aries/application/modelling/ModellerTest.java
@@ -37,7 +37,6 @@ import org.apache.aries.application.modelling.ModelledResourceManager;
import org.apache.aries.application.modelling.impl.ModelledResourceManagerImpl;
import org.apache.aries.application.modelling.impl.ModellingManagerImpl;
import org.apache.aries.application.modelling.impl.ParserProxyTest;
-import org.apache.aries.application.modelling.standalone.OfflineModellingFactory;
import org.apache.aries.mocks.BundleContextMock;
import org.apache.aries.util.filesystem.FileSystem;
import org.apache.aries.util.io.IOUtils;
@@ -60,7 +59,6 @@ public class ModellerTest {
manager.setModellingPlugins(Collections.<ServiceModeller>emptyList());
return Arrays.asList(new Object[][] {
- {OfflineModellingFactory.getModelledResourceManager()},
{manager}
});
}
diff --git a/application/application-modeller-common-test/src/test/java/org/apache/aries/application/modelling/impl/ParserProxyTest.java b/application/application-modeller-common-test/src/test/java/org/apache/aries/application/modelling/impl/ParserProxyTest.java
index a6c98eefd..83caea502 100644
--- a/application/application-modeller-common-test/src/test/java/org/apache/aries/application/modelling/impl/ParserProxyTest.java
+++ b/application/application-modeller-common-test/src/test/java/org/apache/aries/application/modelling/impl/ParserProxyTest.java
@@ -42,7 +42,6 @@ import org.apache.aries.application.modelling.ParsedServiceElements;
import org.apache.aries.application.modelling.ParserProxy;
import org.apache.aries.application.modelling.WrappedReferenceMetadata;
import org.apache.aries.application.modelling.WrappedServiceMetadata;
-import org.apache.aries.application.modelling.standalone.OfflineModellingFactory;
import org.apache.aries.blueprint.container.NamespaceHandlerRegistry;
import org.apache.aries.blueprint.container.ParserServiceImpl;
import org.apache.aries.blueprint.namespace.NamespaceHandlerRegistryImpl;
@@ -62,8 +61,8 @@ public class ParserProxyTest {
@Parameters
public static List<Object[]> parserProxies() {
return Arrays.asList(new Object[][] {
- {getMockParserServiceProxy()},
- {OfflineModellingFactory.getOfflineParserProxy()}});
+ {getMockParserServiceProxy()}
+ });
}
public static ParserProxy getMockParserServiceProxy() {
diff --git a/application/application-modeller/pom.xml b/application/application-modeller/pom.xml
index e533c5cb0..777e2f08d 100644
--- a/application/application-modeller/pom.xml
+++ b/application/application-modeller/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -56,13 +56,13 @@
*
</aries.osgi.import.pkg>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
+ <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
- <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
- <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
+ <org.apache.aries.application.api.version>1.0.1-SNAPSHOT</org.apache.aries.application.api.version>
+ <org.apache.aries.application.utils.version>1.0.1-SNAPSHOT</org.apache.aries.application.utils.version>
<org.apache.aries.blueprint.core.version>1.2.0</org.apache.aries.blueprint.core.version>
<org.apache.aries.jndi.api.version>1.0.0</org.apache.aries.jndi.api.version>
- <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
- <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
+ <org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version>
<osgi.cmpn.version>4.3.1</osgi.cmpn.version>
<osgi.core.version>4.3.1</osgi.core.version>
</properties>
@@ -78,17 +78,6 @@
<artifactId>org.apache.aries.application.api</artifactId>
<version>${org.apache.aries.application.api.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>${org.apache.aries.util.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <scope>test</scope>
- <version>${org.apache.aries.testsupport.unit.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
diff --git a/application/application-utils/pom.xml b/application/application-utils/pom.xml
index 7617f21bd..b47e06bf6 100644
--- a/application/application-utils/pom.xml
+++ b/application/application-utils/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -64,10 +64,10 @@
org.apache.aries.application.utils.filesystem.impl
</aries.osgi.private.pkg>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
+ <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
- <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
- <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
- <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
+ <org.apache.aries.application.api.version>1.0.1-SNAPSHOT</org.apache.aries.application.api.version>
+ <org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version>
<osgi.core.version>4.3.1</osgi.core.version>
</properties>
@@ -85,12 +85,6 @@
<artifactId>org.apache.aries.util</artifactId>
<version>${org.apache.aries.util.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <scope>test</scope>
- <version>${org.apache.aries.testsupport.unit.version}</version>
- </dependency>
<!--External dependencies. Versions may be specified in default parent -->
<dependency>
(aries) 02/02: ARIES-2165: Build application with Java 11, 17 and 21
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch ARIES-2165-build-application-with-java-11-17-21
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 80ba4c1dc74e9d7ce4619ec69e6a193710846932
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Wed Apr 23 19:52:14 2025 +0200
ARIES-2165: Build application with Java 11, 17 and 21
---
.github/workflows/application.yml | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml
index 11cad7019..e8e6604a6 100644
--- a/.github/workflows/application.yml
+++ b/.github/workflows/application.yml
@@ -38,14 +38,26 @@ jobs:
steps:
- name: Git Checkout
uses: actions/checkout@v4
- - name: Set up Java
+ - name: Set up Java 8
uses: actions/setup-java@v4
with:
distribution: 'temurin'
- java-version: ${{ matrix.java }}
+ java-version: 8
- name: Build parent
shell: bash
run: mvn -U -e -B -ntp clean install -f parent
+ - 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 -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util
+ - name: Set up Java ${{ matrix.java }}
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: ${{ matrix.java }}
+ if: ${{ 8 != matrix.java }}
- name: Build application
shell: bash
run: mvn -U -e -B -ntp clean install -f application