From 32b5270071e08297f167a1785fd71b92ab6d7c1b Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Sun, 23 Sep 2012 00:56:15 +0200 Subject: [PATCH 01/30] Maven project junit:junit artifact --- pom.xml | 503 ++++++++++++++++++ src/main/assembly/src.xml | 123 +++++ src/main/config/settings.xml | 291 ++++++++++ src/main/java/junit/runner/Version.java | 25 +- .../java/junit/runner/Version.java.template | 18 - src/main/javadoc/stylesheet.css | 1 + src/main/resources/junit/runner/LICENSE | 218 ++++++++ .../{java => resources}/junit/runner/logo.gif | Bin .../junit/runner/smalllogo.gif | Bin 9 files changed, 1160 insertions(+), 19 deletions(-) create mode 100644 pom.xml create mode 100644 src/main/assembly/src.xml create mode 100644 src/main/config/settings.xml delete mode 100644 src/main/java/junit/runner/Version.java.template create mode 100644 src/main/javadoc/stylesheet.css create mode 100644 src/main/resources/junit/runner/LICENSE rename src/main/{java => resources}/junit/runner/logo.gif (100%) rename src/main/{java => resources}/junit/runner/smalllogo.gif (100%) diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000000..51a298779bd4 --- /dev/null +++ b/pom.xml @@ -0,0 +1,503 @@ + + + + 4.0.0 + + junit + junit + 4.11-SNAPSHOT + + JUnit + http://junit.org + JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java. + + JUnit + http://www.junit.org + + 2002 + + + JUnit Mailing List + junit@yahoogroups.com + http://tech.groups.yahoo.com/group/junit/ + + + + + Common Public License Version 1.0 + http://www.opensource.org/licenses/cpl1.0.txt + repo + + + + scm:git:git://github.com/KentBeck/junit.git + scm:git:git@github.com:KentBeck/junit.git + http://github.com/KentBeck/junit/tree/master + + + + dsaff + David Saff + david@saff.net + + + + + Tibor Digana + + developer + + + + + 1.3 + 1.5 + ISO-8859-1 + + + 3.0.4 + + + + org.hamcrest + hamcrest-core + ${hamcrestVersion} + + + + http://sourceforge.net/projects/junit/ + + sourceforge-staging + upload.to.sourceforge + ftp://localhost/sourceforge + + + + + + + ${project.basedir}/src/main/resources + + + ${project.basedir} + + LICENSE + + + + + + org.apache.maven.wagon + wagon-ftp + 2.2 + + + org.apache.maven.wagon + wagon-http + 2.2 + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + parse-project-version + validate + + parse-version + + + junit + ${project.version} + + + + + + maven-enforcer-plugin + 1.1.1 + + + enforce-versions + initialize + + enforce + + + true + + + Current version of Maven ${maven.version} required to build the project should be ${project.prerequisites.maven}, or higher! + ${project.prerequisites.maven} + + + Current JDK version ${java.version} should be ${jdkVersion}, or higher! + ${jdkVersion} + + + Best Practice is to never define repositories in pom.xml (use a repository manager instead). + + + No Snapshots Dependencies Allowed! + + + + + + + + maven-compiler-plugin + 2.5.1 + + ${project.build.sourceEncoding} + ${jdkVersion} + ${jdkVersion} + 1.5 + true + true + true + true + -Xlint:unchecked + 128m + + + + maven-surefire-plugin + 2.12.3 + + org/junit/tests/AllTests.java + true + false + + + + org.apache.maven.surefire + surefire-junit47 + 2.12.3 + + + + + maven-source-plugin + 2.2 + + + attach-sources + prepare-package + + jar-no-fork + + + + + + maven-javadoc-plugin + 2.8.1 + + + attach-javadoc + prepare-package + + jar + + + ${basedir}/src/main/javadoc/stylesheet.css + protected + false + false + false + true + true + true + JUnit API + UTF-8 + en + 1.5 + + + api_1.5 + http://docs.oracle.com/javase/1.5.0/docs/api/index.html + + + junit.*,org.junit.internal.*,org.junit.experimental.theories.internal.* + true + 32m + 128m + true + true + + org.hamcrest:hamcrest-core:* + + + + + + + maven-assembly-plugin + 2.3 + + + assembly ${project.artifactId}-${project.version}.zip for sourceforge + package + + single + + + false + + src/main/assembly/src.xml + + + + + + + maven-release-plugin + 2.3.2 + + ${releaseVersion} + + + + + + + checkRelease + + + + maven-enforcer-plugin + 1.1.1 + + + enforce-versions + initialize + + enforce + + + true + + + No Snapshot Project Allowed! + + + + + + + + + + + checkSnapshot + + true + + + + + maven-enforcer-plugin + 1.1.1 + + + enforce-versions + initialize + + enforce + + + true + + + Snapshot project version (major.minor-SNAPSHOT, e.g. 4.11-SNAPSHOT) is required before deploying release project! + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml new file mode 100644 index 000000000000..8667d011ddce --- /dev/null +++ b/src/main/assembly/src.xml @@ -0,0 +1,123 @@ + + + assembly + + zip + + false + + + true + ${artifactId}-${version} + 755 + true + false + true + + ${groupId}:${artifactId}:${packaging} + + + + META-INF/**/pom.properties + META-INF/MANIFEST.MF + + + + + true + true + ${artifactId}-${version} + 0755 + 0755 + + ${groupId}:${artifactId}:${packaging} + org.hamcrest:hamcrest-core + + + + + + ${artifactId}-${version} + unix + 0644 + + LICENSE + cpl-v10.html + README.html + BUILDING + pom.xml + + + + ${project.build.sourceDirectory} + ${artifactId}-${version} + unix + 0644 + 0644 + + **/*.java + + + + ${project.basedir}/src/main/resources + ${artifactId}-${version} + crlf + 0644 + 0644 + true + + **/* + + + + ${project.build.testSourceDirectory} + ${artifactId}-${version} + unix + 0644 + 0644 + + **/*.java + + + + ${project.basedir}/src/test/resources + ${artifactId}-${version} + crlf + 0644 + 0644 + true + + **/* + + + + ${project.build.directory}/apidocs + ${artifactId}-${version}/javadoc + 0755 + 0755 + + **/* + + + + ${project.basedir}/doc + ${artifactId}-${version}/doc + 0755 + 0755 + + **/* + + + + ${project.build.directory} + ${artifactId}-${version} + 0755 + 0755 + + ${artifactId}-${version}-sources.jar + + + + \ No newline at end of file diff --git a/src/main/config/settings.xml b/src/main/config/settings.xml new file mode 100644 index 000000000000..a8b2459a0b4c --- /dev/null +++ b/src/main/config/settings.xml @@ -0,0 +1,291 @@ + + + + + + + + ${user.home}/.m2/repository + + + + + + + + + + + + + + + + + + + + + + sonatype-nexus-staging + ??? + ??? + 664 + 775 + + 15000 + + + 15000 + 15000 + + + + + + sourceforge-staging + anonymous + saff@mit.edu + 664 + 775 + + 15000 + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/junit/runner/Version.java b/src/main/java/junit/runner/Version.java index 552ce6428aad..8aea5d7564e9 100644 --- a/src/main/java/junit/runner/Version.java +++ b/src/main/java/junit/runner/Version.java @@ -1,18 +1,41 @@ package junit.runner; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + /** * This class defines the current version of JUnit */ public class Version { + private static final String VERSION; + static { + try { + final Properties properties= new Properties(); + InputStream pomProps= getPomPropertiesAsStream("junit"); + if (pomProps == null) pomProps= getPomPropertiesAsStream("junit-dep"); + if (pomProps != null) properties.load(pomProps); + VERSION= properties.getProperty("version", ""); + if (pomProps != null) pomProps.close(); + assert !VERSION.equals("") : "your class loader does not load resources at /META-INF/maven/junit/..."; + } catch (IOException e) { + throw new IllegalStateException(e); + } + } + private Version() { // don't instantiate } public static String id() { - return "4.11-SNAPSHOT"; + return VERSION; } public static void main(String[] args) { System.out.println(id()); } + + private static InputStream getPomPropertiesAsStream(String artifactId) { + return Version.class.getResourceAsStream("/META-INF/maven/junit/" + artifactId + "/pom.properties"); + } } diff --git a/src/main/java/junit/runner/Version.java.template b/src/main/java/junit/runner/Version.java.template deleted file mode 100644 index 3182cfdff399..000000000000 --- a/src/main/java/junit/runner/Version.java.template +++ /dev/null @@ -1,18 +0,0 @@ -package junit.runner; - -/** - * This class defines the current version of JUnit - */ -public class Version { - private Version() { - // don't instantiate - } - - public static String id() { - return "@version@"; - } - - public static void main(String[] args) { - System.out.println(id()); - } -} diff --git a/src/main/javadoc/stylesheet.css b/src/main/javadoc/stylesheet.css new file mode 100644 index 000000000000..032b85c98c6e --- /dev/null +++ b/src/main/javadoc/stylesheet.css @@ -0,0 +1 @@ +/* Javadoc style sheet */ /* makes unvisted linkes red (red bad) */ A {color:red;} /* makes visted linkes the same green as the toolbar (green good) */ A:visited {color:#03A35D;} /* Define colors, fonts and other style attributes here to override the defaults */ /* Page background color */ body { background-color: #FFFFFF } /* Table colors */ .TableHeadingColor { background: #03A35D} /* Green */ .TableSubHeadingColor { background: #03A35D } /* Green */ .TableRowColor { background: #FFFFFF } /* White */ /* Font used in left-hand frame lists */ .FrameTitleFont { font-size: normal; font-family: normal } .FrameHeadingFont { font-size: normal; font-family: normal } .FrameItemFont { font-size: normal; font-family: normal } /* Example of smaller, sans-serif font in frames */ /* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ /* Navigation bar fonts and colors */ .NavBarCell1 { background-color:#03A35D;}/* Green */ .NavBarCell1Rev { background-color:#006400;}/* Dark green */ .NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} .NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} .NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} .NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} \ No newline at end of file diff --git a/src/main/resources/junit/runner/LICENSE b/src/main/resources/junit/runner/LICENSE new file mode 100644 index 000000000000..1aba77acf1b2 --- /dev/null +++ b/src/main/resources/junit/runner/LICENSE @@ -0,0 +1,218 @@ +JUnit + +Common Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial code and + documentation distributed under this Agreement, and + b) in the case of each subsequent Contributor: + + i) changes to the Program, and + + ii) additions to the Program; + + where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are +not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents " mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and +such derivative works, in source code and object code form. + + b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under +Licensed Patents to make, use, sell, offer to sell, import and otherwise +transfer the Contribution of such Contributor, if any, in source code and +object code form. This patent license shall apply to the combination of the +Contribution and the Program if, at the time the Contribution is added by the +Contributor, such addition of the Contribution causes such combination to be +covered by the Licensed Patents. The patent license shall not apply to any +other combinations which include the Contribution. No hardware per se is +licensed hereunder. + + c) Recipient understands that although each Contributor grants the +licenses to its Contributions set forth herein, no assurances are provided by +any Contributor that the Program does not infringe the patent or other +intellectual property rights of any other entity. Each Contributor disclaims +any liability to Recipient for claims brought by any other entity based on +infringement of intellectual property rights or otherwise. As a condition to +exercising the rights and licenses granted hereunder, each Recipient hereby +assumes sole responsibility to secure any other intellectual property rights +needed, if any. For example, if a third party patent license is required to +allow Recipient to distribute the Program, it is Recipient's responsibility to +acquire that license before distributing the Program. + + d) Each Contributor represents that to its knowledge it has sufficient +copyright rights in its Contribution, if any, to grant the copyright license +set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; and + + b) its license agreement: + + i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title +and non-infringement, and implied warranties or conditions of merchantability +and fitness for a particular purpose; + + ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + + iii) states that any provisions which differ from this Agreement are +offered by that Contributor alone and not by any other party; and + + iv) states that source code for the Program is available from such +Contributor, and informs licensees how to obtain it in a reasonable manner on +or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + + b) a copy of this Agreement must be included with each copy of the +Program. + +Contributors may not remove or alter any copyright notices contained within the +Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor +to control, and cooperate with the Commercial Contributor in, the defense and +any related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using +and distributing the Program and assumes all risks associated with its exercise +of rights under this Agreement, including but not limited to the risks and +costs of program errors, compliance with applicable laws, damage to or loss of +data, programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against a Contributor with respect to +a patent applicable to software (including a cross-claim or counterclaim in a +lawsuit), then any patent licenses granted by that Contributor to such +Recipient under this Agreement shall terminate as of the date such litigation +is filed. In addition, if Recipient institutes patent litigation against any +entity (including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software or +hardware) infringes such Recipient's patent(s), then such Recipient's rights +granted under Section 2(b) shall terminate as of the date such litigation is +filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue +and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to time. +No one other than the Agreement Steward has the right to modify this Agreement. +IBM is the initial Agreement Steward. IBM may assign the responsibility to +serve as the Agreement Steward to a suitable separate entity. Each new version +of the Agreement will be given a distinguishing version number. The Program +(including Contributions) may always be distributed subject to the version of +the Agreement under which it was received. In addition, after a new version of +the Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly stated +in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to +the intellectual property of any Contributor under this Agreement, whether +expressly, by implication, estoppel or otherwise. All rights in the Program not +expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial +in any resulting litigation. + diff --git a/src/main/java/junit/runner/logo.gif b/src/main/resources/junit/runner/logo.gif similarity index 100% rename from src/main/java/junit/runner/logo.gif rename to src/main/resources/junit/runner/logo.gif diff --git a/src/main/java/junit/runner/smalllogo.gif b/src/main/resources/junit/runner/smalllogo.gif similarity index 100% rename from src/main/java/junit/runner/smalllogo.gif rename to src/main/resources/junit/runner/smalllogo.gif From 66745341338ec90f36258aa9a50f142d195d99eb Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Sun, 23 Sep 2012 15:56:16 +0200 Subject: [PATCH 02/30] completed deployment Sourcefore and Maven central: verified OK --- pom.xml | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 51a298779bd4..fae3fe0b10a7 100644 --- a/pom.xml +++ b/pom.xml @@ -236,12 +236,11 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. http://sourceforge.net/projects/junit/ - sourceforge-staging - upload.to.sourceforge - ftp://localhost/sourceforge + sonatype-nexus-staging + upload.to.maven.central + https://oss.sonatype.org/content/repositories/snapshots/ @@ -261,12 +260,12 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. org.apache.maven.wagon wagon-ftp - 2.2 + 1.0 org.apache.maven.wagon wagon-http - 2.2 + 1.0 @@ -433,6 +432,27 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ${releaseVersion} + + org.codehaus.mojo + wagon-maven-plugin + 1.0-beta-4 + + + upload-javadoc + deploy + + upload + + + sourceforge-staging + ${project.build.directory} + *.zip,*.jar + ftp://upload.sourceforge.net/ + incoming + + + + From a0f325eeea15dbacdf6ba923b0d746df1f82ff8f Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Wed, 26 Sep 2012 22:28:49 +0200 Subject: [PATCH 03/30] type "make" helps you to build without studying a config of IDE for Maven --- Makefile | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 3 --- 2 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 000000000000..75e28d902f5b --- /dev/null +++ b/Makefile @@ -0,0 +1,59 @@ + SHELL = /bin/sh + ROOT=$(shell pwd) + + RELEASE_VERSION=#(e.g. 4.11) release version without user's prompt if non-empty property value; otherwise prompt + LOCAL_REPO=${user.home}/.m2/repository# Use only single configuration file src/main/config/settings.xml for the build process. + MVN_LOG=$(ROOT)/mvn.log + + RELEASE_VERSION_ARG=-DreleaseVersion=$(RELEASE_VERSION) + LOCAL_REPO_ARG=# -Dmaven.repo.local=$(LOCAL_REPO)# Don't use since src/main/config/settings.xml already specified local repo path. + MVN_ARGS=$(RELEASE_VERSION_ARG) $(LOCAL_REPO_ARG) --errors -s src/main/config/settings.xml# --log-file $(MVN_LOG) + + + MVN_DIR=apache-maven-3.0.4 + MVN_BIN_URL=http://www.us.apache.org/dist/maven/maven-3/3.0.4/binaries + MVN_BIN_EXT=bin.tar.gz + MVN_BIN=$(MVN_DIR)-$(MVN_BIN_EXT) + MVN_URL=$(MVN_BIN_URL)/$(MVN_BIN) + M2_HOME=$(ROOT)/build/maven/$(MVN_DIR) + M2=$(M2_HOME)/bin + #export PATH=$M2:$PATH + export MAVEN_OPTS=-Xms16m -Xmx128m -Dfile.encoding=ISO-8859-1 + +.PHONY: all + +# target: all (currently configure release install) +all: configure release install + +# target: help - Display callable targets. +help: + egrep "^# target:" [Mm]akefile + +# target: configure - Configure build process. +configure: + if [ ! -d $(ROOT)/build/maven/$(MVN_DIR) ] ;then \ + cd $(ROOT)/build/maven; wget $(MVN_URL); \ + cd $(ROOT)/build/maven; tar xvzf $(MVN_BIN); \ + cd $(ROOT)/build/maven; rm -rf $(MVN_BIN); \ + cd $(ROOT)/build/maven; chmod -R a+rX $(MVN_DIR); \ + cd $(ROOT); \ + fi; \ + cd $(ROOT); touch $(MVN_LOG); \ + cd $(ROOT); exec $(M2)/mvn $(MVN_ARGS) --version; \ + cd $(ROOT) + +# target: release - Prompts the user to modify *-SNAPSHOT version to a new release, and updates junit.runner.Version#id(). +release: + #git checkout KentBeck pom.xml + cd $(ROOT); exec $(M2)/mvn $(MVN_ARGS) -P checkSnapshot -f pom.xml release:update-versions; \ # update junit:junit from SNAPSHOT version + cd $(ROOT) + +# target: deploy - Deploys artifacts junit:junit and junit:junit-dep to remote repository Maven central and Sourceforge ftp server. +deploy: + cd $(ROOT); exec $(M2)/mvn $(MVN_ARGS) -P checkRelease -f pom.xml clean deploy; \ # junit:junit deploy + cd $(ROOT) + +# target: install - Installs (and compiles if necessary) the artifacts to local repository including running unit and integration tests, etc. +install: + cd $(ROOT); exec $(M2)/mvn $(MVN_ARGS) -f pom.xml clean install; \ # junit:junit install + cd $(ROOT) diff --git a/pom.xml b/pom.xml index fae3fe0b10a7..14739da31fc9 100644 --- a/pom.xml +++ b/pom.xml @@ -486,9 +486,6 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. checkSnapshot - - true - From 4dc40a200ef47ca0cbed7a73a8c468ce00464ed0 Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Thu, 27 Sep 2012 01:36:20 +0200 Subject: [PATCH 04/30] deleted **/junit/runner/LICENSE --- src/main/resources/junit/runner/LICENSE | 218 ------------------------ 1 file changed, 218 deletions(-) delete mode 100644 src/main/resources/junit/runner/LICENSE diff --git a/src/main/resources/junit/runner/LICENSE b/src/main/resources/junit/runner/LICENSE deleted file mode 100644 index 1aba77acf1b2..000000000000 --- a/src/main/resources/junit/runner/LICENSE +++ /dev/null @@ -1,218 +0,0 @@ -JUnit - -Common Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM -CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - - a) in the case of the initial Contributor, the initial code and - documentation distributed under this Agreement, and - b) in the case of each subsequent Contributor: - - i) changes to the Program, and - - ii) additions to the Program; - - where such changes and/or additions to the Program originate from and are -distributed by that particular Contributor. A Contribution 'originates' from a -Contributor if it was added to the Program by such Contributor itself or anyone -acting on such Contributor's behalf. Contributions do not include additions to -the Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) are -not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents " mean patent claims licensable by a Contributor which are -necessarily infringed by the use or sale of its Contribution alone or when -combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, -including all Contributors. - -2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free copyright license to -reproduce, prepare derivative works of, publicly display, publicly perform, -distribute and sublicense the Contribution of such Contributor, if any, and -such derivative works, in source code and object code form. - - b) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free patent license under -Licensed Patents to make, use, sell, offer to sell, import and otherwise -transfer the Contribution of such Contributor, if any, in source code and -object code form. This patent license shall apply to the combination of the -Contribution and the Program if, at the time the Contribution is added by the -Contributor, such addition of the Contribution causes such combination to be -covered by the Licensed Patents. The patent license shall not apply to any -other combinations which include the Contribution. No hardware per se is -licensed hereunder. - - c) Recipient understands that although each Contributor grants the -licenses to its Contributions set forth herein, no assurances are provided by -any Contributor that the Program does not infringe the patent or other -intellectual property rights of any other entity. Each Contributor disclaims -any liability to Recipient for claims brought by any other entity based on -infringement of intellectual property rights or otherwise. As a condition to -exercising the rights and licenses granted hereunder, each Recipient hereby -assumes sole responsibility to secure any other intellectual property rights -needed, if any. For example, if a third party patent license is required to -allow Recipient to distribute the Program, it is Recipient's responsibility to -acquire that license before distributing the Program. - - d) Each Contributor represents that to its knowledge it has sufficient -copyright rights in its Contribution, if any, to grant the copyright license -set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under -its own license agreement, provided that: - - a) it complies with the terms and conditions of this Agreement; and - - b) its license agreement: - - i) effectively disclaims on behalf of all Contributors all warranties and -conditions, express and implied, including warranties or conditions of title -and non-infringement, and implied warranties or conditions of merchantability -and fitness for a particular purpose; - - ii) effectively excludes on behalf of all Contributors all liability for -damages, including direct, indirect, special, incidental and consequential -damages, such as lost profits; - - iii) states that any provisions which differ from this Agreement are -offered by that Contributor alone and not by any other party; and - - iv) states that source code for the Program is available from such -Contributor, and informs licensees how to obtain it in a reasonable manner on -or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - - a) it must be made available under this Agreement; and - - b) a copy of this Agreement must be included with each copy of the -Program. - -Contributors may not remove or alter any copyright notices contained within the -Program. - -Each Contributor must identify itself as the originator of its Contribution, if -any, in a manner that reasonably allows subsequent Recipients to identify the -originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with -respect to end users, business partners and the like. While this license is -intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a manner -which does not create potential liability for other Contributors. Therefore, if -a Contributor includes the Program in a commercial product offering, such -Contributor ("Commercial Contributor") hereby agrees to defend and indemnify -every other Contributor ("Indemnified Contributor") against any losses, damages -and costs (collectively "Losses") arising from claims, lawsuits and other legal -actions brought by a third party against the Indemnified Contributor to the -extent caused by the acts or omissions of such Commercial Contributor in -connection with its distribution of the Program in a commercial product -offering. The obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In order -to qualify, an Indemnified Contributor must: a) promptly notify the Commercial -Contributor in writing of such claim, and b) allow the Commercial Contributor -to control, and cooperate with the Commercial Contributor in, the defense and -any related settlement negotiations. The Indemnified Contributor may -participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product -offering, Product X. That Contributor is then a Commercial Contributor. If that -Commercial Contributor then makes performance claims, or offers warranties -related to Product X, those performance claims and warranties are such -Commercial Contributor's responsibility alone. Under this section, the -Commercial Contributor would have to defend claims against the other -Contributors related to those performance claims and warranties, and if a court -requires any other Contributor to pay any damages as a result, the Commercial -Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each -Recipient is solely responsible for determining the appropriateness of using -and distributing the Program and assumes all risks associated with its exercise -of rights under this Agreement, including but not limited to the risks and -costs of program errors, compliance with applicable laws, damage to or loss of -data, programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY -CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST -PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY -WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS -GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable -law, it shall not affect the validity or enforceability of the remainder of the -terms of this Agreement, and without further action by the parties hereto, such -provision shall be reformed to the minimum extent necessary to make such -provision valid and enforceable. - -If Recipient institutes patent litigation against a Contributor with respect to -a patent applicable to software (including a cross-claim or counterclaim in a -lawsuit), then any patent licenses granted by that Contributor to such -Recipient under this Agreement shall terminate as of the date such litigation -is filed. In addition, if Recipient institutes patent litigation against any -entity (including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other software or -hardware) infringes such Recipient's patent(s), then such Recipient's rights -granted under Section 2(b) shall terminate as of the date such litigation is -filed. - -All Recipient's rights under this Agreement shall terminate if it fails to -comply with any of the material terms or conditions of this Agreement and does -not cure such failure in a reasonable period of time after becoming aware of -such noncompliance. If all Recipient's rights under this Agreement terminate, -Recipient agrees to cease use and distribution of the Program as soon as -reasonably practicable. However, Recipient's obligations under this Agreement -and any licenses granted by Recipient relating to the Program shall continue -and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in -order to avoid inconsistency the Agreement is copyrighted and may only be -modified in the following manner. The Agreement Steward reserves the right to -publish new versions (including revisions) of this Agreement from time to time. -No one other than the Agreement Steward has the right to modify this Agreement. -IBM is the initial Agreement Steward. IBM may assign the responsibility to -serve as the Agreement Steward to a suitable separate entity. Each new version -of the Agreement will be given a distinguishing version number. The Program -(including Contributions) may always be distributed subject to the version of -the Agreement under which it was received. In addition, after a new version of -the Agreement is published, Contributor may elect to distribute the Program -(including its Contributions) under the new version. Except as expressly stated -in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to -the intellectual property of any Contributor under this Agreement, whether -expressly, by implication, estoppel or otherwise. All rights in the Program not -expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the -intellectual property laws of the United States of America. No party to this -Agreement will bring a legal action under this Agreement more than one year -after the cause of action arose. Each party waives its rights to a jury trial -in any resulting litigation. - From 36101e7ea3e3952fcecae2cb9563040a5b24cabf Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Fri, 28 Sep 2012 03:22:29 +0200 Subject: [PATCH 05/30] added documentation + improvements --- pom.xml | 136 ++++++++++--- src/main/assembly/src.xml | 2 +- src/main/config/settings.xml | 247 +----------------------- src/main/java/junit/runner/Version.java | 29 +-- src/main/javadoc/stylesheet.css | 2 +- 5 files changed, 133 insertions(+), 283 deletions(-) diff --git a/pom.xml b/pom.xml index 14739da31fc9..c3a6ba3f087e 100644 --- a/pom.xml +++ b/pom.xml @@ -212,9 +212,12 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - Tibor Digana + JUnit contributors + JUnit + junit@yahoogroups.com + https://github.com/KentBeck/junit/graphs/contributors - developer + developers @@ -235,14 +238,24 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. http://sourceforge.net/projects/junit/ - + + sonatype-nexus-staging upload.to.maven.central https://oss.sonatype.org/content/repositories/snapshots/ - + + @@ -257,6 +270,13 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + org.apache.maven.wagon wagon-ftp @@ -269,7 +289,29 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + org.codehaus.mojo build-helper-maven-plugin 1.7 @@ -288,6 +330,11 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + maven-enforcer-plugin 1.1.1 @@ -303,15 +350,15 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. Current version of Maven ${maven.version} required to build the project should be ${project.prerequisites.maven}, or higher! ${project.prerequisites.maven} - - - Current JDK version ${java.version} should be ${jdkVersion}, or higher! - ${jdkVersion} - - - Best Practice is to never define repositories in pom.xml (use a repository manager instead). - - + + + Current JDK version ${java.version} should be ${jdkVersion}, or higher! + ${jdkVersion} + + + Best Practice is to never define repositories in pom.xml (use a repository manager instead). + + No Snapshots Dependencies Allowed! @@ -320,6 +367,9 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + maven-compiler-plugin 2.5.1 @@ -336,6 +386,10 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + maven-surefire-plugin 2.12.3 @@ -343,15 +397,12 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. true false - - - org.apache.maven.surefire - surefire-junit47 - 2.12.3 - - + maven-source-plugin 2.2 @@ -365,12 +416,17 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + maven-javadoc-plugin 2.8.1 attach-javadoc - prepare-package + package jar @@ -407,6 +463,11 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + maven-assembly-plugin 2.3 @@ -426,6 +487,14 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + maven-release-plugin 2.3.2 @@ -433,12 +502,18 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + org.codehaus.mojo wagon-maven-plugin 1.0-beta-4 - upload-javadoc + upload-to-sourceforge deploy upload @@ -458,6 +533,11 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. checkRelease + @@ -486,6 +566,14 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. checkSnapshot + diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml index 8667d011ddce..2bcdd960b261 100644 --- a/src/main/assembly/src.xml +++ b/src/main/assembly/src.xml @@ -33,7 +33,7 @@ 0755 ${groupId}:${artifactId}:${packaging} - org.hamcrest:hamcrest-core + org.hamcrest:hamcrest-core diff --git a/src/main/config/settings.xml b/src/main/config/settings.xml index a8b2459a0b4c..fd18d03261a8 100644 --- a/src/main/config/settings.xml +++ b/src/main/config/settings.xml @@ -1,48 +1,4 @@  - - - - @@ -52,91 +8,19 @@ under the License. | Default: ~/.m2/repository ### The path to the local repository maven in JUnit Project ### - See Makefile of a junit build process at the top level files descriptive of the project pom.xml and pom-dep.xml. + See Makefile of a junit build process at the top level files descriptive of the project pom.xml. The variable LOCAL_REPO=~/.m2/repository already specified local repo. - In pom.xml and pom-dep.xml, we rely on a value ${user.home}/.m2/repository. + In pom.xml, we rely on a value ${user.home}/.m2/repository. The maven-invoker-plugin changes basedir upon nested projects and therefore it cannot rely on this relative path in . An absolute path is not acceptable, because it's platform dependent; however can be used in IDE. The system property "maven.repo.local" has higher priority in the build process where declared. --> ${user.home}/.m2/repository - - - - - - - - - - - - - - - - + - - - sonatype-nexus-staging @@ -165,127 +49,4 @@ under the License. - - - - - - - - - - - - - - diff --git a/src/main/java/junit/runner/Version.java b/src/main/java/junit/runner/Version.java index 8aea5d7564e9..04d326cec4ca 100644 --- a/src/main/java/junit/runner/Version.java +++ b/src/main/java/junit/runner/Version.java @@ -8,20 +8,7 @@ * This class defines the current version of JUnit */ public class Version { - private static final String VERSION; - static { - try { - final Properties properties= new Properties(); - InputStream pomProps= getPomPropertiesAsStream("junit"); - if (pomProps == null) pomProps= getPomPropertiesAsStream("junit-dep"); - if (pomProps != null) properties.load(pomProps); - VERSION= properties.getProperty("version", ""); - if (pomProps != null) pomProps.close(); - assert !VERSION.equals("") : "your class loader does not load resources at /META-INF/maven/junit/..."; - } catch (IOException e) { - throw new IllegalStateException(e); - } - } + private static final String VERSION = getVersion(); private Version() { // don't instantiate @@ -38,4 +25,18 @@ public static void main(String[] args) { private static InputStream getPomPropertiesAsStream(String artifactId) { return Version.class.getResourceAsStream("/META-INF/maven/junit/" + artifactId + "/pom.properties"); } + + private static String getVersion() { + try { + final Properties properties= new Properties(); + InputStream pomProps= getPomPropertiesAsStream("junit"); + if (pomProps != null) properties.load(pomProps); + String version= properties.getProperty("version", ""); + if (pomProps != null) pomProps.close(); + assert !version.equals("") : "your class loader does not load resources at /META-INF/maven/junit/..."; + return version; + } catch (IOException e) { + throw new IllegalStateException(e); + } + } } diff --git a/src/main/javadoc/stylesheet.css b/src/main/javadoc/stylesheet.css index 032b85c98c6e..2419f7b364aa 100644 --- a/src/main/javadoc/stylesheet.css +++ b/src/main/javadoc/stylesheet.css @@ -1 +1 @@ -/* Javadoc style sheet */ /* makes unvisted linkes red (red bad) */ A {color:red;} /* makes visted linkes the same green as the toolbar (green good) */ A:visited {color:#03A35D;} /* Define colors, fonts and other style attributes here to override the defaults */ /* Page background color */ body { background-color: #FFFFFF } /* Table colors */ .TableHeadingColor { background: #03A35D} /* Green */ .TableSubHeadingColor { background: #03A35D } /* Green */ .TableRowColor { background: #FFFFFF } /* White */ /* Font used in left-hand frame lists */ .FrameTitleFont { font-size: normal; font-family: normal } .FrameHeadingFont { font-size: normal; font-family: normal } .FrameItemFont { font-size: normal; font-family: normal } /* Example of smaller, sans-serif font in frames */ /* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ /* Navigation bar fonts and colors */ .NavBarCell1 { background-color:#03A35D;}/* Green */ .NavBarCell1Rev { background-color:#006400;}/* Dark green */ .NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} .NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} .NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} .NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} \ No newline at end of file +/* Javadoc style sheet */ /* makes unvisited links red (red bad) */ A {color:red;} /* makes visited links the same green as the toolbar (green good) */ A:visited {color:#03A35D;} /* Define colors, fonts and other style attributes here to override the defaults */ /* Page background color */ body { background-color: #FFFFFF } /* Table colors */ .TableHeadingColor { background: #03A35D} /* Green */ .TableSubHeadingColor { background: #03A35D } /* Green */ .TableRowColor { background: #FFFFFF } /* White */ /* Font used in left-hand frame lists */ .FrameTitleFont { font-size: normal; font-family: normal } .FrameHeadingFont { font-size: normal; font-family: normal } .FrameItemFont { font-size: normal; font-family: normal } /* Example of smaller, sans-serif font in frames */ /* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ /* Navigation bar fonts and colors */ .NavBarCell1 { background-color:#03A35D;}/* Green */ .NavBarCell1Rev { background-color:#006400;}/* Dark green */ .NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} .NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} .NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} .NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} \ No newline at end of file From ab70e74a08da3d7773723187bfef806250c9da80 Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Fri, 28 Sep 2012 23:14:22 +0200 Subject: [PATCH 06/30] signing all project artifacts before deployment --- pom.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pom.xml b/pom.xml index c3a6ba3f087e..8a9f674cf46f 100644 --- a/pom.xml +++ b/pom.xml @@ -501,6 +501,25 @@ GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ${releaseVersion} + + + maven-gpg-plugin + 1.4 + + + gpg-sign + install + + sign + + + + 4.0.0 From 8b0d35b5478c62d2b07a147010ab8bfaee869f3a Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Sat, 22 Dec 2012 19:40:10 +0100 Subject: [PATCH 11/30] fix double dashes in a comment --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d817ac84269..41399556aa80 100644 --- a/pom.xml +++ b/pom.xml @@ -336,7 +336,8 @@ The goal is to sign all artifacts so that the user may verify them before downloading. The automatic build system may reuire your key ID, and passphrase specified using system properties: -Dgpg.passphrase="" -Dgpg.keyname="" - In order to create the key pair, use the command "gpg --gen-key". + In order to create the key pair, use the command "gpg ––gen-key". + (–– stands for double dash) --> maven-gpg-plugin 1.4 From 8d8daa4f3fa0c23ef0c47ff8a97a370d3b3d63af Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Sat, 22 Dec 2012 22:08:01 +0100 Subject: [PATCH 12/30] version 4.12-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41399556aa80..d4e6be1877ff 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ junit junit - 4.11-SNAPSHOT + 4.12-SNAPSHOT JUnit http://junit.org From 9e09169bb275c8e5e4510011714172f6e42be09f Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Sat, 22 Dec 2012 22:52:06 +0100 Subject: [PATCH 13/30] removed profile 'checkSnapshot', added profile 'sign' --- pom.xml | 57 ++++++++++++++------------------------------------------- 1 file changed, 14 insertions(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index d4e6be1877ff..08e124666657 100644 --- a/pom.xml +++ b/pom.xml @@ -331,26 +331,6 @@ ${releaseVersion} - - - maven-gpg-plugin - 1.4 - - - gpg-sign - install - - sign - - - - - maven-enforcer-plugin - 1.1.1 + + maven-gpg-plugin + 1.4 - enforce-versions - initialize + gpg-sign + install - enforce + sign - - true - - - Snapshot project version (major.minor-SNAPSHOT, e.g. 4.11-SNAPSHOT) is required before deploying release project! - - - - - - From b311f2602a9cbe7947a72dc7d04ac0b4b5e596b3 Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Sun, 23 Dec 2012 08:56:37 +0100 Subject: [PATCH 14/30] same as ANT => src/main/... not on sourceforge ftp --- src/main/assembly/src.xml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml index 2bcdd960b261..7b3c8f243cdc 100644 --- a/src/main/assembly/src.xml +++ b/src/main/assembly/src.xml @@ -50,27 +50,6 @@ pom.xml - - ${project.build.sourceDirectory} - ${artifactId}-${version} - unix - 0644 - 0644 - - **/*.java - - - - ${project.basedir}/src/main/resources - ${artifactId}-${version} - crlf - 0644 - 0644 - true - - **/* - - ${project.build.testSourceDirectory} ${artifactId}-${version} From c409227d249ece10f6634bb14860eb657cfc7560 Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Sun, 23 Dec 2012 09:12:52 +0100 Subject: [PATCH 15/30] same as ANT => no 'Use' pages in javadoc --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08e124666657..79c9570be77d 100644 --- a/pom.xml +++ b/pom.xml @@ -268,7 +268,7 @@ false true true - true + false JUnit API UTF-8 en From d24e5d821964508246b9670a08affab50e3ca87c Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Sun, 23 Dec 2012 09:15:31 +0100 Subject: [PATCH 16/30] same as ANT => excluded internal packages --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79c9570be77d..8a61da33e523 100644 --- a/pom.xml +++ b/pom.xml @@ -279,7 +279,7 @@ http://docs.oracle.com/javase/1.5.0/docs/api/index.html - junit.*,org.junit.internal.*,org.junit.experimental.theories.internal.* + junit.*,*.internal,*.internal.* true 32m 128m From a3838b9ae01a913967997712d7fa4ec2f8e80025 Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Sun, 23 Dec 2012 15:17:36 +0100 Subject: [PATCH 17/30] removed unnecessary plugin --- pom.xml | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/pom.xml b/pom.xml index 8a61da33e523..cb75e4f508e2 100644 --- a/pom.xml +++ b/pom.xml @@ -130,35 +130,6 @@ The following plugins are ordered according the Maven build lifecycle. http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html --> - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - parse-project-version - validate - - parse-version - - - junit - ${project.version} - - - - + org.codehaus.mojo + truezip-maven-plugin + 1.1 + + + rename LICENSE to LICENSE.txt in jar/ + package + + move + + + ${project.build.directory}/${project.build.finalName}.jar/LICENSE + ${project.build.directory}/${project.build.finalName}.jar/LICENSE.txt + + + + rename LICENSE to LICENSE.txt in sources jar + package + + move + + + ${project.build.directory}/${project.build.finalName}-sources.jar/LICENSE + ${project.build.directory}/${project.build.finalName}-sources.jar/LICENSE.txt + + + + rename LICENSE to LICENSE.txt in zip + package + + move + + + ${project.build.directory}/${project.build.finalName}.zip/${project.build.finalName}/LICENSE + ${project.build.directory}/${project.build.finalName}.zip/${project.build.finalName}/LICENSE.txt + + + + Current version of Maven ${maven.version} required to build the project should be ${project.prerequisites.maven}, or higher! - ${project.prerequisites.maven} + [${project.prerequisites.maven},) Current JDK version ${java.version} should be ${jdkVersion}, or higher! From 4dc82ecc92c2089411af471b348c5b7e738dd3ce Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Mon, 7 Jan 2013 01:49:49 +0100 Subject: [PATCH 20/30] deleting the sh file --- Makefile | 59 -------------------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 75e28d902f5b..000000000000 --- a/Makefile +++ /dev/null @@ -1,59 +0,0 @@ - SHELL = /bin/sh - ROOT=$(shell pwd) - - RELEASE_VERSION=#(e.g. 4.11) release version without user's prompt if non-empty property value; otherwise prompt - LOCAL_REPO=${user.home}/.m2/repository# Use only single configuration file src/main/config/settings.xml for the build process. - MVN_LOG=$(ROOT)/mvn.log - - RELEASE_VERSION_ARG=-DreleaseVersion=$(RELEASE_VERSION) - LOCAL_REPO_ARG=# -Dmaven.repo.local=$(LOCAL_REPO)# Don't use since src/main/config/settings.xml already specified local repo path. - MVN_ARGS=$(RELEASE_VERSION_ARG) $(LOCAL_REPO_ARG) --errors -s src/main/config/settings.xml# --log-file $(MVN_LOG) - - - MVN_DIR=apache-maven-3.0.4 - MVN_BIN_URL=http://www.us.apache.org/dist/maven/maven-3/3.0.4/binaries - MVN_BIN_EXT=bin.tar.gz - MVN_BIN=$(MVN_DIR)-$(MVN_BIN_EXT) - MVN_URL=$(MVN_BIN_URL)/$(MVN_BIN) - M2_HOME=$(ROOT)/build/maven/$(MVN_DIR) - M2=$(M2_HOME)/bin - #export PATH=$M2:$PATH - export MAVEN_OPTS=-Xms16m -Xmx128m -Dfile.encoding=ISO-8859-1 - -.PHONY: all - -# target: all (currently configure release install) -all: configure release install - -# target: help - Display callable targets. -help: - egrep "^# target:" [Mm]akefile - -# target: configure - Configure build process. -configure: - if [ ! -d $(ROOT)/build/maven/$(MVN_DIR) ] ;then \ - cd $(ROOT)/build/maven; wget $(MVN_URL); \ - cd $(ROOT)/build/maven; tar xvzf $(MVN_BIN); \ - cd $(ROOT)/build/maven; rm -rf $(MVN_BIN); \ - cd $(ROOT)/build/maven; chmod -R a+rX $(MVN_DIR); \ - cd $(ROOT); \ - fi; \ - cd $(ROOT); touch $(MVN_LOG); \ - cd $(ROOT); exec $(M2)/mvn $(MVN_ARGS) --version; \ - cd $(ROOT) - -# target: release - Prompts the user to modify *-SNAPSHOT version to a new release, and updates junit.runner.Version#id(). -release: - #git checkout KentBeck pom.xml - cd $(ROOT); exec $(M2)/mvn $(MVN_ARGS) -P checkSnapshot -f pom.xml release:update-versions; \ # update junit:junit from SNAPSHOT version - cd $(ROOT) - -# target: deploy - Deploys artifacts junit:junit and junit:junit-dep to remote repository Maven central and Sourceforge ftp server. -deploy: - cd $(ROOT); exec $(M2)/mvn $(MVN_ARGS) -P checkRelease -f pom.xml clean deploy; \ # junit:junit deploy - cd $(ROOT) - -# target: install - Installs (and compiles if necessary) the artifacts to local repository including running unit and integration tests, etc. -install: - cd $(ROOT); exec $(M2)/mvn $(MVN_ARGS) -f pom.xml clean install; \ # junit:junit install - cd $(ROOT) From a1599c8209d4d7177a16745a500e34b898e49174 Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Mon, 7 Jan 2013 01:58:28 +0100 Subject: [PATCH 21/30] LICENSE->LICENSE.txt, removed truezip-maven-plugin --- LICENSE => LICENSE.txt | 0 pom.xml | 45 +-------------------------------------- src/main/assembly/src.xml | 2 +- 3 files changed, 2 insertions(+), 45 deletions(-) rename LICENSE => LICENSE.txt (100%) diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/pom.xml b/pom.xml index ef332bf76946..e2ff11616d4f 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ ${project.basedir} - LICENSE + LICENSE.txt @@ -288,49 +288,6 @@ - - - org.codehaus.mojo - truezip-maven-plugin - 1.1 - - - rename LICENSE to LICENSE.txt in jar/ - package - - move - - - ${project.build.directory}/${project.build.finalName}.jar/LICENSE - ${project.build.directory}/${project.build.finalName}.jar/LICENSE.txt - - - - rename LICENSE to LICENSE.txt in sources jar - package - - move - - - ${project.build.directory}/${project.build.finalName}-sources.jar/LICENSE - ${project.build.directory}/${project.build.finalName}-sources.jar/LICENSE.txt - - - - rename LICENSE to LICENSE.txt in zip - package - - move - - - ${project.build.directory}/${project.build.finalName}.zip/${project.build.finalName}/LICENSE - ${project.build.directory}/${project.build.finalName}.zip/${project.build.finalName}/LICENSE.txt - - - - - - org.apache.maven.wagon - wagon-ftp - 1.0 - org.apache.maven.wagon wagon-http @@ -268,13 +263,13 @@ maven-assembly-plugin 2.3 - assembly ${project.artifactId}-${project.version}.zip for sourceforge + assembly ${project.artifactId}-${project.version}.zip package single @@ -303,33 +298,6 @@ ${releaseVersion} - - - org.codehaus.mojo - wagon-maven-plugin - 1.0-beta-4 - - - upload-to-sourceforge - deploy - - upload - - - sourceforge-staging - ${project.build.directory} - *.zip,*.jar - ftp://upload.sourceforge.net/ - incoming - - - - diff --git a/src/main/config/settings.xml b/src/main/config/settings.xml index 261049fd342f..4ce892763108 100644 --- a/src/main/config/settings.xml +++ b/src/main/config/settings.xml @@ -37,16 +37,6 @@ - - - sourceforge-staging - anonymous - david@saff.net - 664 - 775 - - 15000 - diff --git a/stylesheet.css b/stylesheet.css deleted file mode 100644 index 032b85c98c6e..000000000000 --- a/stylesheet.css +++ /dev/null @@ -1 +0,0 @@ -/* Javadoc style sheet */ /* makes unvisted linkes red (red bad) */ A {color:red;} /* makes visted linkes the same green as the toolbar (green good) */ A:visited {color:#03A35D;} /* Define colors, fonts and other style attributes here to override the defaults */ /* Page background color */ body { background-color: #FFFFFF } /* Table colors */ .TableHeadingColor { background: #03A35D} /* Green */ .TableSubHeadingColor { background: #03A35D } /* Green */ .TableRowColor { background: #FFFFFF } /* White */ /* Font used in left-hand frame lists */ .FrameTitleFont { font-size: normal; font-family: normal } .FrameHeadingFont { font-size: normal; font-family: normal } .FrameItemFont { font-size: normal; font-family: normal } /* Example of smaller, sans-serif font in frames */ /* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ /* Navigation bar fonts and colors */ .NavBarCell1 { background-color:#03A35D;}/* Green */ .NavBarCell1Rev { background-color:#006400;}/* Dark green */ .NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} .NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} .NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} .NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} \ No newline at end of file From 6f71f80a3f81d45a79fa646da0865990837d2ab5 Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Mon, 7 Jan 2013 21:31:16 +0100 Subject: [PATCH 23/30] removed ZIP, refactoring, enabled snaphosts/releases Maven Central --- pom.xml | 36 ++----------- src/main/assembly/src.xml | 102 ----------------------------------- src/main/config/settings.xml | 79 ++++++++++++++------------- 3 files changed, 48 insertions(+), 169 deletions(-) delete mode 100644 src/main/assembly/src.xml diff --git a/pom.xml b/pom.xml index 650c31c525ec..51a225b2a70f 100644 --- a/pom.xml +++ b/pom.xml @@ -73,19 +73,18 @@ the Snapshot Repository of the Maven Central. --> - sonatype-nexus-staging - upload.to.maven.central + maven-central-snapshots + upload.to.maven.central.snapshots https://oss.sonatype.org/content/repositories/snapshots/ - sonatype-nexus-staging + maven-central upload.to.maven.central https://oss.sonatype.org/service/local/staging/deploy/maven2/ - --> @@ -259,30 +258,6 @@ - - - maven-assembly-plugin - 2.3 - - - assembly ${project.artifactId}-${project.version}.zip - package - - single - - - false - - src/main/assembly/src.xml - - - - - maven-release-plugin 2.3.2 diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml deleted file mode 100644 index 35bb8953411e..000000000000 --- a/src/main/assembly/src.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - assembly - - zip - - false - - - true - ${artifactId}-${version} - 755 - true - false - true - - ${groupId}:${artifactId}:${packaging} - - - - META-INF/**/pom.properties - META-INF/MANIFEST.MF - - - - - true - true - ${artifactId}-${version} - 0755 - 0755 - - ${groupId}:${artifactId}:${packaging} - org.hamcrest:hamcrest-core - - - - - - ${artifactId}-${version} - unix - 0644 - - LICENSE.txt - cpl-v10.html - README.html - BUILDING - pom.xml - - - - ${project.build.testSourceDirectory} - ${artifactId}-${version} - unix - 0644 - 0644 - - **/*.java - - - - ${project.basedir}/src/test/resources - ${artifactId}-${version} - crlf - 0644 - 0644 - true - - **/* - - - - ${project.build.directory}/apidocs - ${artifactId}-${version}/javadoc - 0755 - 0755 - - **/* - - - - ${project.basedir}/doc - ${artifactId}-${version}/doc - 0755 - 0755 - - **/* - - - - ${project.build.directory} - ${artifactId}-${version} - 0755 - 0755 - - ${artifactId}-${version}-sources.jar - - - - \ No newline at end of file diff --git a/src/main/config/settings.xml b/src/main/config/settings.xml index 4ce892763108..63ff169b6d6b 100644 --- a/src/main/config/settings.xml +++ b/src/main/config/settings.xml @@ -2,41 +2,48 @@ - - ${user.home}/.m2/repository - - - - - sonatype-nexus-staging - ??? - ??? - 664 - 775 - - 15000 - - - 15000 - 15000 - - - - - + ${user.home}/.m2/repository + + + + + maven-central + ??? + ??? + 664 + 775 + + 15000 + + + 15000 + 15000 + + + + + + maven-central-snapshots + ??? + ??? + 664 + 775 + + 15000 + + + 15000 + 15000 + + + + + From 535ad1c6a96d338518ad5a9fd4142640cda1b931 Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Mon, 7 Jan 2013 22:18:39 +0100 Subject: [PATCH 24/30] Version.java update - same principle like in ANT --- pom.xml | 24 +++++++++++++++++ src/main/java/junit/runner/Version.java | 26 +------------------ .../java/junit/runner/Version.java.template | 18 +++++++++++++ 3 files changed, 43 insertions(+), 25 deletions(-) create mode 100644 src/main/java/junit/runner/Version.java.template diff --git a/pom.xml b/pom.xml index 51a225b2a70f..1f8cd50b3753 100644 --- a/pom.xml +++ b/pom.xml @@ -162,6 +162,30 @@ + + + com.google.code.maven-replacer-plugin + maven-replacer-plugin + 1.3.8 + + + process-sources + + replace + + + + + false + src/main/java/junit/runner/Version.java.template + src/main/java/junit/runner/Version.java + false + @version@ + ${project.version} + + - - maven-central-snapshots - upload.to.maven.central.snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - - maven-central - upload.to.maven.central - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - ${project.basedir}/src/main/resources - - - ${project.basedir} - - LICENSE.txt - - - - - - - org.apache.maven.wagon - wagon-http - 1.0 - - - - - - - maven-enforcer-plugin - 1.1.1 - - - enforce-versions - initialize - - enforce - - - true - - - - Current version of Maven ${maven.version} required to build the project should be ${project.prerequisites.maven}, or higher! - [${project.prerequisites.maven},) - - - Current JDK version ${java.version} should be ${jdkVersion}, or higher! - ${jdkVersion} - - - Best Practice is to never define repositories in pom.xml (use a repository manager instead). - - - No Snapshots Dependencies Allowed! - - - - - - - - - com.google.code.maven-replacer-plugin - maven-replacer-plugin - 1.3.8 - - - process-sources - - replace - - - - - false - src/main/java/junit/runner/Version.java.template - src/main/java/junit/runner/Version.java - false - @version@ - ${project.version} - - - - - maven-compiler-plugin - 2.5.1 - - ${project.build.sourceEncoding} - ${jdkVersion} - ${jdkVersion} - 1.5 - true - true - true - true - -Xlint:unchecked - 128m - - - - - maven-surefire-plugin - 2.12.3 - - org/junit/tests/AllTests.java - true - false - - - - - maven-source-plugin - 2.2 - - - attach-sources - prepare-package - - jar-no-fork - - - - - - - maven-javadoc-plugin - 2.8.1 - - - attach-javadoc - package - - jar - - - ${basedir}/src/main/javadoc/stylesheet.css - protected - false - false - false - true - true - false - JUnit API - UTF-8 - en - 1.5 - - - api_1.5 - http://docs.oracle.com/javase/1.5.0/docs/api/index.html - - - junit.*,*.internal,*.internal.* - true - 32m - 128m - true - true - - org.hamcrest:hamcrest-core:* - - - - - - - - maven-release-plugin - 2.3.2 - - ${releaseVersion} - - - - - - - checkRelease - - - - - maven-enforcer-plugin - 1.1.1 - - - enforce-versions - initialize - - enforce - - - true - - - No Snapshot Project Allowed! - - - - - - - - - - - sign - - - - - - maven-gpg-plugin - 1.4 - - - gpg-sign - install - - sign - - - - - - - - + junit + junit + 4.12-SNAPSHOT + + JUnit + http://junit.org + JUnit is a unit testing framework for Java, created by Erich Gamma and Kent Beck. + + JUnit + http://www.junit.org + + 2002 + + + JUnit Mailing List + junit@yahoogroups.com + http://tech.groups.yahoo.com/group/junit/ + + + + + Common Public License Version 1.0 + http://www.opensource.org/licenses/cpl1.0.txt + repo + + + + scm:git:git://github.com/KentBeck/junit.git + scm:git:git@github.com:KentBeck/junit.git + http://github.com/KentBeck/junit/tree/master + + + + dsaff + David Saff + david@saff.net + + + + + JUnit contributors + JUnit + junit@yahoogroups.com + https://github.com/KentBeck/junit/graphs/contributors + + developers + + + + + 1.3 + 1.5 + ISO-8859-1 + + + 3.0.4 + + + + org.hamcrest + hamcrest-core + ${hamcrestVersion} + + + + https://github.com/KentBeck/junit/wiki/Download-and-Install + + + maven-central-snapshots + upload.to.maven.central.snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + + maven-central + upload.to.maven.central + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + ${project.basedir}/src/main/resources + + + ${project.basedir} + + LICENSE.txt + + + + + + + org.apache.maven.wagon + wagon-http + 1.0 + + + + + + + maven-enforcer-plugin + 1.1.1 + + + enforce-versions + initialize + + enforce + + + true + + + + Current version of Maven ${maven.version} required to build the project should be ${project.prerequisites.maven}, or higher! + [${project.prerequisites.maven},) + + + Current JDK version ${java.version} should be ${jdkVersion}, or higher! + ${jdkVersion} + + + Best Practice is to never define repositories in pom.xml (use a repository manager instead). + + + No Snapshots Dependencies Allowed! + + + + + + + + + com.google.code.maven-replacer-plugin + maven-replacer-plugin + 1.3.8 + + + process-sources + + replace + + + + + false + src/main/java/junit/runner/Version.java.template + src/main/java/junit/runner/Version.java + false + @version@ + ${project.version} + + + + + maven-compiler-plugin + 2.5.1 + + ${project.build.sourceEncoding} + ${jdkVersion} + ${jdkVersion} + 1.5 + true + true + true + true + -Xlint:unchecked + 128m + + + + + maven-surefire-plugin + 2.12.3 + + org/junit/tests/AllTests.java + true + false + + + + + maven-source-plugin + 2.2 + + + attach-sources + prepare-package + + jar-no-fork + + + + + + + maven-javadoc-plugin + 2.8.1 + + + attach-javadoc + package + + jar + + + ${basedir}/src/main/javadoc/stylesheet.css + protected + false + false + false + true + true + false + JUnit API + UTF-8 + en + 1.5 + + + api_1.5 + http://docs.oracle.com/javase/1.5.0/docs/api/index.html + + + junit.*,*.internal,*.internal.* + true + 32m + 128m + true + true + + org.hamcrest:hamcrest-core:* + + + + + + + + maven-release-plugin + 2.3.2 + + ${releaseVersion} + + + + + + + checkRelease + + + + + maven-enforcer-plugin + 1.1.1 + + + enforce-versions + initialize + + enforce + + + true + + + No Snapshot Project Allowed! + + + + + + + + + + + sign + + + + + + maven-gpg-plugin + 1.4 + + + gpg-sign + install + + sign + + + + + + + + \ No newline at end of file From 9eb408acdd1c07cbfc8349d4632653331ebc42b5 Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Tue, 8 Jan 2013 00:39:05 +0100 Subject: [PATCH 26/30] removed release-plugin --- pom.xml | 52 ++-------------------------------------------------- 1 file changed, 2 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index 43d8db0bac5e..4e9c09971511 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@  -4.0.0 + 4.0.0 junit junit @@ -282,61 +282,13 @@ - - - maven-release-plugin - 2.3.2 - - ${releaseVersion} - - - - checkRelease - - - - - maven-enforcer-plugin - 1.1.1 - - - enforce-versions - initialize - - enforce - - - true - - - No Snapshot Project Allowed! - - - - - - - - - sign From e7ad65f149a1d9bf55dc50f69ee7f7cabe7a3ccb Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Tue, 8 Jan 2013 21:56:37 +0100 Subject: [PATCH 27/30] Jenkins is using custom `localRepository` --- src/main/config/settings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/config/settings.xml b/src/main/config/settings.xml index 63ff169b6d6b..d602dde8294e 100644 --- a/src/main/config/settings.xml +++ b/src/main/config/settings.xml @@ -2,11 +2,12 @@ + ${user.home}/.m2/repository + --> maven-javadoc-plugin 2.8.1 From a7092c4f4b4a6d7a89262b8cd83712e6e1e7df3f Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Tue, 8 Jan 2013 22:46:11 +0100 Subject: [PATCH 29/30] assignation + settings reference --- src/main/config/settings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/config/settings.xml b/src/main/config/settings.xml index d602dde8294e..2b91113182c7 100644 --- a/src/main/config/settings.xml +++ b/src/main/config/settings.xml @@ -1,4 +1,10 @@  + From 561fb840af9d00abab5449f704a77fd6a7f2509d Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Wed, 9 Jan 2013 00:06:41 +0100 Subject: [PATCH 30/30] removed spaces before period in comment --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84803d37c962..7f53e558ba44 100644 --- a/pom.xml +++ b/pom.xml @@ -221,7 +221,7 @@ maven-source-plugin 2.2