[jaxb~v2:36134e71] Mavenization fixes

  • From: yaroska@...
  • To: commits@...
  • Subject: [jaxb~v2:36134e71] Mavenization fixes
  • Date: Fri, 3 May 2013 12:29:08 +0000

Project:    jaxb
Repository: v2
Revision:   36134e71020c960875f3b14d63bb5093d1a4b081
Author:     yaroska
Date:       2013-05-03 12:26:17 UTC
Link:       

Log Message:
------------
Mavenization fixes



Revisions:
----------
36134e71020c960875f3b14d63bb5093d1a4b081


Modified Paths:
---------------
jaxb-ri/boms/bom-ext/pom.xml
jaxb-ri/boms/bom/pom.xml
jaxb-ri/bundles/core/pom.xml
jaxb-ri/bundles/jxc/pom.xml
jaxb-ri/bundles/osgi/extra/pom.xml
jaxb-ri/bundles/osgi/osgi/pom.xml
jaxb-ri/bundles/osgi/osgi/src/main/assembly/assembly.xml
jaxb-ri/bundles/osgi/pom.xml
jaxb-ri/bundles/pom.xml
jaxb-ri/bundles/ri/pom.xml
jaxb-ri/bundles/runtime/pom.xml
jaxb-ri/bundles/xjc/pom.xml
jaxb-ri/core/pom.xml
jaxb-ri/docs/pom.xml
jaxb-ri/docs/release-documentation/pom.xml
jaxb-ri/docs/www/pom.xml
jaxb-ri/jxc/pom.xml
jaxb-ri/pom.xml
jaxb-ri/runtime/impl/pom.xml
jaxb-ri/runtime/jaxb1/pom.xml
jaxb-ri/runtime/pom.xml
jaxb-ri/samples/pom.xml
jaxb-ri/xjc/pom.xml


Diffs:
------
--- a/jaxb-ri/boms/bom-ext/pom.xml
+++ b/jaxb-ri/boms/bom-ext/pom.xml
@@ -46,12 +46,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.sun.xml.bind</groupId>
+        <groupId>org.glassfish.jaxb</groupId>
         <artifactId>jaxb-bom</artifactId>
-        <relativePath/>
-        <version>2.2.7-SNAPSHOT</version>
+        <relativePath>../bom/pom.xml</relativePath>
+        <version>2.2.8-SNAPSHOT</version>
     </parent>
 
+    <groupId>com.sun.xml.bind</groupId>
     <artifactId>jaxb-bom-ext</artifactId>
 
     <packaging>pom</packaging>--- a/jaxb-ri/boms/bom/pom.xml
+++ b/jaxb-ri/boms/bom/pom.xml
@@ -52,9 +52,9 @@
         <relativePath/>
     </parent>
 
-    <groupId>com.sun.xml.bind</groupId>
+    <groupId>org.glassfish.jaxb</groupId>
     <artifactId>jaxb-bom</artifactId>
-    <version>2.2.7-SNAPSHOT</version>
+    <version>2.2.8-SNAPSHOT</version>
 
     <packaging>pom</packaging>
     <name>JAXB BOM</name>--- a/jaxb-ri/bundles/core/pom.xml
+++ b/jaxb-ri/bundles/core/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 --- a/jaxb-ri/bundles/jxc/pom.xml
+++ b/jaxb-ri/bundles/jxc/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -82,11 +82,9 @@ holder.
                         <configuration>
                             <artifactSet>
                                 <excludes>
-                                    
<exclude>com.sun.xml.bind.jaxb:jaxb-core</exclude>
-                                    
<exclude>com.sun.xml.bind.jaxb:jaxb-xjc</exclude>
-                                    
<exclude>com.sun.xml.bind.jaxb.runtime:jaxb-runtime-impl</exclude>
-                                    
<exclude>com.sun.xml.bind.jaxb.runtime:jaxb-runtime-fi</exclude>
-                                    
<exclude>com.sun.xml.bind.jaxb.runtime:jaxb-runtime-staxex</exclude>
+                                    
<exclude>org.glassfish.jaxb:jaxb-core</exclude>
+                                    
<exclude>org.glassfish.jaxb:jaxb-xjc</exclude>
+                                    
<exclude>org.glassfish.jaxb:jaxb-runtime</exclude>
                                     
<exclude>javax.xml.bind:jaxb-api</exclude>
 
                                     <exclude>com.sun.xsom:xsom</exclude>--- 
a/jaxb-ri/bundles/osgi/extra/pom.xml
+++ b/jaxb-ri/bundles/osgi/extra/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 --- a/jaxb-ri/bundles/osgi/osgi/pom.xml
+++ b/jaxb-ri/bundles/osgi/osgi/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -73,7 +73,6 @@ holder.
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
             <optional>true</optional>
-            <type>pom</type> <!--todo: remove?-->
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
@@ -81,8 +80,9 @@ holder.
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind.jaxb.runtime</groupId>
-            <artifactId>jaxb1-runtime</artifactId>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb1-impl</artifactId>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>--- 
a/jaxb-ri/bundles/osgi/osgi/src/main/assembly/assembly.xml
+++ b/jaxb-ri/bundles/osgi/osgi/src/main/assembly/assembly.xml
@@ -62,11 +62,11 @@
             <directoryMode>0755</directoryMode>
             <fileMode>0644</fileMode>
             <includes>
-                <include>com.sun.xml.bind.jaxb:jaxb-core</include>
-                <include>com.sun.xml.bind.jaxb:jaxb-xjc</include>
-                <include>com.sun.xml.bind.jaxb:jaxb-runtime</include>
-                <include>com.sun.xml.bind.jaxb:jaxb-jxc</include>
-                
<include>com.sun.xml.bind.jaxb.runtime:jaxb1-runtime</include>
+                <include>org.glassfish.jaxb:jaxb-core</include>
+                <include>org.glassfish.jaxb:jaxb-xjc</include>
+                <include>org.glassfish.jaxb:jaxb-runtime</include>
+                <include>org.glassfish.jaxb:jaxb-jxc</include>
+                <include>com.sun.xml.bind:jaxb1-impl</include>
             </includes>
             <excludes>
                 <exclude>javax.xml.bind:jaxb-api</exclude>--- 
a/jaxb-ri/bundles/osgi/pom.xml
+++ b/jaxb-ri/bundles/osgi/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 --- a/jaxb-ri/bundles/pom.xml
+++ b/jaxb-ri/bundles/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>jaxb-bundles</artifactId>--- a/jaxb-ri/bundles/ri/pom.xml
+++ b/jaxb-ri/bundles/ri/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -87,6 +87,7 @@ holder.
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-release-documentation</artifactId>
+            <version>${project.version}</version>
             <type>zip</type>
             <classifier>docbook</classifier>
             <optional>true</optional>
@@ -94,6 +95,7 @@ holder.
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-samples</artifactId>
+            <version>${project.version}</version>
             <type>zip</type>
             <optional>true</optional>
         </dependency>--- a/jaxb-ri/bundles/runtime/pom.xml
+++ b/jaxb-ri/bundles/runtime/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -80,7 +80,7 @@ holder.
                             <artifactSet>
                                 <excludes>
                                     
<exclude>javax.xml.bind:jaxb-api</exclude>
-                                    
<exclude>com.sun.xml.bind.jaxb:jaxb-core</exclude>
+                                    
<exclude>org.glassfish.jaxb:jaxb-core</exclude>
                                     
<exclude>javax.xml.stream:stax-api</exclude>
                                     
<exclude>relaxngDatatype:relaxngDatatype</exclude>
                                     
<exclude>com.sun.xml.fastinfoset:FastInfoset</exclude>--- 
a/jaxb-ri/bundles/xjc/pom.xml
+++ b/jaxb-ri/bundles/xjc/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -83,7 +83,7 @@ holder.
                         <configuration>
                             <artifactSet>
                                 <excludes>
-                                    
<exclude>com.sun.xml.bind.jaxb:jaxb-core</exclude>
+                                    
<exclude>org.glassfish.jaxb:jaxb-core</exclude>
                                     
<exclude>javax.xml.bind:jaxb-api</exclude>
                                     <exclude>com.sun.xml.txw2:txw2</exclude>
                                     
<exclude>javax.xml.stream:stax-api</exclude>--- a/jaxb-ri/core/pom.xml
+++ b/jaxb-ri/core/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.jaxb</groupId>--- a/jaxb-ri/docs/pom.xml
+++ b/jaxb-ri/docs/pom.xml
@@ -49,7 +49,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>jaxb-docs-parent</artifactId>--- 
a/jaxb-ri/docs/release-documentation/pom.xml
+++ b/jaxb-ri/docs/release-documentation/pom.xml
@@ -49,7 +49,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-docs-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
     </parent>
 
     <groupId>com.sun.xml.bind</groupId>--- a/jaxb-ri/docs/www/pom.xml
+++ b/jaxb-ri/docs/www/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-docs-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>jaxb-www</artifactId>--- a/jaxb-ri/jxc/pom.xml
+++ b/jaxb-ri/jxc/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.jaxb</groupId>--- a/jaxb-ri/pom.xml
+++ b/jaxb-ri/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-bom-ext</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>boms/bom-ext/pom.xml</relativePath>
     </parent>
 
@@ -141,6 +141,9 @@ holder.
     <properties>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
         
<javadoc.links.dir>${project.parent.basedir}/tools/javadoc-link</javadoc.links.dir>
+        <findbugs.skip>false</findbugs.skip>
+        <findbugs.threshold>High</findbugs.threshold>
+        <findbugs.exclude />
     </properties>
 
     <build>
@@ -190,9 +193,7 @@ holder.
                                 
<Implementation-Vendor>Oracle</Implementation-Vendor>
                                 
<Implementation-Vendor-Id>com.oracle</Implementation-Vendor-Id>
                                 <Build-Id>${project.version}</Build-Id>
-                                <!--TODO: remove SVN-->
-                                <SVN-Revision>${buildNumber}</SVN-Revision>
-                                <SVN-URL>${project.scm.connection}</SVN-URL>
+                                <!--TODO: add GIT revision-->
                                 <Build-Version>JAXB RI 
${project.version}</Build-Version>
                                 
<Major-Version>${project.osgi.version}</Major-Version>
                             </manifestEntries>
@@ -248,8 +249,7 @@ holder.
                                 
<Implementation-Vendor>Oracle</Implementation-Vendor>
                                 
<Implementation-Vendor-Id>com.oracle</Implementation-Vendor-Id>
                                 <Build-Id>${project.version}</Build-Id>
-                                <SVN-Revision>${buildNumber}</SVN-Revision>
-                                <SVN-URL>${project.scm.connection}</SVN-URL>
+                                <!--todo: add git revision-->
                                 <Build-Version>JAXB RI 
${project.version}</Build-Version>
                                 
<Major-Version>${project.osgi.version}</Major-Version>
                             </manifestEntries>
@@ -269,8 +269,7 @@ holder.
                                 
<Implementation-Vendor>Oracle</Implementation-Vendor>
                                 
<Implementation-Vendor-Id>com.oracle</Implementation-Vendor-Id>
                                 <Build-Id>${project.version}</Build-Id>
-                                <SVN-Revision>${buildNumber}</SVN-Revision>
-                                <SVN-URL>${project.scm.connection}</SVN-URL>
+                                <!--todo: add git revision-->
                                 <Build-Version>JAXB RI 
${project.version}</Build-Version>
                                 
<Major-Version>${project.osgi.version}</Major-Version>
                             </manifestEntries>
@@ -369,6 +368,23 @@ holder.
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <reportPlugins>
+                        <plugin>
+                            <groupId>org.codehaus.mojo</groupId>
+                            <artifactId>findbugs-maven-plugin</artifactId>
+                            <configuration>
+                                <skip>${findbugs.skip}</skip>
+                                <threshold>${findbugs.threshold}</threshold>
+                                
<excludeFilterFile>${findbugs.exclude}</excludeFilterFile>
+                            </configuration>
+                        </plugin>
+                    </reportPlugins>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 --- a/jaxb-ri/runtime/impl/pom.xml
+++ b/jaxb-ri/runtime/impl/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 --- a/jaxb-ri/runtime/jaxb1/pom.xml
+++ b/jaxb-ri/runtime/jaxb1/pom.xml
@@ -47,12 +47,12 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <groupId>com.sun.xml.bind.jaxb.runtime</groupId>
-    <artifactId>jaxb1-runtime</artifactId>
+    <groupId>com.sun.xml.bind</groupId>
+    <artifactId>jaxb1-impl</artifactId>
 
     <packaging>jar</packaging>
     <name>JAXB1 Runtime</name>
@@ -60,8 +60,8 @@ holder.
 
     <dependencies>
         <dependency>
-            <groupId>com.sun.xml.bind.jaxb.runtime</groupId>
-            <artifactId>jaxb-runtime-impl</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
         </dependency>
         <dependency>
             <groupId>net.java.dev.msv</groupId>--- a/jaxb-ri/runtime/pom.xml
+++ b/jaxb-ri/runtime/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>jaxb-runtime-parent</artifactId>--- a/jaxb-ri/samples/pom.xml
+++ b/jaxb-ri/samples/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
     </parent>
 
     <groupId>com.sun.xml.bind</groupId>--- a/jaxb-ri/xjc/pom.xml
+++ b/jaxb-ri/xjc/pom.xml
@@ -47,7 +47,7 @@ holder.
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.jaxb</groupId>





[jaxb~v2:36134e71] Mavenization fixes

yaroska 05/03/2013
Terms of Use; Privacy Policy; Copyright ©2013-2016 (revision 20151030.c1dd42a)
 
 
Close
loading
Please Confirm
Close