You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ha...@apache.org on 2010/12/07 09:35:26 UTC

svn commit: r1042935 - in /geronimo/devtools/eclipse-plugin/branches/2.2: plugins/org.apache.geronimo.runtime.v11/pom.xml plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF pom.xml

Author: hanhongfang
Date: Tue Dec  7 08:35:25 2010
New Revision: 1042935

URL: http://svn.apache.org/viewvc?rev=1042935&view=rev
Log:
GERONIMODEVTOOLS-688 Synchronize GEP dependency per Server dependency list
Oops~ build failure with previous commit, commit further change to make build completed successfully

Modified:
    geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v11/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2/pom.xml

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v11/pom.xml?rev=1042935&r1=1042934&r2=1042935&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v11/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v11/pom.xml Tue Dec  7 08:35:25 2010
@@ -99,7 +99,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+                                    <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
                                     <version>1.0</version>
                                 </artifactItem>
                                 <artifactItem>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF?rev=1042935&r1=1042934&r2=1042935&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF Tue Dec  7 08:35:25 2010
@@ -15,8 +15,8 @@ Bundle-ClassPath: lib/geronimo-common-2.
  lib/geronimo-deploy-config-2.1.7.jar,
  lib/plexus-archiver-1.0-alpha-7.jar,
  lib/geronimo-crypto-2.1.7.jar,
- lib/slf4j-api-1.4.3.jar,
- lib/slf4j-simple-1.4.3.jar
+ lib/slf4j-api-1.5.5.jar,
+ lib/slf4j-simple-1.5.5.jar
 Export-Package: org.apache.geronimo.common,
  org.apache.geronimo.common.propertyeditor,
  org.apache.geronimo.deployment,

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF?rev=1042935&r1=1042934&r2=1042935&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF Tue Dec  7 08:35:25 2010
@@ -15,8 +15,8 @@ Bundle-ClassPath: lib/geronimo-common-2.
  lib/geronimo-deploy-config-2.2.1.jar,
  lib/plexus-archiver-1.0-alpha-7.jar,
  lib/geronimo-crypto-2.2.1.jar,
- lib/slf4j-api-1.4.3.jar,
- lib/slf4j-simple-1.4.3.jar
+ lib/slf4j-api-1.5.5.jar,
+ lib/slf4j-simple-1.5.5.jar
 Export-Package: 
  org.apache.geronimo.common,
  org.apache.geronimo.common.propertyeditor,

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/pom.xml?rev=1042935&r1=1042934&r2=1042935&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/pom.xml Tue Dec  7 08:35:25 2010
@@ -112,13 +112,13 @@
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-xjc</artifactId>
-                <version>2.1.7</version>
+                <version>2.1.12</version>
             </dependency>
                         
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>2.1.7</version>
+                <version>2.1.12</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml.bind</groupId>