geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tki...@apache.org
Subject svn commit: r769789 - in /geronimo/devtools/eclipse-plugin/branches/2.0.2: eclipse/build.xml plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF plugins/org.apache.geronimo.runtime.v20/pom.xml
Date Wed, 29 Apr 2009 14:00:15 GMT
Author: tkirby
Date: Wed Apr 29 14:00:15 2009
New Revision: 769789

URL: http://svn.apache.org/viewvc?rev=769789&view=rev
Log:
[GERONIMODEVTOOLS-570] GEP 2.0.2 branch build failed.  Thanks for the patch, Delos Dai!
fix download build.xml, change Geronimo server version from 2.0.1 to 2.0.2

Modified:
    geronimo/devtools/eclipse-plugin/branches/2.0.2/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/branches/2.0.2/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.0.2/plugins/org.apache.geronimo.runtime.v20/pom.xml

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.2/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.2/eclipse/build.xml?rev=769789&r1=769788&r2=769789&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.2/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.2/eclipse/build.xml Wed Apr 29 14:00:15
2009
@@ -39,7 +39,8 @@
         <property name="emf_sdo" value="emf-sdo-xsd-SDK-2.3.0.zip"/>
         <property name="gef_sdk" value="GEF-SDK-3.3.zip"/>
         <property name="wtp_sdk" value="wtp-sdk-R-2.0-200706260303.zip"/>
-        <property name="protocol" value="&amp;r=1&amp;protocol=http"/>
+        <!-- property name="protocol" value="&amp;r=1&amp;protocol=http"/ -->
+        <property name="protocol" value=""/>
     </target>
 
     <target name="win32" depends="init,common" description="Download Windows-specific
artifact(s)">

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.2/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.2/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF?rev=769789&r1=769788&r2=769789&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.2/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.2/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
Wed Apr 29 14:00:15 2009
@@ -4,22 +4,22 @@
 Bundle-SymbolicName: org.apache.geronimo.runtime.v20;singleton:=true
 Bundle-Version: 2.0.2
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
-Bundle-ClassPath: lib/geronimo-common-2.0.1.jar,
- lib/geronimo-connector-builder-2.0.1.jar,
- lib/geronimo-deploy-jsr88-2.0.1.jar,
- lib/geronimo-deployment-2.0.1.jar,
- lib/geronimo-j2ee-builder-2.0.1.jar,
- lib/geronimo-j2ee-schema-2.0.1.jar,
- lib/geronimo-kernel-2.0.1.jar,
- lib/geronimo-naming-builder-2.0.1.jar,
- lib/geronimo-security-builder-2.0.1.jar,
- lib/geronimo-service-builder-2.0.1.jar,
- lib/geronimo-system-2.0.1.jar,
- lib/geronimo-util-2.0.1.jar,
- lib/geronimo-web-2.5-builder-2.0.1.jar,
+Bundle-ClassPath: lib/geronimo-common-2.0.2.jar,
+ lib/geronimo-connector-builder-2.0.2.jar,
+ lib/geronimo-deploy-jsr88-2.0.2.jar,
+ lib/geronimo-deployment-2.0.2.jar,
+ lib/geronimo-j2ee-builder-2.0.2.jar,
+ lib/geronimo-j2ee-schema-2.0.2.jar,
+ lib/geronimo-kernel-2.0.2.jar,
+ lib/geronimo-naming-builder-2.0.2.jar,
+ lib/geronimo-security-builder-2.0.2.jar,
+ lib/geronimo-service-builder-2.0.2.jar,
+ lib/geronimo-system-2.0.2.jar,
+ lib/geronimo-util-2.0.2.jar,
+ lib/geronimo-web-2.5-builder-2.0.2.jar,
  lib/geronimo-schema-jee_5-1.1.jar,
- lib/geronimo-deploy-config-2.0.1.jar,
- lib/geronimo-openejb-builder-2.0.1.jar,
+ lib/geronimo-deploy-config-2.0.2.jar,
+ lib/geronimo-openejb-builder-2.0.2.jar,
  lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar
 Export-Package: 
  javax.enterprise.deploy.model,

Modified: geronimo/devtools/eclipse-plugin/branches/2.0.2/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.2/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=769789&r1=769788&r2=769789&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.2/plugins/org.apache.geronimo.runtime.v20/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.2/plugins/org.apache.geronimo.runtime.v20/pom.xml
Wed Apr 29 14:00:15 2009
@@ -27,7 +27,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>
-        <geronimoVersion>2.0.1</geronimoVersion>
+        <geronimoVersion>2.0.2</geronimoVersion>
     </properties>
     <build>
         <resources>
@@ -250,6 +250,13 @@
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openejb-builder</artifactId>
             <version>${geronimoVersion}</version>
+            <exclusions>
+			        <exclusion>
+			          <groupId>org.apache.ws.scout</groupId>
+			          <artifactId>jaxr-api</artifactId>
+			        </exclusion>
+			      </exclusions>
+
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>



Mime
View raw message