[karaf-winegrower] branch master updated (9487180 -> c01b970)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/karaf-winegrower.git. from 9487180 Merge pull request #8 from rmannibucau/rmannibucau/avoid-to-require-osgi-annotation-in-cp-for-implicit-headers new 7bbd1d8 dont require osgi-annotation in cp for @Header new ede2fa9 ensure pour defaults match ripener config defaults new c01b970 Merge pull request #9 from rmannibucau/rmannibucau/ensure-pour-defaults-match-config-defaults The 208 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: .../org/apache/winegrower/examples/Simple.java | 16 -- .../winegrower/extension/build/maven/PourMojo.java | 66 -- 2 files changed, 45 insertions(+), 37 deletions(-)
[karaf-winegrower] branch master updated: dont require osgi-annotation in cp for @Header
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-winegrower.git
The following commit(s) were added to refs/heads/master by this push:
new fbcfbb7 dont require osgi-annotation in cp for @Header
new 9487180 Merge pull request #8 from
rmannibucau/rmannibucau/avoid-to-require-osgi-annotation-in-cp-for-implicit-headers
fbcfbb7 is described below
commit fbcfbb703b2730121efcc92a033f567a6e470a2d
Author: Romain Manni-Bucau
AuthorDate: Sat Sep 19 17:02:34 2020 +0200
dont require osgi-annotation in cp for @Header
---
pom.xml| 4 +--
.../winegrower/scanner/StandaloneScanner.java | 3 ++-
.../manifest/HeaderManifestContributor.java| 29 +-
.../scanner/manifest/ManifestContributor.java | 25 ++-
4 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index b89db6a..0995c29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,8 +116,8 @@
maven-compiler-plugin
3.8.1
- 11
- 11
+ 8
+ 8
diff --git
a/winegrower-core/src/main/java/org/apache/winegrower/scanner/StandaloneScanner.java
b/winegrower-core/src/main/java/org/apache/winegrower/scanner/StandaloneScanner.java
index 8505805..9b3cfb2 100644
---
a/winegrower-core/src/main/java/org/apache/winegrower/scanner/StandaloneScanner.java
+++
b/winegrower-core/src/main/java/org/apache/winegrower/scanner/StandaloneScanner.java
@@ -40,6 +40,7 @@ import java.util.jar.Manifest;
import java.util.stream.Stream;
import org.apache.winegrower.Ripener;
+import org.apache.winegrower.scanner.manifest.ManifestContributor;
import org.apache.winegrower.scanner.manifest.ManifestCreator;
import org.apache.xbean.finder.AnnotationFinder;
import org.apache.xbean.finder.ClassLoaders;
@@ -192,7 +193,7 @@ public class StandaloneScanner {
}
private Manifest tryLoadManifest(final Archive archive, final String name)
{
-final AnnotationFinder archiveFinder = new AnnotationFinder(archive,
false);
+final AnnotationFinder archiveFinder = new
ManifestContributor.WinegrowerAnnotationFinder(archive, false);
final ManifestCreator manifestCreator = new ManifestCreator(name);
configuration.getManifestContributors()
.forEach(c -> c.contribute(archiveFinder, manifestCreator));
diff --git
a/winegrower-core/src/main/java/org/apache/winegrower/scanner/manifest/HeaderManifestContributor.java
b/winegrower-core/src/main/java/org/apache/winegrower/scanner/manifest/HeaderManifestContributor.java
index cae4442..ef1ef5d 100644
---
a/winegrower-core/src/main/java/org/apache/winegrower/scanner/manifest/HeaderManifestContributor.java
+++
b/winegrower-core/src/main/java/org/apache/winegrower/scanner/manifest/HeaderManifestContributor.java
@@ -13,14 +13,12 @@
*/
package org.apache.winegrower.scanner.manifest;
-import static java.util.stream.Collectors.toMap;
-import static org.apache.xbean.asm8.ClassReader.SKIP_CODE;
-import static org.apache.xbean.asm8.ClassReader.SKIP_DEBUG;
-import static org.apache.xbean.asm8.ClassReader.SKIP_FRAMES;
-import static org.apache.xbean.asm8.Opcodes.ASM8;
+import org.apache.xbean.asm8.AnnotationVisitor;
+import org.apache.xbean.asm8.ClassReader;
+import org.apache.xbean.asm8.ClassVisitor;
+import org.apache.xbean.finder.AnnotationFinder;
import java.io.InputStream;
-import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -31,10 +29,11 @@ import java.util.function.Supplier;
import java.util.jar.Manifest;
import java.util.stream.Stream;
-import org.apache.xbean.asm8.AnnotationVisitor;
-import org.apache.xbean.asm8.ClassReader;
-import org.apache.xbean.asm8.ClassVisitor;
-import org.apache.xbean.finder.AnnotationFinder;
+import static java.util.stream.Collectors.toMap;
+import static org.apache.xbean.asm8.ClassReader.SKIP_CODE;
+import static org.apache.xbean.asm8.ClassReader.SKIP_DEBUG;
+import static org.apache.xbean.asm8.ClassReader.SKIP_FRAMES;
+import static org.apache.xbean.asm8.Opcodes.ASM8;
public class HeaderManifestContributor implements ManifestContributor {
@@ -44,13 +43,9 @@ public class HeaderManifestContributor implements
ManifestContributor {
final List> headerClasses;
final List> headersClasses;
try {
-final Class headerAnnotation = (Class)
-loader.loadClass("org.osgi.annotation.bundle.Header");
-final Class headersAnnotation = (Class)
-loader.loadClass("org.osgi.annotation.bundle.Headers");
-
-headerClasses = finder.findAnnotatedClasses(headerAnnotation);
-headersClasses = finder.findAnnotatedClasses(headersAnnotation);
+final WinegrowerAnnotationFinder waf
[karaf] branch karaf-4.2.x updated: [KARAF-6547] Upgrade to Felix Utils 1.11.4
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new eae4f9a [KARAF-6547] Upgrade to Felix Utils 1.11.4
eae4f9a is described below
commit eae4f9a6c7f57486aecb086c1786758fc5ea91cb
Author: jbonofre
AuthorDate: Fri Sep 18 15:16:02 2020 +0200
[KARAF-6547] Upgrade to Felix Utils 1.11.4
(cherry picked from commit 60be2de84440a83f52e72f8918f030995f631711)
---
.../org/apache/karaf/features/internal/service/Deployer.java | 9 +
.../apache/karaf/features/internal/support/TestBundle.java| 11 ++-
pom.xml | 2 +-
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git
a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
index 6bfc203..2693cc5 100644
---
a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
+++
b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
@@ -1384,14 +1384,7 @@ public class Deployer {
// Compute the list of resources to deploy in the region
Set bundlesInRegion = bundlesPerRegions.get(region);
-//
**
-// KARAF-6239: workaround to avoid several entries for the same
resource
-Map deduplicatedMap = new HashMap<>();
-for (Resource resource : bundlesInRegion) {
-deduplicatedMap.put(getSymbolicName(resource) + "/" +
getVersion(resource), resource);
-}
-List toDeploy = new
ArrayList<>(deduplicatedMap.values());
-//
**
+List toDeploy = bundlesInRegion != null ? new
ArrayList<>(bundlesInRegion) : new ArrayList<>();
// Remove the system bundle
Bundle systemBundle = dstate.bundles.get(0l);
diff --git
a/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundle.java
b/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundle.java
index 3906da6..60afe2e 100644
---
a/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundle.java
+++
b/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundle.java
@@ -21,11 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.security.cert.X509Certificate;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import org.apache.felix.utils.resource.ResourceBuilder;
import org.apache.felix.utils.resource.ResourceImpl;
@@ -241,6 +237,11 @@ public class TestBundle extends ResourceImpl implements
BundleRevision, Bundle,
}
@Override
+public int hashCode() {
+return Objects.hash(location);
+}
+
+@Override
public int getStartLevel() {
return 0;
}
diff --git a/pom.xml b/pom.xml
index eba179a..e1fff07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,7 +201,7 @@
4.0.20
1.0.6
5.1.1
-1.11.2
+1.11.4
4.5.4
3.3.0
1.0.10
[karaf] branch master updated: [KARAF-6547] Upgrade to Felix Utils 1.11.4
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 60be2de [KARAF-6547] Upgrade to Felix Utils 1.11.4
new 44b36af Merge pull request #1014 from jbonofre/KARAF-6547
60be2de is described below
commit 60be2de84440a83f52e72f8918f030995f631711
Author: jbonofre
AuthorDate: Fri Sep 18 15:16:02 2020 +0200
[KARAF-6547] Upgrade to Felix Utils 1.11.4
---
.../org/apache/karaf/features/internal/service/Deployer.java | 9 +
.../apache/karaf/features/internal/support/TestBundle.java| 11 ++-
pom.xml | 2 +-
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git
a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
index 7447940..3205ffe 100644
---
a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
+++
b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
@@ -1381,14 +1381,7 @@ public class Deployer {
// Compute the list of resources to deploy in the region
Set bundlesInRegion = bundlesPerRegions.get(region);
-//
**
-// KARAF-6239: workaround to avoid several entries for the same
resource
-Map deduplicatedMap = new HashMap<>();
-for (Resource resource : bundlesInRegion) {
-deduplicatedMap.put(getSymbolicName(resource) + "/" +
getVersion(resource), resource);
-}
-List toDeploy = new
ArrayList<>(deduplicatedMap.values());
-//
**
+List toDeploy = bundlesInRegion != null ? new
ArrayList<>(bundlesInRegion) : new ArrayList<>();
// Remove the system bundle
Bundle systemBundle = dstate.bundles.get(0l);
diff --git
a/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundle.java
b/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundle.java
index 3906da6..60afe2e 100644
---
a/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundle.java
+++
b/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundle.java
@@ -21,11 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.security.cert.X509Certificate;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import org.apache.felix.utils.resource.ResourceBuilder;
import org.apache.felix.utils.resource.ResourceImpl;
@@ -241,6 +237,11 @@ public class TestBundle extends ResourceImpl implements
BundleRevision, Bundle,
}
@Override
+public int hashCode() {
+return Objects.hash(location);
+}
+
+@Override
public int getStartLevel() {
return 0;
}
diff --git a/pom.xml b/pom.xml
index 0e792b6..c2f987b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,7 +201,7 @@
4.0.20
1.0.6
5.1.1
-1.11.2
+1.11.4
4.5.4
3.3.0
1.0.10
[GitHub] [karaf] jbonofre merged pull request #1014: [KARAF-6547] Upgrade to Felix Utils 1.11.4
jbonofre merged pull request #1014: URL: https://github.com/apache/karaf/pull/1014 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [karaf] jbonofre merged pull request #1196: [KARAF-6843] Upgrade to Felix SCR 2.1.24
jbonofre merged pull request #1196: URL: https://github.com/apache/karaf/pull/1196 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[karaf] branch karaf-4.2.x updated: [KARAF-6843] Upgrade to Felix SCR 2.1.24
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch karaf-4.2.x in repository https://gitbox.apache.org/repos/asf/karaf.git The following commit(s) were added to refs/heads/karaf-4.2.x by this push: new edd269c [KARAF-6843] Upgrade to Felix SCR 2.1.24 new 8a2c73c Merge pull request #1197 from jbonofre/KARAF-6843-42 edd269c is described below commit edd269c4f526c6e6614b096f4ef185125cd3 Author: jbonofre AuthorDate: Sat Sep 19 16:34:54 2020 +0200 [KARAF-6843] Upgrade to Felix SCR 2.1.24 (cherry picked from commit 6d8c033626bb50affcd628ede353f4299d6310e5) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2d6527a..eba179a 100644 --- a/pom.xml +++ b/pom.xml @@ -209,7 +209,7 @@ 1.5.0 1.1.8 1.0.2 -2.1.20 +2.1.24 2.1.0 1.12.0 1.16.0
[GitHub] [karaf] jbonofre merged pull request #1197: [KARAF-6843] Upgrade to Felix SCR 2.1.24
jbonofre merged pull request #1197: URL: https://github.com/apache/karaf/pull/1197 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[karaf] branch master updated: [KARAF-6843] Upgrade to Felix SCR 2.1.24
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/karaf.git The following commit(s) were added to refs/heads/master by this push: new 6d8c033 [KARAF-6843] Upgrade to Felix SCR 2.1.24 new a45eb7b Merge pull request #1196 from jbonofre/KARAF-6843 6d8c033 is described below commit 6d8c033626bb50affcd628ede353f4299d6310e5 Author: jbonofre AuthorDate: Sat Sep 19 16:34:54 2020 +0200 [KARAF-6843] Upgrade to Felix SCR 2.1.24 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e792b6..ddaf480 100644 --- a/pom.xml +++ b/pom.xml @@ -209,7 +209,7 @@ 1.5.0 1.1.8 1.0.2 -2.1.22 +2.1.24 2.1.0 1.12.0 2.0.0
[BUILD-STABLE]: Job 'Karaf/karaf-runtime-jdk11/master [master] [31]'
BUILD-STABLE: Job 'Karaf/karaf-runtime-jdk11/master [master] [31]': Is back to normal.
[GitHub] [karaf] jbonofre opened a new pull request #1197: [KARAF-6843] Upgrade to Felix SCR 2.1.24
jbonofre opened a new pull request #1197: URL: https://github.com/apache/karaf/pull/1197 (cherry picked from commit 6d8c033626bb50affcd628ede353f4299d6310e5) 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [karaf] jbonofre opened a new pull request #1196: [KARAF-6843] Upgrade to Felix SCR 2.1.24
jbonofre opened a new pull request #1196: URL: https://github.com/apache/karaf/pull/1196 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[karaf] branch master updated: Cleanup unused activation specs bundle
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new fce8b0a Cleanup unused activation specs bundle
new 18f4a4e Merge pull request #1193 from jbonofre/ACTIVATION_CLEANUP
fce8b0a is described below
commit fce8b0a940d6781158ac8d046c635dadf14d23bd
Author: jbonofre
AuthorDate: Thu Sep 17 18:52:12 2020 +0200
Cleanup unused activation specs bundle
---
.../features/framework/src/main/feature/feature.xml | 1 -
assemblies/features/standard/pom.xml| 17 -
assemblies/features/static/src/main/feature/feature.xml | 2 --
etc/appended-resources/supplemental-models.xml | 11 ---
pom.xml | 5 -
5 files changed, 36 deletions(-)
diff --git a/assemblies/features/framework/src/main/feature/feature.xml
b/assemblies/features/framework/src/main/feature/feature.xml
index 7fcdbeb..493fc7b 100644
--- a/assemblies/features/framework/src/main/feature/feature.xml
+++ b/assemblies/features/framework/src/main/feature/feature.xml
@@ -38,7 +38,6 @@
mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix-spec.version}
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-spec.version}
diff --git a/assemblies/features/standard/pom.xml
b/assemblies/features/standard/pom.xml
index 7d42441..df47c89 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -148,23 +148,6 @@
provided
-
-
-org.apache.servicemix.specs
-
org.apache.servicemix.specs.activation-api-1.1
-provided
-
-
-${servlet.spec.groupId}
-${servlet.spec.artifactId}
-provided
-
-
-javax.mail
-mail
-provided
-
-
org.apache.felix
diff --git a/assemblies/features/static/src/main/feature/feature.xml
b/assemblies/features/static/src/main/feature/feature.xml
index 0e82d87..9ff34e7 100644
--- a/assemblies/features/static/src/main/feature/feature.xml
+++ b/assemblies/features/static/src/main/feature/feature.xml
@@ -25,7 +25,6 @@
mvn:org.fusesource.jansi/jansi/${jansi.version}
mvn:org.apache.karaf.services/org.apache.karaf.services.staticcm/${project.version}
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-spec.version}
@@ -34,7 +33,6 @@
mvn:org.ops4j.pax.logging/pax-logging-logback/${pax.logging.version}
mvn:org.apache.karaf.services/org.apache.karaf.services.staticcm/${project.version}
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-spec.version}
diff --git a/etc/appended-resources/supplemental-models.xml
b/etc/appended-resources/supplemental-models.xml
index 50f5bae..8c840d9 100644
--- a/etc/appended-resources/supplemental-models.xml
+++ b/etc/appended-resources/supplemental-models.xml
@@ -789,17 +789,6 @@
- org.apache.servicemix.specs
- org.apache.servicemix.specs.activation-api-1.1
- Apache ServiceMix Specs :: Activation 1.1
-
-The Apache Software Foundation
-http://www.apache.org/
-
-
-
-
-
org.apache.geronimo.specs
geronimo-j2ee-connector_1.5_spec
Apache Geronimo Specs :: J2EE Connector 1.5
diff --git a/pom.xml b/pom.xml
index 40a374f..0e792b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1366,11 +1366,6 @@
org.apache.servicemix.specs
-
org.apache.servicemix.specs.activation-api-1.1
-${servicemix-spec.version}
-
-
-org.apache.servicemix.specs
org.apache.servicemix.specs.activator
${servicemix-spec.version}
[GitHub] [karaf] jbonofre merged pull request #1193: Cleanup unused activation specs bundle
jbonofre merged pull request #1193: URL: https://github.com/apache/karaf/pull/1193 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
