diff --git a/README.md b/README.md new file mode 100644 index 0000000..c8b57bb --- /dev/null +++ b/README.md @@ -0,0 +1,291 @@ +Ivy Integration Project +======================= + +-- + +> ***Note***: This document is in [Markdown](http://daringfireball.net/projects/markdown/) format. Markdown is a *markup* language (like HTML), but is specifically written to be readable even if you you are looking at this file in plain text. + +> Markdown has become a favorite markup language and is used in Wordpress sites, [Stackexchange] (http://stackexchange.com), and [GitHub] (http://github.com). + +> However, this file will look best using a Markdown editor. On Windows, you can use [MarkdownPad for Windows] (http://markdownpad.com) or [MD Pad] (http://apps.codigobit.info/2012/06/markdown-pad-markdown-textfile-editor.html). + +> On the Mac, you can use [Markdown Pro] (http://www.markdownpro.com) (which is available from the App Store) or [marked] (http://markedapp.com). If you want a *free* Markdown editor, try [Mou] (http://mouapp.com). + +> If you use Eclipse, you can use the [gfm_viewer] (https://github.com/satyagraha/gfm_viewer/blob/master/README.md) Markdown viewer for Eclipse. + +-- + +PURPOSE +------- + +This project automatically integrates Ivy into your project. It will +add into your project the correct Ivy settings and add in all the extra +tools that you need for doing your builds. Right now these include: + +* **Checkstyle** - Verifies your code is formatted to the standard Java + coding standards. +* **PMD** - Reads through your source code for possible programming errors +* **FindBugs** - Reads through your class files for possible programming + errors. +* **CPD** - Copy Paste Detector - Checks code for large amounts of copy + and pasted code. + +It also includes the [Ant Contrib tasks] +(http://ant-contrib.sourceforge.net). These extensions help make it +easier to do such things are loop through a set of files and includes +`if/then/else` logic. + + +IMPLEMENTATION +-------------- + +#####Add in the following two lines at the beginning of your build.xml file: + + + + +#####Add in the Ivy XML Namespace by putting this in your project line: + + + +Ant that's all there is to it. The import will import the Ivy settings +and the various build tools that we use. The xmlns line will add in a +separate namespace for the Ivy tasks. + +IVY TASKS +--------- + +The following Ivy tasks have been imported into your build. There are +other Ivy tasks, but these are the basic ones. + +Ivy tasks are documented at +http://ant.apache.org/ivy/history/latest-milestone/ant.html + +* `` - Setup Ivy. This is handled by the import. + +* `` - Resolves the Ivy dependencies and will download the + jars into your $HOME directory for use. This must be the first Ivy + task you call. + +* `` - Creates a Path ID that you can use in Java compiles. + The jars are not downloaded into your workspace. + +* `` - Creates a fileset that can be used in your project. + The jars are not downloaded into your workspace. + +* `` - Retrieves the dependencies and put them into your + workspace as you've specified. This is good for downloading the + required jars for wars and ears. + +* `` - Add to your clean target. This will clean out the + ivy cache. + +* `` - Will produce a set of reports on your Ivy + dependencies. These dependencies can be placed in HTML format, graph + ML format, and graphviz format. + + +OTHER TASKS +----------- + +These are new tasks created for the various build tools + +* `pmd` +* `findbugs` +* `cpd` +* `checkstyle` + + +STANDARD TARGETS +---------------- + +We will be standardizing on Maven Goal names as our targets. These +should be the standard ones used: + +* `all` Jenkins Target. Cleans everything and runs everything +* `checkstyle` Check Source Code Styles +* `clean` Cleans all built artifacts and the Ivy Cache +* `compile` Compiles the Java source code +* `cpd` Detects copy and pasting in code +* `findbugs` Run the findbugs report for Jenkins +* `ivy.report` Produced the Ivy Dependency Report +* `javadoc` Produce the Javadocs +* `package` Packaging of the artifact +* `pmd` Runs PMD Bug Detector Against Source +* `site` Produces a whole slew of reports +* `test` Run the JUnit tests + +Default target: package + +STANDARD DIRECTORY STRUCTURE +---------------------------- + +We will standardize on the Maven directory structure. Except there will +be a directory called `${basedir}/archive`. Any files in this directory +will be automatically archived by the Jenkins CI system. + + +* `src/main/java`: All current java source files + +* `src/main/resources`: All files here are placed in the root of jarfiles and in the WEB-INF directory of warfiles. + +* `src/main/webapps`: All files here are placed in the root of the + warfiles. + +* `src/main/resource/WEB-INF/application.xml`: application.xml file + +* `src/test/java`: Source code for all Java tests + +* `src/test/resources`: Non-Java files needed for tests. Will be copied + into the root of the test classes directory. + +* `target`: Scratch directory for all files not in the repository + +* `target/archive`: All files here will be archived into the build + + +JENKINS EXPECTED OUTPUT +----------------------- + +* `target/findbugs.xml` - Findbugs Output +* `target/javadocs/` - Location of all Javadocs +* `target/surfire-tests/` - All tests in XML format +* `target/pmd.xml` - PMD output +* `target/cpd.xml` - CPD output +* `target/checkstyles.xml` - Checkstyles output +* `target/archive/` - File to save for this build +* `target/maven/` - Where the Maven distributed jars are stored. + There should be a sub directory for each jar file that is being deployed to Maven + + +How the Build Should Work +------------------------- + +All builds should work via a basic checkout. The only tools required should be: + +* Ant version 1.8.x +* JDK version 1.6 or better +* Subversion client version 1.5.x or better + +A user should be able to do a checkout and build. The default target should be "package" which will do the basic build developers want. + +The `build.xml` should not depend upon a `build.properties` file, and should work with no changes. The location of tools such as the Java compiler should not have to be specified. + +Developers, however, can use a `build.properties` file to change the default behavior of properties for debugging purposes. For example, if a +developer sets `javac.listfiles = true`, the `` task will list +files it is compiling. + +By default, `` should not be forking except in rare circumstances where a build won't work otherwise. + +By default, JARS, EARS, and WARS should contain the Jenkins build information and the build date in the MANIFEST.INF file. The `build.xml` file in the `ivy.dir` directory will show you how to do this. + + +FILES +----- +* `ivy.tasks.xml` - Basic Ivy task integration (plus other tools) +* `build.xml` - Sample build.xml file +* `build.template.properties` - A template file for build.properties +* `ivy.template.xml` - A template file for creating your ivy.xml file + +USING THE OTHER TASKS +--------------------- + +####FINDBUGS: + + + + + + +or + + + + + +####PMD: + + + + + +or + + + + + +####CHECKSTYLE: + + + + + +or + + + + + +####CPD: + + + + + +or + + + + + +####JACOCO: + +***Coverage***: + + + [Your JUnit task definition] + + +or + + + [Your JUnit task definition] + + +***Reporting***: + + + + + + + + + +or + + + + + + + + + diff --git a/README.txt b/README.txt deleted file mode 100644 index c12659c..0000000 --- a/README.txt +++ /dev/null @@ -1,415 +0,0 @@ -Ivy Integration Project - -PURPOSE -======= - -This project automatically integrates Ivy into your project. It will -add into your project the correct Ivy settings and add in all the extra -tools that you need for doing your builds. Right now these include: - -* Checkstyle - Verifies your code is formatted to the standard Java - coding standards. -* PMD - Reads through your source code for possible programming errors -* FindBugs - Reads through your class files for possible programming - errors. -* CPD - Copy Paste Detector - Checks code for large amounts of copy - and pasted code. -* JaCoCo - Java Code Coverage. Like Emma or Cobertura, but this project - is being kept up to date. Emma and Cobertura have not seen changes in - a long while. - -It also includes the Ant Contrib tasks -(http://ant-contrib.sourceforge.net). These extentions help make it -easier to do such things are loop through a set of files and includes -if/then/else logic. - -This project was setup for Subversion. The idea is to create a Subversion -project (like trunk/ivy.dir), then have other projects use svn:externals to -include the ivy.dir project into their project. You can do something similar -with Perforce when creating a view. And Git sub-tree merges. - -This project makes integration into Jenkins so much easier to do, and -the structure of this project works very closely with Jenkins. For -example, the Ivy cache has been redefined to allow each Jenkins executor -to have its own separate Ivy cache. This way, one build can clean the -cache without affecting a parallel build. - -The newly defined macros for the Jars, Wars, and Ears automatically -embed the Jenkins build information into the MANIFEST.MF file (as well -as the Ivy version information. They also will produce a pom.xml file -from the ivy.xml file, so you can use mvn deploy:deploy-file to deploy -the built jars, wars, and ears bak into your Maven repository, and keep -it in Maven format. These commands will also embed the pom.xml into the -jars, wars, and ears under the META-INF directory just like Maven does. - -AUTHOR -====== - -David Weintraub - -COPYRIGHT -========= - -Copyright (c) 2010 by David Weintraub. All rights reserved. This program -is covered by the open source BMAB license. - -The BMAB (Buy me a beer) license allows you to use all code for whatever -reason you want with these three caveats: - -1. If you make any modifications in the code, please consider sending - them to me, so I can put them into my code. - -2. Give me attribution and credit on this program. - -3. If you're in town, buy me a beer. Or, a cup of coffee which is what - I'd prefer. Or, if you're feeling really spendthrify, you can buy me - lunch. I promise to eat with my mouth closed and to use a napkin - instead of my sleeves. - -IMPLEMENTATION -============== - -* Get this sub-project into your code. Define this package as a project - inside your repository. Then use your repository's method of including - subprojects into your checkout. - * With Subversion, use the svn:externals property - * With Git use the sub-tree merge - (https://help.github.com/articles/working-with-subtree-merge) - or Git Submodules (http://git-scm.com/book/en/Git-Tools-Submodules). - * With Perforce, define the Ivy.dir project as a sub-project of your view. - -* Add in the following two lines at the beginning of your build.xml file: - - - - -* Add in the Ivy XML Namespace by putting this in your project line: - - - -Ant that's all there is to it. The import will import the Ivy settings -and the various build tools that we use. The xmlns line will add in a -separate namespace for the Ivy tasks. - -IVY TASKS -========= - -The following Ivy tasks have been imported into your build. There are -other Ivy tasks, but these are the basic ones. - -Ivy tasks are documented at -http://ant.apache.org/ivy/history/latest-milestone/ant.html - -* - Setup Ivy. This is handled by the import. - -* - Resolves the Ivy dependencies and will download the - jars into your $HOME directory for use. This must be the first Ivy - task you call. - -* - Creates a Path ID that you can use in Java compiles. - The jars are not downloaded into your workspace. - -* - Creates a fileset that can be used in your project. - The jars are not downloaded into your workspace. - -* - Retrieves the dependencies and put them into your - workspace as you've specified. This is good for downloading the - required jars for wars and ears. - -* - Add to your clean target. This will clean out the - ivy cache. - -* - Will produce a set of reports on your Ivy - dependencies. These dependencies can be placed in HTML format, graph - ML format, and graphviz format. - - -OTHER TASKS -=========== - -These are new tasks created for the various build tools - -* pmd -* findbugs -* cpd -* checkstyle -* jacoco.coverage (Used to add coverage to JUnit tests) -* jacoco.report (Used to create a coverage report) - - -STANDARD TARGETS -================ - -We will be standardizing on Maven Goal names as our targets. These -should be the standard ones used: - -* all Jenkins Target. Cleans everything and runs everything -* checkstyle Check Source Code Styles -* clean Cleans all built artifacts and the Ivy Cache -* generate-sources Generate any required Java sources -* compile Compiles the Java source code -* cpd Detects copy and pasting in code -* findbugs Run the findbugs report for Jenkins -* ivy.report Produced the Ivy Dependency Report -* javadoc Produce the Javadocs -* package Packaging of the artifact -* pmd Runs PMD Bug Detector Against Source -* site Produces a whole slew of reports -* test-compile Compile the JUnit tests -* test Run the JUnit tests - -Default target: package - -STANDARD DIRECTORY STRUCTURE -============================ - -We will standardize on the Maven directory structure. Except there will -be a directory called ${basedir}/archive. Any files in this directory -will be automatically archived by the Jenkins CI system. - - -* src/main/java - All current java source files - -* src/main/resources - All files here are placed in the root of jarfiles - and in the WEB-INF directory of warfiles. - -* src/main/webapps - All files here are placed in the root of the - warfiles. - -* src/main/resource/WEB-INF/application.xml - application.xml file - -* src/test/java - Source code for all Java tests - -* src/test/resources - Non-Java files needed for tests. Will be copied - into the root of the test classes directory. - -* target - Scratch directory for all files not in the repository - -* target/archive - All files here will be archived into the build - -* target/maven - This is a rather interesting directory. When you - create a jar, you should place it in a subdirectory in this directory. - When that jar is created, two pom files: pom.xml and pom-snaphost.xml - are also created in that directory. These poms are identical except - that the revision of the pom-snapshot.xml will have "-SNAPSHOT" appended - to it. - - The purpose of this is to allow you to use mvn deploy:deploy-file to - deploy the jar to either your snapshot repository or to your release - repository. All you have to do is specify the correct parameters and - choose the correct pom. - - HOW I USE IT: I have Jenkins do a build on each change, and after each - build I use "mvn deploy:deploy-file" to deploy the jar into our snapshot - directory. When approved, I will also deploy that jar into our release - repository. This means that Build #20 is our release, but the last build - might be Build #25 which contains features you need. In that case, you can - specify the SNAPSHOT version which would be Build #25. - - -JENKINS EXPECTED OUTPUT -======================= - -* target/findbugs.xml - Findbugs Output -* target/apidocs/ - Location of all Javadocs -* target/surfire-tests/ - All tests in XML format -* target/pmd.xml - PMD output -* target/cpd.xml - CPD output -* target/checkstyles.xml - Checkstyles output -* target/archive/ - File to save for this build -* target/maven/ - Where the Maven distributed jars are stored. - There should be a sub directory for each - jar file that is being deployed to Maven - - -BUILD WORKINGS -============== -All builds should work via a basic checkout. The only tools required -should be: - -* Ant version 1.8.x -* JDK version 1.6 or better -* Subversion client version 1.5.x or better - -A user should be able to do a checkout and build. The default target -should be "package" which will do the basic build developers want. - -The build.xml should not depend upon a build.properties file, and should -work with no changes. The location of tools such as the Java compiler -should not have to be specified. - -Developers, however, can use a build.properties file to change the -default behavior of properties for debugging purposes. For example, if a -developer sets "javac.listfiles" to "true", the task will list -files it is compiling. - -By default, should not be forking except in rare circumstances -where a build won't work otherwise. - -By default, JARS, EARS, and WARS should contain the Jenkins build -information and the build date in the MANIFEST.INF file. The -build-sample.xml file will show you how to do this. - -There is a sample build.xml file at build-sample.xml that will help you -layout the new format. - -PROPERTY NAMES -============== - -Property names will be all lower case and each part will be separated by -periods. For example, main.test.dir and not mainTestDir. If a property -is involved with a particular task, the first part of the name should be -the name of the task, and the part after the dot is the parameter for -that task. For example, ivy.log sets the value of the "log" field for -the various Ivy tasks. ivy.cleancache will be used to see whether or not -to run the task. jar.destfile will be the name of the -jar's destination file. javac.verbose will be the setting for the -verbose parameter for the task. - -The exception will be for main and test properties. For example, we -should call the destdir for the task javac.destdir. However, -that will cause problems since the test classes and main classes should -be in two separate directories. Therefore, we will use "main" or "test" -as the first part of the property name instead of "javac". - -DON'T USE MAIN TEST -============== ============== ================ -javac.srcdir main.srcdir test.srcdir -javac.destdir main.destdir test.destdir -javac.classpath main.classpath test.classpath - -FILES -===== -* ivy.tasks.xml - Basic Ivy task integration (plus other tools) -* build.xml - Sample build.xml file -* build.template.properties - A template file for build.properties -* ivy.template.xml - A template file for creating your ivy.xml file - -USING STANDARD MACROS - -JAVAC.MACRO: - -This will automatically set -XLint and Xmaxwarns for pickup by -Jenkins CI. You can turn Xlint off by setting the "lint" parameter -to "false": - - - - - - > - - - -JAR.MACRO: - -This will automatically create a pom.xml file in -${basedir}/target/archive, and also put that pom.xml -into your META-INF/maven directory. It will also put -Jenkins build information and Maven information into -your MANIFEST.MF file: - - - - - - -Other macros and are similar. The - creates a version.txt file that contains the -Jenkins build information and places it in the root of the zip. - -USING THE OTHER TASKS -===================== - -FINDBUGS: - - - - - - -or - - - - - -PMD: - - - - -or - - - - -CHECKSTYLE: - - - - -or - - - - -CPD: - - - - -or - - - - -JACOCO: - -Coverage: - - - [Your JUnit task definition] - -or - - - [Your JUnit task definition] - - -Reporting: - - - - - - - - - -or - - - - - - - - diff --git a/build.template.properties b/build.template.properties index d5901dd..48285f6 100644 --- a/build.template.properties +++ b/build.template.properties @@ -19,14 +19,24 @@ # # Set to "false" to prevent cache cleaning on "clean" -ivy.cleancache=true +ivy.cleancache=false # Set to "default", "download-only", or "quiet" -ivy.log=quiet +ivy.log=default # Useful to produce ivy.report to help you fix resolve issues # Set to "false" to allow ivy.report to work with resolve issues ivy.resolve.haltonfailure=true + +# Ivy Dependency Reports +ivy.report.xsl=true +ivy.report.xml=false + +# For yEd: http://ant.apache.org/ivy/history/latest-milestone/yed.html +ivy.report.graph=false + +# For graphviz http://graphviz.org +ivy.report.dot=false # ######################################################################## @@ -42,10 +52,9 @@ checkstyle.formatter.type=xml ######################################################################## # PMD # -pmd.shortFileNames="true" +pmd.shortFileNames=true # Can be "xml", "html", "text", "csv", "popari", or "summaryhtml" pmd.formatter.type=xml -pmd.fomatter.toFile=${target.dir}/pmd.${pmd.formatter.type} # ######################################################################## @@ -54,7 +63,6 @@ pmd.fomatter.toFile=${target.dir}/pmd.${pmd.formatter.type} # # Can be "xml", "csv", or "text" cpd.format=xml -cpdoutputFile=${target.dir}/cpd.${cpd.format} cpd.minimalTockenCount=100 cpd.ignoreLiterals=false cpd.ignoreIdentifiers=false @@ -72,8 +80,8 @@ javac.deprecation=true javac.debug=true javac.debuglevel=lines,vars,source javac.listfiles=false -javac.target=1.6 -javac.source=1.6 +javac.target=1.7 +javac.source=1.7 javac.includeAntRuntime=false javac.includeJavaRuntime=false javac.failonerror=true diff --git a/build.xml b/build.xml index edf09fc..6f89b77 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,7 @@ + xmlns:ivy="http://ant.apache.org/ivy" + xmlns:if="ant:if" + xmlns:unless="ant:unless"> This is a template you can use for your build.xml file. @@ -7,141 +9,101 @@ of your project. This will appear when someone does an "ant -p" or "ant -projecthelp". - You can delete comments with the (DELETE COMMENT) text - in them. These comments are here to help you, but they - tend to clog up the build.xml file with extranious info. - - + + + WARNING: Wrong version of Ant! + + You need Ant 1.9.1 or better to run this build. You currently + are using Ant version ${ant.version}. + Download Ant 1.9.1 from http://ant.apache.org and install it on + your system. + + If you are using Eclpse, you can select the version of Ant you + want to use in Eclipse by going to the "Eclipse->Preferences" + menu item on Mac OS X, or the "Windows->Configuration" in + Windows. Then in the list, select "Ant->Runtime" on the left. + On the right side, click on the "Ant Home" button and select + the directory where Ant 1.9.1 is located. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - + - - - - + - - - - - - + + + + - - - - - + + + + + - - - + - + + - @@ -149,24 +111,14 @@ - - - - + + - - + @@ -177,13 +129,20 @@ - + + + + + + + + @@ -207,31 +166,29 @@ - - + + + + + + - Please note that the standard style of target names and ant properties - is all lower case separated by periods. Not "JarName" or "jar-name", - but just "jar.name". It's readable, and standardized (DELETE COMMENT) - --> - - - + + - + - - - - - - + @@ -249,19 +206,21 @@ - - + + + + + + + + + - - @@ -278,20 +237,26 @@ - + + + + + + + + + + + @@ -307,31 +272,29 @@ fork="${javac.fork}"> - + - - - - - - - - + + + + + + - - + - @@ -347,47 +310,54 @@ - - - - + - + + + + if="do.build.war" + depends="compile,retrieve.runtime.jars"> - - + - + + - - + + + + + + + if="do.build.ear" + depends="retrieve.runtime.jars"> - @@ -395,24 +365,30 @@ + + + todir="${ivy.report.todir}" + xml="${ivy.report.xml}" + xsl="${ivy.report.xsl}" + graph="${ivy.report.graph}" + dot="{ivy.report.dot}"/> - + + file.name="${pmd.formatter.toFile}"> @@ -474,6 +450,7 @@ @@ -487,8 +464,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/findbugs/findbugs-2.0.1/lib/annotations.jar b/findbugs/findbugs-2.0.2/lib/annotations.jar similarity index 81% rename from findbugs/findbugs-2.0.1/lib/annotations.jar rename to findbugs/findbugs-2.0.2/lib/annotations.jar index 8a0204f..5a6a492 100644 Binary files a/findbugs/findbugs-2.0.1/lib/annotations.jar and b/findbugs/findbugs-2.0.2/lib/annotations.jar differ diff --git a/findbugs/findbugs-2.0.2/lib/ant.jar b/findbugs/findbugs-2.0.2/lib/ant.jar new file mode 100644 index 0000000..f68c9cf Binary files /dev/null and b/findbugs/findbugs-2.0.2/lib/ant.jar differ diff --git a/findbugs/findbugs-2.0.1/lib/asm-3.3.jar b/findbugs/findbugs-2.0.2/lib/asm-3.3.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/asm-3.3.jar rename to findbugs/findbugs-2.0.2/lib/asm-3.3.jar diff --git a/findbugs/findbugs-2.0.1/lib/asm-analysis-3.3.jar b/findbugs/findbugs-2.0.2/lib/asm-analysis-3.3.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/asm-analysis-3.3.jar rename to findbugs/findbugs-2.0.2/lib/asm-analysis-3.3.jar diff --git a/findbugs/findbugs-2.0.1/lib/asm-commons-3.3.jar b/findbugs/findbugs-2.0.2/lib/asm-commons-3.3.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/asm-commons-3.3.jar rename to findbugs/findbugs-2.0.2/lib/asm-commons-3.3.jar diff --git a/findbugs/findbugs-2.0.1/lib/asm-tree-3.3.jar b/findbugs/findbugs-2.0.2/lib/asm-tree-3.3.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/asm-tree-3.3.jar rename to findbugs/findbugs-2.0.2/lib/asm-tree-3.3.jar diff --git a/findbugs/findbugs-2.0.1/lib/asm-util-3.3.jar b/findbugs/findbugs-2.0.2/lib/asm-util-3.3.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/asm-util-3.3.jar rename to findbugs/findbugs-2.0.2/lib/asm-util-3.3.jar diff --git a/findbugs/findbugs-2.0.1/lib/asm-xml-3.3.jar b/findbugs/findbugs-2.0.2/lib/asm-xml-3.3.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/asm-xml-3.3.jar rename to findbugs/findbugs-2.0.2/lib/asm-xml-3.3.jar diff --git a/findbugs/findbugs-2.0.1/lib/bcel.jar b/findbugs/findbugs-2.0.2/lib/bcel.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/bcel.jar rename to findbugs/findbugs-2.0.2/lib/bcel.jar diff --git a/findbugs/findbugs-2.0.2/lib/buggy.icns b/findbugs/findbugs-2.0.2/lib/buggy.icns new file mode 100644 index 0000000..b1f4660 Binary files /dev/null and b/findbugs/findbugs-2.0.2/lib/buggy.icns differ diff --git a/findbugs/findbugs-2.0.1/lib/commons-lang-2.4.jar b/findbugs/findbugs-2.0.2/lib/commons-lang-2.4.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/commons-lang-2.4.jar rename to findbugs/findbugs-2.0.2/lib/commons-lang-2.4.jar diff --git a/findbugs/findbugs-2.0.1/lib/dom4j-1.6.1.jar b/findbugs/findbugs-2.0.2/lib/dom4j-1.6.1.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/dom4j-1.6.1.jar rename to findbugs/findbugs-2.0.2/lib/dom4j-1.6.1.jar diff --git a/findbugs/findbugs-2.0.1/lib/findbugs.jar b/findbugs/findbugs-2.0.2/lib/findbugs.jar similarity index 77% rename from findbugs/findbugs-2.0.1/lib/findbugs.jar rename to findbugs/findbugs-2.0.2/lib/findbugs.jar index 3201a26..ef0b328 100644 Binary files a/findbugs/findbugs-2.0.1/lib/findbugs.jar and b/findbugs/findbugs-2.0.2/lib/findbugs.jar differ diff --git a/findbugs/findbugs-2.0.1/lib/jFormatString.jar b/findbugs/findbugs-2.0.2/lib/jFormatString.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/jFormatString.jar rename to findbugs/findbugs-2.0.2/lib/jFormatString.jar diff --git a/findbugs/findbugs-2.0.1/lib/jaxen-1.1.1.jar b/findbugs/findbugs-2.0.2/lib/jaxen-1.1.1.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/jaxen-1.1.1.jar rename to findbugs/findbugs-2.0.2/lib/jaxen-1.1.1.jar diff --git a/findbugs/findbugs-2.0.1/lib/jcip-annotations.jar b/findbugs/findbugs-2.0.2/lib/jcip-annotations.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/jcip-annotations.jar rename to findbugs/findbugs-2.0.2/lib/jcip-annotations.jar diff --git a/findbugs/findbugs-2.0.1/lib/jdepend-2.9.jar b/findbugs/findbugs-2.0.2/lib/jdepend-2.9.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/jdepend-2.9.jar rename to findbugs/findbugs-2.0.2/lib/jdepend-2.9.jar diff --git a/findbugs/findbugs-2.0.1/lib/jsr305.jar b/findbugs/findbugs-2.0.2/lib/jsr305.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/jsr305.jar rename to findbugs/findbugs-2.0.2/lib/jsr305.jar diff --git a/findbugs/findbugs-2.0.1/lib/yjp-controller-api-redist.jar b/findbugs/findbugs-2.0.2/lib/yjp-controller-api-redist.jar similarity index 100% rename from findbugs/findbugs-2.0.1/lib/yjp-controller-api-redist.jar rename to findbugs/findbugs-2.0.2/lib/yjp-controller-api-redist.jar diff --git a/findbugs/findbugs-ant.jar b/findbugs/findbugs-ant.jar index 2128ba8..269f1a5 100644 Binary files a/findbugs/findbugs-ant.jar and b/findbugs/findbugs-ant.jar differ diff --git a/ivy-2.3.0-rc1.jar b/ivy-2.3.0.jar similarity index 70% rename from ivy-2.3.0-rc1.jar rename to ivy-2.3.0.jar index 9129e6a..543de46 100644 Binary files a/ivy-2.3.0-rc1.jar and b/ivy-2.3.0.jar differ diff --git a/ivy.tasks.xml b/ivy.tasks.xml index 9013e1d..06e4173 100644 --- a/ivy.tasks.xml +++ b/ivy.tasks.xml @@ -13,9 +13,9 @@ - - - + + + + value="${ivy.dir}/findbugs/findbugs-2.0.2"/> @@ -634,14 +634,6 @@ artifactId=${ivy.module} - - - - - - @@ -732,4 +724,65 @@ Build-Date: ${build.date} + + + + + + + + + + + + + Perl is installed. Template tests will execute + + + Perl not installed. Cannot test auto-configuration or templates + install Perl from http://strawberryperl.com to run template test. + + + + + + + + + + + ${line.separator}Testing whether autoconfig templates have errors + Executing from @{template.root.dir} + + + + + + + ${line.separator}Template files are good. Checking whether answers are complete + + + + + + Checking Answer file @{answer.file} + + + + + + + + + + + + + diff --git a/ivy.template.xml b/ivy.template.xml index 11a2736..e3c6727 100644 --- a/ivy.template.xml +++ b/ivy.template.xml @@ -1,4 +1,6 @@ - + + @@ -73,8 +75,8 @@ - + @@ -86,7 +88,7 @@ rev="1.1.1" type="javadoc" ext="jar" conf="javadoc->default"/> - + diff --git a/ivysettings.eclipse.xml b/ivysettings.eclipse.xml index 4d37906..e164291 100644 --- a/ivysettings.eclipse.xml +++ b/ivysettings.eclipse.xml @@ -17,9 +17,8 @@ under the License. --> - - +