[BUILD-STABLE]: Job 'Karaf/karaf-runtime/main [main] [480]'
BUILD-STABLE: Job 'Karaf/karaf-runtime/main [main] [480]': Is back to normal.
[BUILD-FAILURE]: Job 'Karaf/karaf-runtime/main [main] [479]'
BUILD-FAILURE: Job 'Karaf/karaf-runtime/main [main] [479]': Check console output at "https://ci-builds.apache.org/job/Karaf/job/karaf-runtime/job/main/479/;>Karaf/karaf-runtime/main [main] [479]"
[BUILD-FAILURE]: Job 'Karaf/karaf-runtime/main [main] [478]'
BUILD-FAILURE: Job 'Karaf/karaf-runtime/main [main] [478]': Check console output at "https://ci-builds.apache.org/job/Karaf/job/karaf-runtime/job/main/478/;>Karaf/karaf-runtime/main [main] [478]"
Re: [PR] [KARAF-7544] Clean up Jetty/servlet-api use [karaf]
asfgit closed pull request #1809: [KARAF-7544] Clean up Jetty/servlet-api use URL: https://github.com/apache/karaf/pull/1809 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@karaf.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(karaf) branch main updated: [KARAF-7544] Use properties to centralize jetty version and servlet api maven coordinates
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new d7e6477f31 [KARAF-7544] Use properties to centralize jetty version and
servlet api maven coordinates
new c8cfb5236b This closes #1809
d7e6477f31 is described below
commit d7e6477f316ed5f89ec17f32462f475b99906559
Author: Robert Varga
AuthorDate: Sat Dec 16 10:07:03 2023 +0100
[KARAF-7544] Use properties to centralize jetty version and servlet api
maven coordinates
Signed-off-by: Robert Varga
---
assemblies/features/standard/src/main/feature/feature.xml | 2 +-
examples/karaf-docker-example/karaf-docker-example-app/pom.xml| 8
.../karaf-graphql-example-features/src/main/feature/feature.xml | 2 +-
.../karaf-graphql-example/karaf-graphql-example-websocket/pom.xml | 2 +-
examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml| 8
.../karaf-servlet-example-annotation/pom.xml | 8
.../karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml | 8
.../karaf-servlet-example-registration/pom.xml| 8
examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml | 8
.../karaf-servlet-example/karaf-servlet-example-upload/pom.xml| 8
examples/karaf-websocket-example/pom.xml | 2 +-
itests/test/pom.xml | 4 ++--
pom.xml | 1 +
13 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/assemblies/features/standard/src/main/feature/feature.xml
b/assemblies/features/standard/src/main/feature/feature.xml
index 896cdf5c97..2bbb0c56a1 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -910,7 +910,7 @@ org.osgi.service.http.port=8181
pax-web-http-war
-
+
pax-web-jetty
diff --git a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml
b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml
index 60b8f61bbc..15ab5d6f5c 100644
--- a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml
+++ b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml
@@ -56,9 +56,9 @@
provided
-javax.servlet
-javax.servlet-api
-3.1.0
+${servlet.spec.groupId}
+${servlet.spec.artifactId}
+${servlet.spec.version}
provided
@@ -86,4 +86,4 @@
-
\ No newline at end of file
+
diff --git
a/examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml
b/examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml
index 7849f18f88..8e3ba27d96 100644
---
a/examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml
+++
b/examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml
@@ -41,7 +41,7 @@
mvn:com.graphql-java-kickstart/graphql-java-servlet/14.0.0
mvn:io.reactivex.rxjava3/rxjava/3.1.5
-mvn:org.eclipse.jetty.websocket/websocket-server/9.4.52.v20230823
+mvn:org.eclipse.jetty.websocket/websocket-server/${jetty.version}
mvn:org.apache.karaf.examples/karaf-graphql-example-api/${project.version}
mvn:org.apache.karaf.examples/karaf-graphql-example-core/${project.version}
diff --git
a/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml
b/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml
index 286df65c4f..ba4467f269 100644
--- a/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml
+++ b/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml
@@ -36,7 +36,7 @@
org.eclipse.jetty.websocket
websocket-servlet
-9.4.52.v20230823
+${jetty.version}
provided
diff --git a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml
b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml
index 643040e2be..e4cf775976 100644
--- a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml
+++ b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml
@@ -34,9 +34,9 @@
-javax.servlet
-javax.servlet-api
-3.1.0
+${servlet.spec.groupId}
+${servlet.spec.artifactId}
+${servlet.spec.version}
provided
@@ -60,4 +60,4 @@
-
\ No newline at end of file
+
diff --git
a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml
(karaf) branch karaf-4.4.x updated: KARAF-7783: Upgrade to commons-logging 1.3.0
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch karaf-4.4.x in repository https://gitbox.apache.org/repos/asf/karaf.git The following commit(s) were added to refs/heads/karaf-4.4.x by this push: new 0eb6fe3ce3 KARAF-7783: Upgrade to commons-logging 1.3.0 0eb6fe3ce3 is described below commit 0eb6fe3ce3fdcdd26892776e8ab079f9a6e70d43 Author: JB Onofré AuthorDate: Mon Dec 18 11:15:54 2023 +0100 KARAF-7783: Upgrade to commons-logging 1.3.0 (cherry picked from commit 7d37936b137d88c3e955b2dc7c9707514fa60098) --- jaas/modules/pom.xml | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml index 058b5043e4..625e3795f0 100644 --- a/jaas/modules/pom.xml +++ b/jaas/modules/pom.xml @@ -188,6 +188,7 @@ !net.spy.memcached*, com.sun.security.auth.module;resolution:=optional, javax.xml.bind*;version="[2.2,3)", + org.apache.commons.logging;version="[1,2)", * diff --git a/pom.xml b/pom.xml index eecd9d434d..afa6449b76 100644 --- a/pom.xml +++ b/pom.xml @@ -182,7 +182,7 @@ 3.2.2 1.5 3.14.0 -1.2 +1.3.0 2.11.1 2.15.1 2.7.11
(karaf) branch main updated: KARAF-7783: Upgrade to commons-logging 1.3.0
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/karaf.git The following commit(s) were added to refs/heads/main by this push: new 7d37936b13 KARAF-7783: Upgrade to commons-logging 1.3.0 new 849dc1b740 Merge pull request #1811 from jbonofre/KARAF-7783 7d37936b13 is described below commit 7d37936b137d88c3e955b2dc7c9707514fa60098 Author: JB Onofré AuthorDate: Mon Dec 18 11:15:54 2023 +0100 KARAF-7783: Upgrade to commons-logging 1.3.0 --- jaas/modules/pom.xml | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml index 5eda40f3e5..559c95afd8 100644 --- a/jaas/modules/pom.xml +++ b/jaas/modules/pom.xml @@ -196,6 +196,7 @@ !net.spy.memcached*, com.sun.security.auth.module;resolution:=optional, javax.xml.bind*;version="[2.2,3)", + org.apache.commons.logging;version="[1,2)", * diff --git a/pom.xml b/pom.xml index 0bab12ff70..7972897369 100644 --- a/pom.xml +++ b/pom.xml @@ -182,7 +182,7 @@ 3.2.2 1.5 3.14.0 -1.2 +1.3.0 2.11.1 2.15.1 2.7.11
Re: [PR] KARAF-7783: Upgrade to commons-logging 1.3.0 [karaf]
jbonofre merged PR #1811: URL: https://github.com/apache/karaf/pull/1811 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@karaf.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(karaf) branch main updated: Support Java 21 in Builder.JavaVersion
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new e9914f8267 Support Java 21 in Builder.JavaVersion
new bd66435e8e Merge pull request #1810 from rovarga/builder-javaversion
e9914f8267 is described below
commit e9914f8267c9358c762eac84116bed48f4985358
Author: Robert Varga
AuthorDate: Sat Dec 16 11:28:32 2023 +0100
Support Java 21 in Builder.JavaVersion
We have jre-21 defined in jre.properties, but the Builder would not
recognize them. Update the enumeration and eliminate manuall-maintained
ordinal, deferring to Enum.compareTo() instead.
Signed-off-by: Robert Varga
---
.../org/apache/karaf/profile/assembly/Builder.java | 35 +++---
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git
a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index 1f96027866..52088ed7f2 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -184,26 +184,27 @@ public class Builder {
* supported versions are defined.
*/
public enum JavaVersion {
-Java6("1.6", 1),
-Java7("1.7", 2),
-Java8("1.8", 3),
-Java9("9", 4),
-Java10("10", 5),
-Java11("11", 6),
-Java12("12", 7),
-Java13("13", 8),
-Java14("14", 9),
-Java15("15", 10),
-Java16("16", 11),
-Java17("17", 12),
-Java18("18", 13);
+Java6("1.6"),
+Java7("1.7"),
+Java8("1.8"),
+Java9("9"),
+Java10("10"),
+Java11("11"),
+Java12("12"),
+Java13("13"),
+Java14("14"),
+Java15("15"),
+Java16("16"),
+Java17("17"),
+Java18("18"),
+Java19("19"),
+Java20("20"),
+Java21("21");
private String version;
-private int ordinal;
-JavaVersion(String version, int ordinal) {
+JavaVersion(String version) {
this.version = version;
-this.ordinal = ordinal;
}
public static JavaVersion from(String version) {
@@ -216,7 +217,7 @@ public class Builder {
}
public boolean supportsEndorsedAndExtLibraries() {
-return this.ordinal < Java9.ordinal;
+return compareTo(Java9) < 0;
}
}
Re: [PR] Support Java 21 in Builder.JavaVersion [karaf]
jbonofre merged PR #1810: URL: https://github.com/apache/karaf/pull/1810 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@karaf.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
