You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gg...@apache.org on 2019/01/08 14:40:19 UTC

[karaf] branch master updated (138f617 -> 80d4a7f)

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

ggrzybek pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git.


    from 138f617  Merge pull request #712 from jbonofre/KARAF-6069
     new 48dc8e6  [KARAF-6005][KARAF-6079] Upgrade to pax-url 2.6.1
     new 80d4a7f  [build] Experimentally attach consistency report in "consistency" profile

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:
 assemblies/apache-karaf/pom.xml | 62 +++++++++++++++++++++++++++++++++++++++++
 pom.xml                         |  2 +-
 2 files changed, 63 insertions(+), 1 deletion(-)


[karaf] 01/02: [KARAF-6005][KARAF-6079] Upgrade to pax-url 2.6.1

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

ggrzybek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git

commit 48dc8e65ef173757e6e23af5459d739f30242f45
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Tue Jan 8 15:29:08 2019 +0100

    [KARAF-6005][KARAF-6079] Upgrade to pax-url 2.6.1
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7219aba..363cefb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,7 +282,7 @@
         <pax.logging.version>1.10.1</pax.logging.version>
         <pax.base.version>1.5.0</pax.base.version>
         <pax.swissbox.version>1.8.3</pax.swissbox.version>
-        <pax.url.version>2.5.4</pax.url.version>
+        <pax.url.version>2.6.1</pax.url.version>
         <pax.web.version>7.2.5</pax.web.version>
         <pax.tinybundle.version>3.0.0</pax.tinybundle.version>
         <pax.jdbc.version>1.3.1</pax.jdbc.version>


[karaf] 02/02: [build] Experimentally attach consistency report in "consistency" profile

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

ggrzybek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git

commit 80d4a7fcf126d8dd33f365c0b32bb93550c2f2e3
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Tue Jan 8 15:40:05 2019 +0100

    [build] Experimentally attach consistency report in "consistency" profile
---
 assemblies/apache-karaf/pom.xml | 62 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml
index c58a09b..e4bd2da 100644
--- a/assemblies/apache-karaf/pom.xml
+++ b/assemblies/apache-karaf/pom.xml
@@ -160,6 +160,7 @@
                     <libraries>
                     </libraries>
                     <javase>1.8</javase>
+                    <generateConsistencyReport>${project.build.directory}</generateConsistencyReport>
                 </configuration>
             </plugin>
         </plugins>
@@ -191,6 +192,67 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>consistency</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.google.code.maven-replacer-plugin</groupId>
+                        <artifactId>replacer</artifactId>
+                        <version>1.5.3</version>
+                        <executions>
+                            <execution>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>replace</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <filesToInclude>${project.build.directory}/bundle-report*.xml</filesToInclude>
+                            <replacements>
+                                <replacement>
+                                    <token>href="bundle-report.xslt"</token>
+                                    <value>href="${project.artifactId}-${project.version}-bundle-report.xslt"</value>
+                                </replacement>
+                            </replacements>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-artifacts</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attach-artifact</goal>
+                                </goals>
+                                <configuration>
+                                    <artifacts>
+                                        <artifact>
+                                            <file>${project.build.directory}/bundle-report.xml</file>
+                                            <classifier>bundle-report</classifier>
+                                            <type>xml</type>
+                                        </artifact>
+                                        <artifact>
+                                            <file>${project.build.directory}/bundle-report-full.xml</file>
+                                            <classifier>bundle-report-full</classifier>
+                                            <type>xml</type>
+                                        </artifact>
+                                        <artifact>
+                                            <file>${project.build.directory}/bundle-report.xslt</file>
+                                            <classifier>bundle-report</classifier>
+                                            <type>xslt</type>
+                                        </artifact>
+                                    </artifacts>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>