diff --git a/.travis.yml b/.travis.yml
index d3a7b05fc7..a56056f7ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,7 @@ env:
- secure: "pAeI941ODNSo6F7A94WFafxYqp2kdeFTJksMLVHljT0h2nX6/236OXn/iZXiB+FbXe/DkQIHN3n1IZRwE8UJAbSAwoaPUWenPy4mNAhnI4L/rwysREwq5FKSFTWJet9HitfFR57ezLGOV0VLFfH1xGsNWabHzzbwbV3WMl9pH0M="
- secure: "Pqj194YmdK0va4bOkbjVG0wCZ7sbB5k3Qq66zSG2M26M21uHonwhXprdtSeYZ5Oy9fWcQte7jSA69euyYyLriDH6DU2NE34scK2Y1yO6SCfx5SGr3XuxHWqxtNOxoUaH4RP1WR/9CRkBg8kBxzWus3M2ZeqElu33/p2CtgJEdJg="
matrix:
- - LABEL=ant CMD="ant dist test.dist" INSTALL="/bin/true"
- - LABEL=ant_no_aop CMD="ant -f build/no_aop/build.xml dist test.dist" INSTALL="ant no_aop"
+ - LABEL=docs CMD="ant javadoc jdiff" INSTALL="/bin/true"
- LABEL=mvn CMD="mvn -B -P!standard-with-extra-repos verify --fail-at-end -Dsource.skip=true -Dmaven.javadoc.skip=true" INSTALL="mvn -P!standard-with-extra-repos dependency:go-offline test clean --quiet --fail-never -DskipTests=true"
install:
@@ -28,7 +27,6 @@ script:
after_success:
- util/generate-latest-docs.sh
- - util/compareBuilds.sh
- util/publish-snapshot-on-commit.sh
branches:
diff --git a/build.xml b/build.xml
index 1e71cf2059..518c5bc7a9 100644
--- a/build.xml
+++ b/build.xml
@@ -17,125 +17,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -247,51 +128,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ]]>
-
-
- ]]>
-
-
- ]]>
-
-
-
-
-
-
diff --git a/common.xml b/common.xml
index fc4c730973..2988712d5d 100644
--- a/common.xml
+++ b/common.xml
@@ -23,134 +23,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/build/bnd-0.0.384.jar b/lib/build/bnd-0.0.384.jar
deleted file mode 100644
index fa5e5263f7..0000000000
Binary files a/lib/build/bnd-0.0.384.jar and /dev/null differ
diff --git a/lib/build/jarjar-1.1.jar b/lib/build/jarjar-1.1.jar
deleted file mode 100644
index 352c00a427..0000000000
Binary files a/lib/build/jarjar-1.1.jar and /dev/null differ
diff --git a/util/compareBuilds.sh b/util/compareBuilds.sh
deleted file mode 100755
index e81a7f48cc..0000000000
--- a/util/compareBuilds.sh
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/bash
-## Compares the ant jars to the maven jars and makes sure they're the same
-## (or different where/how expected)
-
-## Note: The no_aop build doesn't compare cleanly for some reason.
-## Maybe a difference between the ant & maven munge preprocessor?
-
-RETVAL=0
-
-function cleanAndBuild {
- mvn clean > /dev/null
- ant clean.all > /dev/null
- #ant no_aop > /dev/null
- ant dist > /dev/null
- mvn package -DskipTests=true -Dmaven.javadoc.skip=true > /dev/null
- #ant -f build/no_aop/build.xml dist > /dev/null
-}
-
-function findAndCompareJars {
- version=4.0
- for ANT in `find ./build/dist/* -name "*-snapshot.jar" `
- do
- if [ $ANT = "./build/dist/guice-snapshot.jar" ]; then
- ## Check the main build.
- MVN=./core/target/guice-$version-SNAPSHOT.jar
- extension=core
- compareJars "$ANT" "$MVN" $extension
- #compareJars "./build/no_aop/$ANT" "./core/target/guice-$version-SNAPSHOT-no_aop.jar" "no_aop: $extension"
- else
- ## Check extensions.
- extension=`echo $ANT | awk -F"-" '{print $2 }'`
- MVN=./extensions/$extension/target/guice-$extension-$version-SNAPSHOT.jar
- compareJars "$ANT" "$MVN" $extension
- fi
-
- done;
-}
-
-function compareJars {
- ANT=$1
- MVN=$2
- extension=$3
- curdir=`pwd`
-
- echo Comparing $3
- mkdir "tmp$$"
- cp $ANT tmp$$/ant.jar
- cp $MVN tmp$$/mvn.jar
- cd "tmp$$"
- mkdir ant
- mkdir mvn
- cd ant
- jar -xf ../ant.jar
- cd ..
- cd mvn
- jar -xf ../mvn.jar
- cd ..
-
- ## ant puts LICENSE & NOTICE files in a different place
- echo LICENSE > excludes
- echo NOTICE >> excludes
- ## ant does not create DEPENDENCIES
- echo DEPENDENCIES >> excludes
- ## ant/mvn slightly different in MANIFEST.MF
- echo MANIFEST.MF >> excludes
-
- ## ant leaves empty directories for some jarjar'd paths --
- ## we grep -v instead of exclude because we want to make sure
- ## if any files in those directories exist, that they're diff'd.
- ## ant 1.8+ also creates package-info classes all the time, and
- ## maven doesn't -- so we just ignore the package-info classes.
- diff -u --recursive -Xexcludes ant mvn | \
- grep -v "^Only in ant/com/google/inject/internal/asm: signature$" | \
- grep -v "^Only in ant/com/google/inject/internal/cglib: beans$" | \
- grep -v "^Only in ant/com/google/inject/internal/cglib: transform$" | \
- grep -v "^Only in ant/com/google/inject/internal/cglib/transform: impl$" | \
- grep -v "^Only in ant/com/google/inject/internal/cglib: util$" | \
- grep -v "^Only in ant: net$" | \
- grep -v "^Only in ant: org$" | \
- grep -v "^Only in ant/com/google/inject/.*: package-info\.class$"
- # failure is 0 because we're using grep -v to filter things out
- if [ $? -eq 0 ]; then
- export RETVAL=1
- fi
- cd "$curdir"
- rm -rf "tmp$$"
-}
-
-## Only bother doing this on the jdk8/mvn build (before we publish snapshots).
-## Otherwise it's a waste of time building mvn+ant each time.
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && \
- [ "$LABEL" == "mvn" ]; then
- echo "Cleaning and building ant & maven..."
- cleanAndBuild
- echo "Starting to compare jars..."
- echo
- findAndCompareJars
- if [ $RETVAL -eq 0 ]; then
- echo "Everything looks good!"
- exit 0
- else
- echo "Some things don't match -- see above for details."
- exit 1
- fi
-fi