From 49eab1646632dba3a6d992668db095b7d29ae07b Mon Sep 17 00:00:00 2001 From: Vishal Kadam Date: Tue, 14 Apr 2015 11:48:24 -0400 Subject: [PATCH 1/4] Beautified --- pom.xml | 370 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 186 insertions(+), 184 deletions(-) diff --git a/pom.xml b/pom.xml index 1dc589b..f59dfc0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,185 +1,187 @@ - - 4.0.0 - net.logstash.log4j - jsonevent-layout - jar - 1.8-SNAPSHOT - jsonevent-layout - Log4j pattern layout that conforms to the logstash json_event format - http://logstash.net - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - lusis - John E. Vincent - lusis.org+github.com@gmail.com - - - pyr - Pierre-Yves Ritschard - pyr@spootnik.org - - - - UTF-8 - UTF-8 - - - org.sonatype.oss - oss-parent - 7 - - - scm:git:git@github.com:git@github.com:logstash/log4j-jsonevent-layout.git - scm:git:git@github.com:logstash/log4j-jsonevent-layout.git - git@github.com:logstash/log4j-jsonevent-layout.git - - - - - - maven-assembly-plugin - 2.2.2 - - - uberjar - package - - single - - - - - - jar-with-dependencies - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - - - net.minidev - json-smart - 1.1.1 - - - log4j - log4j - 1.2.16 - provided - - - commons-lang - commons-lang - 2.6 - - - junit - junit - 4.8.1 - test - - - - - bundle - - - - org.apache.felix - maven-bundle-plugin - 2.3.7 - true - - - ${project.groupId}.${project.artifactId} - ${project.groupId}.${project.artifactId} - !* - org.ops4j.pax.logging.pax-logging-service;bundle-version="[1.6,1.7)" - *;scope=compile|runtime;inline=true - ${project.version} - - - - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + 4.0.0 + net.logstash.log4j + jsonevent-layout + jar + 1.8-SNAPSHOT + jsonevent-layout + Log4j pattern layout that conforms to the logstash json_event format + http://logstash.net + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + lusis + John E. Vincent + lusis.org+github.com@gmail.com + + + pyr + Pierre-Yves Ritschard + pyr@spootnik.org + + + + UTF-8 + UTF-8 + + + org.sonatype.oss + oss-parent + 7 + + + scm:git:git@github.com:git@github.com:logstash/log4j-jsonevent-layout.git + scm:git:git@github.com:logstash/log4j-jsonevent-layout.git + git@github.com:logstash/log4j-jsonevent-layout.git + + + + + + maven-assembly-plugin + 2.2.2 + + + uberjar + package + + single + + + + + + jar-with-dependencies + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + + + + net.minidev + json-smart + 1.1.1 + + + log4j + log4j + 1.2.16 + provided + + + commons-lang + commons-lang + 2.6 + + + junit + junit + 4.8.1 + test + + + + + bundle + + + + org.apache.felix + maven-bundle-plugin + 2.3.7 + true + + + ${project.groupId}.${project.artifactId} + ${project.groupId}.${project.artifactId} + !* + org.ops4j.pax.logging.pax-logging-service;bundle-version="[1.6,1.7)" + + *;scope=compile|runtime;inline=true + ${project.version} + + + + + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + From c9709d67f53ebe87f17f474863310c6153a214ae Mon Sep 17 00:00:00 2001 From: Vishal Kadam Date: Tue, 14 Apr 2015 11:50:39 -0400 Subject: [PATCH 2/4] Issue-54: Fixed OSGI bundle --- pom.xml | 180 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 97 insertions(+), 83 deletions(-) diff --git a/pom.xml b/pom.xml index f59dfc0..304b146 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.logstash.log4j jsonevent-layout - jar + bundle 1.8-SNAPSHOT jsonevent-layout Log4j pattern layout that conforms to the logstash json_event format @@ -41,64 +41,7 @@ scm:git:git@github.com:logstash/log4j-jsonevent-layout.git git@github.com:logstash/log4j-jsonevent-layout.git - - - - - maven-assembly-plugin - 2.2.2 - - - uberjar - package - - single - - - - - - jar-with-dependencies - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - + net.minidev json-smart @@ -123,30 +66,6 @@ - - bundle - - - - org.apache.felix - maven-bundle-plugin - 2.3.7 - true - - - ${project.groupId}.${project.artifactId} - ${project.groupId}.${project.artifactId} - !* - org.ops4j.pax.logging.pax-logging-service;bundle-version="[1.6,1.7)" - - *;scope=compile|runtime;inline=true - ${project.version} - - - - - - release-sign-artifacts @@ -174,6 +93,101 @@ + + + + + org.apache.felix + maven-bundle-plugin + 2.3.7 + + + maven-assembly-plugin + 2.2.2 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + ${project.groupId}.${project.artifactId} + !* + org.ops4j.pax.logging.pax-logging-service;bundle-version="[1.6,1.7)" + + *;scope=compile|runtime;inline=true + ${project.version} + + + + + maven-assembly-plugin + + + uberjar + package + + single + + + + + + jar-with-dependencies + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + ossrh From 0afc31f66b1957429bdfc8e4e3612c042196bb57 Mon Sep 17 00:00:00 2001 From: Vishal Kadam Date: Tue, 14 Apr 2015 11:54:39 -0400 Subject: [PATCH 3/4] Fixed plugin version's warning --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 304b146..4ac8360 100644 --- a/pom.xml +++ b/pom.xml @@ -113,10 +113,12 @@ org.apache.maven.plugins maven-source-plugin + 2.4 org.apache.maven.plugins maven-javadoc-plugin + 2.10.3 From 87f87b11deefe7e40ded4339002526e59c4de8c6 Mon Sep 17 00:00:00 2001 From: Vishal Kadam Date: Tue, 14 Apr 2015 12:33:27 -0400 Subject: [PATCH 4/4] Supported minor version for pax-logging-service bundle --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4ac8360..e60cfce 100644 --- a/pom.xml +++ b/pom.xml @@ -132,8 +132,7 @@ ${project.groupId}.${project.artifactId} ${project.groupId}.${project.artifactId} !* - org.ops4j.pax.logging.pax-logging-service;bundle-version="[1.6,1.7)" - + org.ops4j.pax.logging.pax-logging-service;bundle-version="[1.6,1.8)" *;scope=compile|runtime;inline=true ${project.version}