You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2023/10/06 14:04:19 UTC

[brooklyn-dist] branch master updated (3f463ec -> e36f8b9)

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git


    from 3f463ec  tweaks for bump to CXF + karaf versions
     new c564d74  use newer maven
     new e36f8b9  log msg+levels tidyup

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.


Summary of changes:
 Dockerfile                                                       | 7 ++++---
 .../src/main/resources/resources/etc/org.ops4j.pax.logging.cfg   | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)


[brooklyn-dist] 02/02: log msg+levels tidyup

Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git

commit e36f8b9e55ac28a33ddc5e2dd59ff9e9da06f9aa
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Fri Oct 6 15:02:52 2023 +0100

    log msg+levels tidyup
---
 .../src/main/resources/resources/etc/org.ops4j.pax.logging.cfg   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/karaf/features/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg b/karaf/features/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
index 5fe0f46..c35e0a4 100644
--- a/karaf/features/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
+++ b/karaf/features/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
@@ -168,10 +168,16 @@ log4j2.logger.schmizz.level = WARN
 log4j2.logger.ServletContainerInitializerScanner.name = org.ops4j.pax.web.utils.ServletContainerInitializerScanner
 log4j2.logger.ServletContainerInitializerScanner.level = ERROR
 
+log4j2.logger.TldScanner.name = org.ops4j.pax.web.jsp.TldScanner
+log4j2.logger.TldScanner.level = WARN
+
 log4j2.logger.JettyFactoryImpl.name = org.ops4j.pax.web.service.jetty.internal.JettyFactoryImpl
 log4j2.logger.JettyFactoryImpl.level = ERROR
 
-# felix scr abuses this category for lots of its debug; might not be needed when new config in org.apache.felix.scr.ScrService.cfg is available
+log4j2.logger.CommandExtension.name = org.apache.karaf.shell.impl.action.osgi.CommandExtension
+log4j2.logger.CommandExtension.level = WARN
+
+# felix scr piggy-backs on this category for lots of its debug; might not be needed when new config in org.apache.felix.scr.ScrService.cfg is available
 log4j2.logger.UiMetadataConfigListener.name = org.apache.brooklyn.ui.modularity.metadata.registry.impl.UiMetadataConfigListener
 log4j2.logger.UiMetadataConfigListener.level = INFO
 
@@ -179,4 +185,3 @@ log4j2.logger.UiMetadataConfigListener.level = INFO
 #log4j2.logger.felix.name = org.apache.felix
 #log4j2.logger.felix.level = DEBUG
 
-


[brooklyn-dist] 01/02: use newer maven

Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git

commit c564d74167e96e53848ab2f2fb41504a9a011585
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Mon Dec 19 23:09:21 2022 +0000

    use newer maven
    
    align with brooklyn root project dockerfile
---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ca7afef..dd0bfc9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,14 +15,15 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM maven:3.5.2-jdk-8-alpine
+FROM maven:3.8.6-eclipse-temurin-8
 
 # Install necessary binaries to build brooklyn-dist
-RUN apk add --no-cache git rpm dpkg
+#RUN apk add --no-cache git rpm dpkg
+RUN apt-get update && apt-get install -y git rpm dpkg
 
 # Make sure the /var/tmp (for RPM build) is writable for all users
 RUN mkdir -p /var/tmp/ && chmod -R 777 /var/tmp/
 
 # Make sure the /var/maven is writable for all users
 RUN mkdir -p /var/maven/.m2/ && chmod -R 777 /var/maven/
-ENV MAVEN_CONFIG=/var/maven/.m2
\ No newline at end of file
+ENV MAVEN_CONFIG=/var/maven/.m2