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
The following commit(s) were added to refs/heads/trunk by this push:
new 9de981f44 ARIES-2165: Build esa-ant-task on Java 11, 17 and 21
9de981f44 is described below
commit 9de981f44be298c340bceb0878357288698be947
Author: Dominik Przybysz <[email protected]>
AuthorDate: Thu Feb 27 14:18:27 2025 +0100
ARIES-2165: Build esa-ant-task on Java 11, 17 and 21
---
.github/workflows/esa-ant-task.yml | 2 +-
esa-ant-task/{readme.txt => README.md} | 1 -
esa-ant-task/pom.xml | 24 +++++++++++++++++++++---
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/esa-ant-task.yml
b/.github/workflows/esa-ant-task.yml
index f8989c3d4..ec77fb910 100644
--- a/.github/workflows/esa-ant-task.yml
+++ b/.github/workflows/esa-ant-task.yml
@@ -31,7 +31,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- java: [ 8 ]
+ java: [ 8, 11, 17, 21 ]
os: [ ubuntu-latest ]
name: JDK${{ matrix.java }} ${{ matrix.os }}
runs-on: ${{ matrix.os }}
diff --git a/esa-ant-task/readme.txt b/esa-ant-task/README.md
similarity index 99%
rename from esa-ant-task/readme.txt
rename to esa-ant-task/README.md
index 648f13aef..21f99a71a 100755
--- a/esa-ant-task/readme.txt
+++ b/esa-ant-task/README.md
@@ -7,7 +7,6 @@ Clone the project and then run `mvn clean install`, grab the
jar and drop it you
# Sample build file
```xml
-
<?xml version="1.0" encoding="UTF-8"?>
<!-- ======================================================================
diff --git a/esa-ant-task/pom.xml b/esa-ant-task/pom.xml
index 533426e6f..9d1c45b68 100755
--- a/esa-ant-task/pom.xml
+++ b/esa-ant-task/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -5,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -14,8 +33,7 @@
<name>Aries ESA Ant Task</name>
<description>Builds an esa (Enterprise Subsystem Archive) from the project
for deployment to an aries server.</description>
<properties>
- <ant.version>1.8.0</ant.version>
- <bnd.version>2.4.0</bnd.version>
+ <ant.version>1.10.15</ant.version>
</properties>
<dependencies>
<dependency>