Merge pull request #1 from junit-team/master

sync to latest

.gitattributes

@@ -3,6 +3,7 @@
 *.GIF binary
 *.jar binary
 *.png binary
+*.jpg binary
 *.svg text eol=lf
 
 # These files do not have unix line endings. Do not normalize them for now.

.gitignore

@@ -10,3 +10,4 @@ MaxCore.max
 *.iws
 out
 java.hprof.txt
+.DS_Store

.travis.settings.xml

@@ -0,0 +1,22 @@
+<settings>
+    <mirrors xmlns="http://maven.apache.org/SETTINGS/1.1.0">
+        <mirror>
+            <mirrorOf>central</mirrorOf>
+            <name>GCS Maven Central mirror</name>
+            <url>https://maven-central.storage-download.googleapis.com/maven2/</url>
+            <id>google-maven-central</id>
+        </mirror>
+    </mirrors>
+    <servers>
+        <server>
+            <id>junit-snapshot-repo</id>
+            <username>${env.OSSRH_USERNAME}</username>
+            <password>${env.OSSRH_PASSWORD}</password>
+        </server>
+        <server>
+            <id>junit-releases-repo</id>
+            <username>${env.OSSRH_USERNAME}</username>
+            <password>${env.OSSRH_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>

.travis.yml

@@ -1,23 +1,69 @@
+dist: trusty
+
 language: java
-install:
-  # Download dependencies with JDK 8 because Mave Central supports
-  # TLS 1.2 only but OpenJDK 6 does not.
-  - export ORIGINAL_JAVA_HOME=$JAVA_HOME
-  - jdk_switcher use oraclejdk8
-  - ./mvnw test -DskipTests
-  # Delete all files created with JDK 8
-  - ./mvnw clean
-  # Restore desired JDK
-  - export JAVA_HOME=$ORIGINAL_JAVA_HOME
-  # Run original install command but without GPG signing
-  - ./mvnw install -DskipTests
+
 script: ./mvnw verify javadoc:javadoc site:site
-addons:
-  apt:
-    packages:
-      - openjdk-6-jdk
-jdk:
-  - oraclejdk9
-  - oraclejdk8
-  - openjdk7
-  - openjdk6
+
+install:
+- ./mvnw --version
+
+stages:
+  - test
+  - name: deploy
+    if: (branch = master) AND (NOT type IN (pull_request))
+
+jobs:
+  include:
+    - name: Java 6
+      env: JDK=openjdk6
+      addons:
+        apt:
+          packages:
+            - openjdk-6-jdk
+      install:
+        # Download dependencies with JDK 8 because Mave Central supports
+        # TLS 1.2 only but OpenJDK 6 does not.
+        - export ORIGINAL_JAVA_HOME=$JAVA_HOME
+        - jdk_switcher use oraclejdk8
+        - ./mvnw test -DskipTests
+        # Delete all files created with JDK 8
+        - ./mvnw clean
+        # Restore desired JDK
+        - export JAVA_HOME=$ORIGINAL_JAVA_HOME
+        - jdk_switcher use openjdk6
+        - ./mvnw --version
+    - name: Java 7
+      jdk: openjdk7
+    - name: Java 8
+      jdk: oraclejdk8
+    - name: Java 9
+      jdk: oraclejdk9
+    - name: Java 10
+      jdk: openjdk10
+    - name: Java 11
+      jdk: openjdk11
+    - stage: deploy
+      name: "Publish snapshot artifacts"
+      addons:
+        apt:
+          packages:
+            - openjdk-6-jdk
+      install:
+        # Download dependencies with JDK 8 because Mave Central supports
+        # TLS 1.2 only but OpenJDK 6 does not.
+        - export ORIGINAL_JAVA_HOME=$JAVA_HOME
+        - jdk_switcher use oraclejdk8
+        - ./mvnw test -DskipTests
+        # Delete all files created with JDK 8
+        - ./mvnw clean
+        # Restore desired JDK
+        - export JAVA_HOME=$ORIGINAL_JAVA_HOME
+        - jdk_switcher use openjdk6
+        - ./mvnw --version
+      env:
+        - JDK=openjdk6
+        # OSSRH_USERNAME
+        - secure: griGZYDtqDMRUaYex/uAnpkWIQ/yodM6IOn4G8izWKpyGLeCxyXBG0FDcVo81xRq/9mMevj2idyW/xNP/HAQ45G4pyJUk/vTSMkNslzVjr7OBEtQQCN8XahSaOO0l0CJ5lzA6LdwWg7uDaf9znqZ0slt81u0S1NJmUZyYeUEim0=
+        # OSSRH_PASSWORD
+        - secure: EM7Z2M09HvLJXYJaeD/YmeF5A6tqavG2tBBeDcFZ7C6k0AI/wApe882pEMMoUG06xufKfSlt7WFJxoyU3M+fPOpeK5qZpJQxsHWnNJwbcbKzqMpM9mDsgIL9rtAvm9MuIIbIY2spiT0Cx3sHdh5qofaJHPL/u8Or5L9tE8FV1ew=
+      script: ./mvnw deploy --batch-mode --activate-profiles generate-docs --settings .travis.settings.xml

BUILDING

@@ -2,7 +2,7 @@ BUILDING FROM GITHUB:
 =====================
 
 git clone https://github.com/junit-team/junit4.git
-cd junit
+cd junit4
 mvn install
 
 BUILDING FROM JARS OR ZIPS:

CONTRIBUTING.md

@@ -31,14 +31,13 @@ a good idea to add a comment to the bug to make sure that there's agreement on h
 
 ## Limitations
 
-The JUnit team is not accepting changes to the code under the following paths :
+The JUnit team is not accepting changes to the code under the following paths:
 
 * `src/main/java/junit`
 * `test/java/junit/tests/framework`
 * `test/java/junit/tests/extensions`
 
-The reasoning is that the JUnit team feels that our users should focus on using either the JUnit4 APIs
-or the soon-to-be-released JUnit4 APIs.
+The reasoning is that the JUnit team feels that our users should focus on using either the JUnit4 or JUnit5 APIs.
 
 The team is also reluctant to accept changes that only update code from one code style to another.
 Generally the code in JUnit was approved by at least one person, so two people agreed that the style was reasonable.

KEYS

@@ -0,0 +1,70 @@
+This file contains the PGP key that is used to sign releases.
+
+Importing: `pgp < KEYS` or `gpg --import KEYS`
+
+Adding a key:
+`pgp -kxa <your name> >> KEYS`,
+or `(pgpk -ll <your name> && pgpk -xa <your name>) >> KEYS`,
+or `(gpg --list-sigs <your name> && gpg --armor --export <your name>) >> KEYS`
+
+================================
+
+pub   rsa4096 2018-04-08 [SC]
+      FF6E2C001948C5F2F38B0CC385911F425EC61B51
+uid           [ unknown] Open Source Development <[email protected]>
+sig 3        85911F425EC61B51 2018-04-08  Open Source Development <[email protected]>
+sub   rsa4096 2018-04-08 [E]
+sig          85911F425EC61B51 2018-04-08  Open Source Development <[email protected]>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+mdzS2PJko7mm
+=l0XA
+-----END PGP PUBLIC KEY BLOCK-----

README.md

@@ -6,7 +6,4 @@ For more information, please visit:
 * [Download and Install guide](https://github.com/junit-team/junit4/wiki/Download-and-Install)
 * [Getting Started](https://github.com/junit-team/junit4/wiki/Getting-started)
 
-[![Latest Build Status](https://junit.ci.cloudbees.com/job/JUnit/badge/icon)](https://junit.ci.cloudbees.com/)
-
-[![Built on DEV@cloud](http://www.cloudbees.com/sites/default/files/Button-Built-on-CB-1.png)](http://www.cloudbees.com/foss/foss-dev.cb)
-
+[![Build Status](https://travis-ci.org/junit-team/junit4.svg?branch=master)](https://travis-ci.org/junit-team/junit4)

acknowledgements.txt

@@ -160,4 +160,4 @@
 
 == NOTE: as of September 2011, we have stopped recording contributions here.
    For a full list of everyone who has contributed great bug reports and code, please see
-   http://github.com/junit-team/junit
+   http://github.com/junit-team/junit4

doc/ReleaseNotes4.12.md

@@ -155,7 +155,7 @@ thrown.reportMissingExceptionWithMessage("FAIL: Expected exception to be thrown"
 If a custom failure message is not provided, a default message is used.
 
 
-### [Pull request #1013:](https://github.com/junit-team/junit/pull/1013) Make ErrorCollector#checkSucceeds generic
+### [Pull request #1013:](https://github.com/junit-team/junit4/pull/1013) Make ErrorCollector#checkSucceeds generic
 
 The method `ErrorCollector.checkSucceeds()` is now generic. Previously, you could only pass
 in a `Callable<Object>` and it returned `Object`. You can now pass any `Callable` and the
@@ -252,6 +252,8 @@ Each test is run in a new _daemon_ thread. If the specified timeout elapses befo
 
 ### [Pull request #876:](https://github.com/junit-team/junit4/pull/876) The timeout rule never times out if you pass in a timeout of zero.
 
+A specified timeout of 0 will be interpreted as not set, however tests still launch from separate threads. This can be useful for disabling timeouts in environments where they are dynamically set based on some property.
+
 
 # Parameterized Tests