Skip to main content

[glassfish~svn:62081] integrate metro-2.3.1-b104

  • From: jungicz@...
  • To: commits@...
  • Subject: [glassfish~svn:62081] integrate metro-2.3.1-b104
  • Date: Thu, 23 May 2013 11:28:06 +0000

Project:    glassfish
Repository: svn
Revision:   62081
Author:     jungicz
Date:       2013-05-23 11:28:04 UTC
Link:       

Log Message:
------------
integrate metro-2.3.1-b104


Revisions:
----------
62081


Modified Paths:
---------------
trunk/main/appserver/packager/metro/pom.xml
trunk/main/appserver/packager/pkg-bootstrap
trunk/main/nucleus/pom.xml
trunk/main/appserver/packager/resources/pkg_conf.py
trunk/main/appserver/javaee-api/javax.javaee-api/pom.xml
trunk/main/appserver/security/webservices.security/pom.xml
trunk/main/appserver/extras/embedded/shell/fixup.xml
trunk/main/appserver/appclient/client/acc-standalone/fixup.xml
trunk/main/appserver/extras/javaee/manifest-jar/pom.xml
trunk/main/appserver/webservices/jsr109-impl/pom.xml
trunk/main/appserver/javaee-api/javax.javaee-endorsed-api/pom.xml
trunk/main/appserver/pom.xml
trunk/main/appserver/packager/metro/src/main/assembly/metro.xml
trunk/main/appserver/appclient/client/acc/pom.xml


Diffs:
------
Index: trunk/main/nucleus/pom.xml
===================================================================
--- trunk/main/nucleus/pom.xml  (revision 62080)
+++ trunk/main/nucleus/pom.xml  (revision 62081)
@@ -144,7 +144,7 @@
         <jettison.version>1.3.3</jettison.version>
         <guava.version>14.0</guava.version>
         <jax-rs-api.version>2.0</jax-rs-api.version>
-        <mimepull.version>1.9.1</mimepull.version>
+        <mimepull.version>1.9.3</mimepull.version>
         <jbi.version>1.0</jbi.version>
         
<glassfish-management-api.version>3.2.0-b001</glassfish-management-api.version>
         <btrace.version>1.0.5</btrace.version>
Index: trunk/main/appserver/packager/metro/src/main/assembly/metro.xml
===================================================================
--- trunk/main/appserver/packager/metro/src/main/assembly/metro.xml     
(revision 62080)
+++ trunk/main/appserver/packager/metro/src/main/assembly/metro.xml     
(revision 62081)
@@ -54,7 +54,7 @@
         <fileSet>
             <directory>${temp.dir}/glassfish</directory>
             <excludes>
-                <exclude>modules/jaxb-api-osgi.jar</exclude>
+                <exclude>modules/jaxb-api.jar</exclude>
                 <exclude>modules/webservices-api-osgi.jar</exclude>
             </excludes>
             <outputDirectory>${install.dir.name}/glassfish</outputDirectory>
@@ -62,10 +62,10 @@
         <fileSet>
             <directory>${temp.dir}/glassfish/modules</directory>
             <includes>
-                <include>jaxb-api-osgi.jar</include>
+                <include>jaxb-api.jar</include>
                 <include>webservices-api-osgi.jar</include>
             </includes>
             
<outputDirectory>${install.dir.name}/glassfish/modules/endorsed</outputDirectory>
         </fileSet>
     </fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Index: trunk/main/appserver/packager/metro/pom.xml
===================================================================
--- trunk/main/appserver/packager/metro/pom.xml (revision 62080)
+++ trunk/main/appserver/packager/metro/pom.xml (revision 62081)
@@ -155,7 +155,7 @@
         </dependency>
         <dependency>
            <groupId>javax.xml.bind</groupId>
-           <artifactId>jaxb-api-osgi</artifactId>
+           <artifactId>jaxb-api</artifactId>
         </dependency>
         <dependency>
            <groupId>org.codehaus.woodstox</groupId>
Index: trunk/main/appserver/packager/pkg-bootstrap
===================================================================
--- trunk/main/appserver/packager/pkg-bootstrap (revision 62080)
+++ trunk/main/appserver/packager/pkg-bootstrap (revision 62081)

Property changes on: trunk/main/appserver/packager/pkg-bootstrap
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+target
Index: trunk/main/appserver/packager/resources/pkg_conf.py
===================================================================
--- trunk/main/appserver/packager/resources/pkg_conf.py (revision 62080)
+++ trunk/main/appserver/packager/resources/pkg_conf.py (revision 62081)
@@ -65,7 +65,7 @@
 corba_version="4.0.0,0-4"
 jsf_version="2.2.0,0-15"
 grizzly_version="2.3,0-13"
-metro_version="2.3,0-259"
+metro_version="2.3.1,0-104"
 javahelp_version="2.0.2,0-1"
 shoal_version="1.6.18,0-0"
 
Index: trunk/main/appserver/appclient/client/acc/pom.xml
===================================================================
--- trunk/main/appserver/appclient/client/acc/pom.xml   (revision 62080)
+++ trunk/main/appserver/appclient/client/acc/pom.xml   (revision 62081)
@@ -384,10 +384,10 @@
          <artifactId>javax.annotation-api</artifactId>
      </dependency>
 
-     <!-- endorsed: jaxb-api-osgi.jar -->
+     <!-- endorsed: jaxb-api.jar -->
      <dependency>
          <groupId>javax.xml.bind</groupId>
-         <artifactId>jaxb-api-osgi</artifactId>
+         <artifactId>jaxb-api</artifactId>
      </dependency>
 
      <dependency>
Index: trunk/main/appserver/appclient/client/acc-standalone/fixup.xml
===================================================================
--- trunk/main/appserver/appclient/client/acc-standalone/fixup.xml      
(revision 62080)
+++ trunk/main/appserver/appclient/client/acc-standalone/fixup.xml      
(revision 62081)
@@ -79,7 +79,7 @@
                  endorsed subdirectory with ../modules/endorsed/x.jar        
        -->
 
             <replacefilter token="../modules/javax.annotation-api.jar" 
value="../modules/endorsed/javax.annotation-api.jar"/>
-            <replacefilter token="../modules/jaxb-api-osgi.jar" 
value="../modules/endorsed/jaxb-api-osgi.jar"/>
+            <replacefilter token="../modules/jaxb-api.jar" 
value="../modules/endorsed/jaxb-api.jar"/>
             <replacefilter token="../modules/webservices-api-osgi.jar" 
value="../modules/endorsed/webservices-api-osgi.jar"/>
             <replacefilter token="../modules/weld-se-core.jar" 
value="../lib/appclient/weld-se-core.jar"/>
 
Index: trunk/main/appserver/pom.xml
===================================================================
--- trunk/main/appserver/pom.xml        (revision 62080)
+++ trunk/main/appserver/pom.xml        (revision 62081)
@@ -102,11 +102,11 @@
         <jsftemplating.version>2.1.0</jsftemplating.version>
         <uc-pkg-client.version>1.122-56.2852</uc-pkg-client.version>
         <uc-pkg-bootstrap.version>1.122-56.2852</uc-pkg-bootstrap.version>
-        <webservices.version>2.3</webservices.version>
+        <webservices.version>2.3.1-b104</webservices.version>
         <jsr181-api.version>1.0-MR1</jsr181-api.version>
         <woodstox.version>4.1.2</woodstox.version>
-        <jaxb-api.version>2.2.7</jaxb-api.version>
-        <jaxb.version>2.2.7</jaxb.version>
+        <jaxb-api.version>2.2.9</jaxb-api.version>
+        <jaxb.version>2.2.8-b01</jaxb.version>
         <stax2-api.version>3.1.1</stax2-api.version>
         
<javax.xml.registry-api.version>1.0.5</javax.xml.registry-api.version>
         <eclipselink.version>2.5.0-RC2</eclipselink.version>
@@ -128,7 +128,7 @@
         <javax.batch-api.version>1.0</javax.batch-api.version>
         
<com.ibm.jbatch-runtime-all.version>1.0</com.ibm.jbatch-runtime-all.version>
         <com.ibm.jbatch-ri-spi.version>1.0</com.ibm.jbatch-ri-spi.version>
-       <javax.xml.soap-api.version>1.3.5</javax.xml.soap-api.version>
+       <javax.xml.soap-api.version>1.3.6</javax.xml.soap-api.version>
        
<javax.management.j2ee-api.version>1.1.1</javax.management.j2ee-api.version>
     </properties>
 
@@ -636,7 +636,7 @@
             </dependency>
             <dependency>
                 <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api-osgi</artifactId>
+                <artifactId>jaxb-api</artifactId>
                 <version>${jaxb-api.version}</version>
             </dependency>
            <dependency>
Index: trunk/main/appserver/security/webservices.security/pom.xml
===================================================================
--- trunk/main/appserver/security/webservices.security/pom.xml  (revision 
62080)
+++ trunk/main/appserver/security/webservices.security/pom.xml  (revision 
62081)
@@ -126,7 +126,7 @@
         </dependency>
         <dependency>
            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api-osgi</artifactId>
+           <artifactId>jaxb-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.security</groupId>
Index: trunk/main/appserver/webservices/jsr109-impl/pom.xml
===================================================================
--- trunk/main/appserver/webservices/jsr109-impl/pom.xml        (revision 
62080)
+++ trunk/main/appserver/webservices/jsr109-impl/pom.xml        (revision 
62081)
@@ -74,7 +74,7 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>javax.xml.bind</groupId>
-                                    <artifactId>jaxb-api-osgi</artifactId>
+                                    <artifactId>jaxb-api</artifactId>
                                     
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
                                     <version>${jaxb-api.version}</version>
                                 </artifactItem>
@@ -160,7 +160,7 @@
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api-osgi</artifactId>
+           <artifactId>jaxb-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.ejb</groupId>
Index: trunk/main/appserver/javaee-api/javax.javaee-api/pom.xml
===================================================================
--- trunk/main/appserver/javaee-api/javax.javaee-api/pom.xml    (revision 
62080)
+++ trunk/main/appserver/javaee-api/javax.javaee-api/pom.xml    (revision 
62081)
@@ -168,7 +168,7 @@
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api-osgi</artifactId>
+            <artifactId>jaxb-api</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
Index: trunk/main/appserver/javaee-api/javax.javaee-endorsed-api/pom.xml
===================================================================
--- trunk/main/appserver/javaee-api/javax.javaee-endorsed-api/pom.xml   
(revision 62080)
+++ trunk/main/appserver/javaee-api/javax.javaee-endorsed-api/pom.xml   
(revision 62081)
@@ -133,7 +133,7 @@
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api-osgi</artifactId>
+            <artifactId>jaxb-api</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
Index: trunk/main/appserver/extras/embedded/shell/fixup.xml
===================================================================
--- trunk/main/appserver/extras/embedded/shell/fixup.xml        (revision 
62080)
+++ trunk/main/appserver/extras/embedded/shell/fixup.xml        (revision 
62081)
@@ -43,7 +43,7 @@
 
 <project name="glassfish v3, embedded shell fix-up" default="fixup.library" 
basedir=".">
     <property name="derby.jar.classpath.additions" 
value="../../../javadb/lib/derby.jar ../../../javadb/lib/derbyclient.jar 
../../../javadb/lib/derbynet.jar ../../../javadb/lib/derbytools.jar 
../../../javadb/lib/derbyrun.jar"/>
-    <property name="endorsed.jar.classpath.additions" 
value="../../modules/endorsed/javax.annotation-api.jar 
../../modules/endorsed/jaxb-api-osgi.jar 
../../modules/endorsed/webservices-api-osgi.jar"/>
+    <property name="endorsed.jar.classpath.additions" 
value="../../modules/endorsed/javax.annotation-api.jar 
../../modules/endorsed/jaxb-api.jar 
../../modules/endorsed/webservices-api-osgi.jar"/>
     <property name="classpath.additions" 
value="${derby.jar.classpath.additions} ${endorsed.jar.classpath.additions}"/>
     <target name="fixup.library">
         <unzip src="${output.dir}/${output.file}" dest="${stage.dir}">
Index: trunk/main/appserver/extras/javaee/manifest-jar/pom.xml
===================================================================
--- trunk/main/appserver/extras/javaee/manifest-jar/pom.xml     (revision 
62080)
+++ trunk/main/appserver/extras/javaee/manifest-jar/pom.xml     (revision 
62081)
@@ -58,7 +58,7 @@
                 <configuration>
                     <archive>
                        <manifestEntries>
-                               <Class-Path>../modules/javax.servlet-api.jar 
../modules/endorsed/javax.annotation-api.jar ../modules/javax.ejb-api.jar 
../modules/javax.transaction-api.jar 
../modules/javax.enterprise.deploy-api.jar 
../modules/javax.management.j2ee-api.jar ../modules/javax.resource-api.jar 
../modules/javax.security.auth.message-api.jar 
../modules/javax.security.jacc-api.jar ../modules/webservices-osgi.jar 
../modules/jaxb-osgi.jar ../modules/endorsed/jaxb-api-osgi.jar 
../modules/endorsed/webservices-api-osgi.jar ../modules/javax.xml.rpc-api.jar 
../modules/javax.xml.registry-api.jar ../modules/javax.mail.jar 
../modules/javax.faces.jar ../modules/javax.servlet.jsp-api.jar 
../modules/javax.el.jar ../modules/javax.servlet.jsp.jstl-api.jar 
../modules/javax.persistence.jar ../modules/javax.jms-api.jar 
../modules/bean-validator.jar ../modules/weld-osgi-bundle.jar 
../../mq/lib/jaxm-api.jar ../modules/javax.ws.rs-api.jar 
../modules/javax.json.jar ../modules/javax.websocket-api.jar 
../modules/javax.enterpr
 ise.concurrent-api.jar ../modules/javax.batch-api.jar</Class-Path>
+                               <Class-Path>../modules/javax.servlet-api.jar 
../modules/endorsed/javax.annotation-api.jar ../modules/javax.ejb-api.jar 
../modules/javax.transaction-api.jar 
../modules/javax.enterprise.deploy-api.jar 
../modules/javax.management.j2ee-api.jar ../modules/javax.resource-api.jar 
../modules/javax.security.auth.message-api.jar 
../modules/javax.security.jacc-api.jar ../modules/webservices-osgi.jar 
../modules/jaxb-osgi.jar ../modules/endorsed/jaxb-api.jar 
../modules/endorsed/webservices-api-osgi.jar ../modules/javax.xml.rpc-api.jar 
../modules/javax.xml.registry-api.jar ../modules/javax.mail.jar 
../modules/javax.faces.jar ../modules/javax.servlet.jsp-api.jar 
../modules/javax.el.jar ../modules/javax.servlet.jsp.jstl-api.jar 
../modules/javax.persistence.jar ../modules/javax.jms-api.jar 
../modules/bean-validator.jar ../modules/weld-osgi-bundle.jar 
../../mq/lib/jaxm-api.jar ../modules/javax.ws.rs-api.jar 
../modules/javax.json.jar ../modules/javax.websocket-api.jar 
../modules/javax.enterprise.c
 oncurrent-api.jar ../modules/javax.batch-api.jar</Class-Path>
                            
<GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
                        </manifestEntries>
                     </archive>





[glassfish~svn:62081] integrate metro-2.3.1-b104

jungicz 05/23/2013
 
 
Close
loading
Please Confirm
Close