gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1637668 - in /gump/metadata: profile/gump.xml project/packaged-google-guava.xml project/tomcat-tc7.xml project/tomcat-tc8.xml project/tomcat-trunk.xml project/xml-fop.xml project/xmlgraphics-commons.xml
Date Sun, 09 Nov 2014 12:35:04 GMT
Author: bodewig
Date: Sun Nov  9 12:35:04 2014
New Revision: 1637668

URL: http://svn.apache.org/r1637668
Log:
add guava 18.0 as package until it can be built on Java8

Added:
    gump/metadata/project/packaged-google-guava.xml
      - copied, changed from r1637664, gump/metadata/project/google-guava.xml
Modified:
    gump/metadata/profile/gump.xml
    gump/metadata/project/tomcat-tc7.xml
    gump/metadata/project/tomcat-tc8.xml
    gump/metadata/project/tomcat-trunk.xml
    gump/metadata/project/xml-fop.xml
    gump/metadata/project/xmlgraphics-commons.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1637668&r1=1637667&r2=1637668&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Sun Nov  9 12:35:04 2014
@@ -112,6 +112,7 @@
   <module href="project/easymock.xml"/>
   <module href="project/eclipse.xml"/>
   <module href="project/google-guava.xml" />
+  <module href="project/packaged-google-guava.xml" />
   <module href="project/hamcrest.xml" />
   <module href="project/jacoco.xml"/>
   <module href="project/jarjar.xml"/>
@@ -147,6 +148,7 @@
   <project name="fop-hyph"         package="fop-hyph"/>
   <project name="packaged-excalibur" package="apache-attic"/>
   <project name="excalibur-legacy" package="apache-attic"/>
+  <project name="packaged-google-guava" package="guava"/>
   <project name="jacocoant"        package="jacoco"/>
   <project name="jaf"              package="jaf-1.1ea"/>
   <project name="jakarta-regexp"   package="apache-attic"/>

Copied: gump/metadata/project/packaged-google-guava.xml (from r1637664, gump/metadata/project/google-guava.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/packaged-google-guava.xml?p2=gump/metadata/project/packaged-google-guava.xml&p1=gump/metadata/project/google-guava.xml&r1=1637664&r2=1637668&rev=1637668&view=diff
==============================================================================
--- gump/metadata/project/google-guava.xml (original)
+++ gump/metadata/project/packaged-google-guava.xml Sun Nov  9 12:35:04 2014
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module name="google-guava" groupId="com.google.guava">
+<module name="packaged-google-guava" groupId="com.google.guava">
 
   <url href="http://code.google.com/p/guava-libraries/"/>
   <description>
@@ -24,37 +24,14 @@
     much more.
   </description>
   
-  <git repository="github" dir="/google/guava.git" />
-
-  <project name="google-guava" >
-    <!-- Note: Currently broken on Java 8
+  <project name="packaged-google-guava" >
+    <!-- Note: Placeholder until they solve the Java 8 compilation issue
          https://github.com/google/guava/issues/1738 -->
 
     <package>com.google.guava</package>
 
-    <mvn3 basedir="guava" />
-
-    <option project="google-guava-parent" />
-    
-    <jar name="guava/target/guava-*[0-9T].jar" id="guava" />
-    <pom name="guava/pom.xml" id="guava" />
-  </project>
-
-  <project name="google-guava-parent" >
-    <mvn3install artifactId="guava-parent" />
-    <pom name="pom.xml" id="guava-parent" />
-    <option project="junit" />
-  </project>
-
-<!--  
-  <project name="google-guava-reactor">
-    <package>com.google.guava</package>
-
-    <mvn3 />
-
-    <depend project="google-guava" />
-    <report nested="guava-tests/target/surefire-reports" />
+    <jar name="guava-18.0.jar" id="guava" />
+    <pom name="guava-18.0.pom" id="guava" />
   </project>
--->
 
 </module>

Modified: gump/metadata/project/tomcat-tc7.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc7.xml?rev=1637668&r1=1637667&r2=1637668&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc7.xml (original)
+++ gump/metadata/project/tomcat-tc7.xml Sun Nov  9 12:35:04 2014
@@ -208,7 +208,7 @@
    <depend project="commons-exec"/>
    <depend project="commons-logging" />
    <depend project="commons-validator" />
-   <depend project="google-guava"/>
+   <depend project="packaged-google-guava"/>
 
    <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />

Modified: gump/metadata/project/tomcat-tc8.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc8.xml?rev=1637668&r1=1637667&r2=1637668&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc8.xml (original)
+++ gump/metadata/project/tomcat-tc8.xml Sun Nov  9 12:35:04 2014
@@ -263,7 +263,7 @@
    <depend project="commons-exec"/>
    <depend project="commons-logging" />
    <depend project="commons-validator" />
-   <depend project="google-guava"/>
+   <depend project="packaged-google-guava"/>
 
    <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />

Modified: gump/metadata/project/tomcat-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1637668&r1=1637667&r2=1637668&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-trunk.xml Sun Nov  9 12:35:04 2014
@@ -219,7 +219,7 @@
    <depend project="commons-exec"/>
    <depend project="commons-logging" />
    <depend project="commons-validator" />
-   <depend project="google-guava"/>
+   <depend project="packaged-google-guava"/>
 
    <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />

Modified: gump/metadata/project/xml-fop.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/xml-fop.xml?rev=1637668&r1=1637667&r2=1637668&view=diff
==============================================================================
--- gump/metadata/project/xml-fop.xml (original)
+++ gump/metadata/project/xml-fop.xml Sun Nov  9 12:35:04 2014
@@ -77,7 +77,7 @@
     <depend project="commons-exec"/>
     <depend project="commons-logging" />
     <depend project="commons-validator"/>
-    <depend project="google-guava" />
+    <depend project="packaged-google-guava" />
 
     <depend project="xml-fop" inherit="all"/>
     <depend project="fop-hyph"/>

Modified: gump/metadata/project/xmlgraphics-commons.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/xmlgraphics-commons.xml?rev=1637668&r1=1637667&r2=1637668&view=diff
==============================================================================
--- gump/metadata/project/xmlgraphics-commons.xml (original)
+++ gump/metadata/project/xmlgraphics-commons.xml Sun Nov  9 12:35:04 2014
@@ -65,7 +65,7 @@
     <depend project="commons-collections" />
     <depend project="commons-exec"/>
     <depend project="commons-validator"/>
-    <depend project="google-guava" />
+    <depend project="packaged-google-guava" />
 
     <depend project="commons-logging" ids="commons-logging"/>
     <depend project="commons-io"/>



Mime
View raw message