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/01/13 22:42:50 UTC
(aries) branch trunk updated (73b0e3ee5 -> 8e16ca015)
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
from 73b0e3ee5 [MAINTENANCE] Run spi-fly builds on Java LTS versions
new cbd9afc5a [MAINTENANCE] Fix jmx-whiteboard tests
new 9d07dd907 [MAINTENANCE] Add licence to files missing it
new 8e16ca015 [MAINTENANCE] Simplify jmx workflow
The 3 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.
Summary of changes:
.github/workflows/jmx.yml | 3 +-
jmx/jmx-whiteboard/pom.xml | 69 +++++++++++++--------------------
jmx/tck/apply_to_tck.sh | 17 ++++++++
jmx/tck/org.osgi.test.cases.jmx.bnd.bnd | 17 ++++++++
4 files changed, 64 insertions(+), 42 deletions(-)
(aries) 03/03: [MAINTENANCE] Simplify jmx workflow
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 8e16ca0155e51067b1d59bceaa4922a3e6de4038
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Mon Jan 13 23:32:47 2025 +0100
[MAINTENANCE] Simplify jmx workflow
---
.github/workflows/jmx.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/jmx.yml b/.github/workflows/jmx.yml
index b9b42d940..c5c277c7a 100644
--- a/.github/workflows/jmx.yml
+++ b/.github/workflows/jmx.yml
@@ -46,4 +46,5 @@ jobs:
- name: Build
shell: bash
run: |
- mvn -U -e -B -ntp -am -pl jmx/jmx-itests clean install
+ mvn -U -e -B -ntp clean install -f testsupport/pom.xml
+ mvn -U -e -B -ntp clean install -f jmx/pom.xml
(aries) 01/03: [MAINTENANCE] Fix jmx-whiteboard tests
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit cbd9afc5ad980fd16246c770cea4d8f8525e1ff8
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Mon Jan 13 23:31:49 2025 +0100
[MAINTENANCE] Fix jmx-whiteboard tests
---
jmx/jmx-whiteboard/pom.xml | 69 +++++++++++++++++++---------------------------
1 file changed, 28 insertions(+), 41 deletions(-)
diff --git a/jmx/jmx-whiteboard/pom.xml b/jmx/jmx-whiteboard/pom.xml
index 1103faacc..8a4985966 100644
--- a/jmx/jmx-whiteboard/pom.xml
+++ b/jmx/jmx-whiteboard/pom.xml
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.1</version>
+ <version>2.1.1</version>
<relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ </parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.whiteboard</artifactId>
@@ -46,18 +46,18 @@
<url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url>
</scm>
- <!-- A Note on Testing ================= This project contains two kinds
- of tests: regular unit tests running in the test phase and integration tests
- based on PAX Exam running in the integration-test phase. Basically the complete
- project is build using Java 1.3 source and target compatibility (as inherited
- from the parent pom). The exception are the unit tests in the "integration"
- packages. These have to be compiled with Java 5 source and target compatibility
- because the employ annotations and generics. For running the integration
- tests from the console using Maven nothing special has to be done as the
- tests run automatically. To run the tests in your IDE, the project has to
- be built to the "package" phase with the profile "ide" enabled: $ mvn -Pide
- clean package This creates the scr.jar file in the target folder, which is
- used by the integration tests when run from the IDE. Alternatively the "project.bundle.file"
+ <!-- A Note on Testing ================= This project contains two kinds
+ of tests: regular unit tests running in the test phase and integration tests
+ based on PAX Exam running in the integration-test phase. Basically the complete
+ project is build using Java 1.3 source and target compatibility (as inherited
+ from the parent pom). The exception are the unit tests in the "integration"
+ packages. These have to be compiled with Java 5 source and target compatibility
+ because the employ annotations and generics. For running the integration
+ tests from the console using Maven nothing special has to be done as the
+ tests run automatically. To run the tests in your IDE, the project has to
+ be built to the "package" phase with the profile "ide" enabled: $ mvn -Pide
+ clean package This creates the scr.jar file in the target folder, which is
+ used by the integration tests when run from the IDE. Alternatively the "project.bundle.file"
system property may be set to the bundle JAR in the IDE launcher. -->
<properties>
<bundle.build.name>
@@ -81,13 +81,15 @@
</aries.osgi.import.service>
<exam.version>3.4.0</exam.version>
- <url.version>1.6.0</url.version>
+ <javax.inject.version>1</javax.inject.version>
+ <org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version>
+ <url.version>2.5.3</url.version>
</properties>
<build>
<plugins>
- <!-- Exclude Integration tests in (default) unit tests and conversely
- enable integration tests for integration testing only. Helper classes are
+ <!-- Exclude Integration tests in (default) unit tests and conversely
+ enable integration tests for integration testing only. Helper classes are
completely excluded from testing. -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -129,7 +131,7 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
@@ -199,9 +201,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
+ <groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.8.0.v20120529-1548</version>
+ <version>${org.eclipse.osgi.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${javax.inject.version}</version>
</dependency>
</dependencies>
@@ -247,25 +255,4 @@
</build>
</profile>
</profiles>
-
- <!-- repositories for Pax Exam and BND tool -->
- <repositories>
- <repository>
- <id>ops4j</id>
- <name>ops4j</name>
- <url>http://repository.ops4j.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>aqute</id>
- <name>aqute</name>
- <url>http://www.aqute.biz/repo</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
</project>
(aries) 02/03: [MAINTENANCE] Add licence to files missing it
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 9d07dd9078efb132451e3fa09b2beef500ffcf6c
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Mon Jan 13 23:32:31 2025 +0100
[MAINTENANCE] Add licence to files missing it
---
jmx/tck/apply_to_tck.sh | 17 +++++++++++++++++
jmx/tck/org.osgi.test.cases.jmx.bnd.bnd | 17 +++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/jmx/tck/apply_to_tck.sh b/jmx/tck/apply_to_tck.sh
index 09c2bfda8..dff7e286c 100755
--- a/jmx/tck/apply_to_tck.sh
+++ b/jmx/tck/apply_to_tck.sh
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Change these
# Fill in the variable below, e.g. ARIES_DIR=/Users/david/checkouts/aries
ARIES_DIR=...the root of your apache aries checkout...
diff --git a/jmx/tck/org.osgi.test.cases.jmx.bnd.bnd b/jmx/tck/org.osgi.test.cases.jmx.bnd.bnd
index c00120b41..4855e52ef 100644
--- a/jmx/tck/org.osgi.test.cases.jmx.bnd.bnd
+++ b/jmx/tck/org.osgi.test.cases.jmx.bnd.bnd
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
# Set javac settings from JDT prefs
-include: ${project.workspace}/cnf/eclipse/jdt.bnd