Skip to content

Commit 571215c

Browse files
RahulNagekarRahulNagekar
authored
Merge pull request #1 from junit-team/master
sync to latest
2 parents 0e2d999 + 50a285d commit 571215c

File tree

190 files changed

+2983
-587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+2983
-587
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*.GIF binary
44
*.jar binary
55
*.png binary
6+
*.jpg binary
67
*.svg text eol=lf
78

89
# These files do not have unix line endings. Do not normalize them for now.

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ MaxCore.max
1010
*.iws
1111
out
1212
java.hprof.txt
13+
.DS_Store

‎.travis.settings.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<settings>
2+
<mirrors xmlns="http://maven.apache.org/SETTINGS/1.1.0">
3+
<mirror>
4+
<mirrorOf>central</mirrorOf>
5+
<name>GCS Maven Central mirror</name>
6+
<url>https://maven-central.storage-download.googleapis.com/maven2/</url>
7+
<id>google-maven-central</id>
8+
</mirror>
9+
</mirrors>
10+
<servers>
11+
<server>
12+
<id>junit-snapshot-repo</id>
13+
<username>${env.OSSRH_USERNAME}</username>
14+
<password>${env.OSSRH_PASSWORD}</password>
15+
</server>
16+
<server>
17+
<id>junit-releases-repo</id>
18+
<username>${env.OSSRH_USERNAME}</username>
19+
<password>${env.OSSRH_PASSWORD}</password>
20+
</server>
21+
</servers>
22+
</settings>

‎.travis.yml

Lines changed: 67 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,69 @@
1+
dist: trusty
2+
13
language: java
2-
install:
3-
# Download dependencies with JDK 8 because Mave Central supports
4-
# TLS 1.2 only but OpenJDK 6 does not.
5-
- export ORIGINAL_JAVA_HOME=$JAVA_HOME
6-
- jdk_switcher use oraclejdk8
7-
- ./mvnw test -DskipTests
8-
# Delete all files created with JDK 8
9-
- ./mvnw clean
10-
# Restore desired JDK
11-
- export JAVA_HOME=$ORIGINAL_JAVA_HOME
12-
# Run original install command but without GPG signing
13-
- ./mvnw install -DskipTests
4+
145
script: ./mvnw verify javadoc:javadoc site:site
15-
addons:
16-
apt:
17-
packages:
18-
- openjdk-6-jdk
19-
jdk:
20-
- oraclejdk9
21-
- oraclejdk8
22-
- openjdk7
23-
- openjdk6
6+
7+
install:
8+
- ./mvnw --version
9+
10+
stages:
11+
- test
12+
- name: deploy
13+
if: (branch = master) AND (NOT type IN (pull_request))
14+
15+
jobs:
16+
include:
17+
- name: Java 6
18+
env: JDK=openjdk6
19+
addons:
20+
apt:
21+
packages:
22+
- openjdk-6-jdk
23+
install:
24+
# Download dependencies with JDK 8 because Mave Central supports
25+
# TLS 1.2 only but OpenJDK 6 does not.
26+
- export ORIGINAL_JAVA_HOME=$JAVA_HOME
27+
- jdk_switcher use oraclejdk8
28+
- ./mvnw test -DskipTests
29+
# Delete all files created with JDK 8
30+
- ./mvnw clean
31+
# Restore desired JDK
32+
- export JAVA_HOME=$ORIGINAL_JAVA_HOME
33+
- jdk_switcher use openjdk6
34+
- ./mvnw --version
35+
- name: Java 7
36+
jdk: openjdk7
37+
- name: Java 8
38+
jdk: oraclejdk8
39+
- name: Java 9
40+
jdk: oraclejdk9
41+
- name: Java 10
42+
jdk: openjdk10
43+
- name: Java 11
44+
jdk: openjdk11
45+
- stage: deploy
46+
name: "Publish snapshot artifacts"
47+
addons:
48+
apt:
49+
packages:
50+
- openjdk-6-jdk
51+
install:
52+
# Download dependencies with JDK 8 because Mave Central supports
53+
# TLS 1.2 only but OpenJDK 6 does not.
54+
- export ORIGINAL_JAVA_HOME=$JAVA_HOME
55+
- jdk_switcher use oraclejdk8
56+
- ./mvnw test -DskipTests
57+
# Delete all files created with JDK 8
58+
- ./mvnw clean
59+
# Restore desired JDK
60+
- export JAVA_HOME=$ORIGINAL_JAVA_HOME
61+
- jdk_switcher use openjdk6
62+
- ./mvnw --version
63+
env:
64+
- JDK=openjdk6
65+
# OSSRH_USERNAME
66+
- secure: griGZYDtqDMRUaYex/uAnpkWIQ/yodM6IOn4G8izWKpyGLeCxyXBG0FDcVo81xRq/9mMevj2idyW/xNP/HAQ45G4pyJUk/vTSMkNslzVjr7OBEtQQCN8XahSaOO0l0CJ5lzA6LdwWg7uDaf9znqZ0slt81u0S1NJmUZyYeUEim0=
67+
# OSSRH_PASSWORD
68+
- secure: EM7Z2M09HvLJXYJaeD/YmeF5A6tqavG2tBBeDcFZ7C6k0AI/wApe882pEMMoUG06xufKfSlt7WFJxoyU3M+fPOpeK5qZpJQxsHWnNJwbcbKzqMpM9mDsgIL9rtAvm9MuIIbIY2spiT0Cx3sHdh5qofaJHPL/u8Or5L9tE8FV1ew=
69+
script: ./mvnw deploy --batch-mode --activate-profiles generate-docs --settings .travis.settings.xml

‎BUILDING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ BUILDING FROM GITHUB:
22
=====================
33

44
git clone https://github.com/junit-team/junit4.git
5-
cd junit
5+
cd junit4
66
mvn install
77

88
BUILDING FROM JARS OR ZIPS:

‎CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,13 @@ a good idea to add a comment to the bug to make sure that there's agreement on h
3131

3232
## Limitations
3333

34-
The JUnit team is not accepting changes to the code under the following paths :
34+
The JUnit team is not accepting changes to the code under the following paths:
3535

3636
* `src/main/java/junit`
3737
* `test/java/junit/tests/framework`
3838
* `test/java/junit/tests/extensions`
3939

40-
The reasoning is that the JUnit team feels that our users should focus on using either the JUnit4 APIs
41-
or the soon-to-be-released JUnit4 APIs.
40+
The reasoning is that the JUnit team feels that our users should focus on using either the JUnit4 or JUnit5 APIs.
4241

4342
The team is also reluctant to accept changes that only update code from one code style to another.
4443
Generally the code in JUnit was approved by at least one person, so two people agreed that the style was reasonable.

‎KEYS

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
This file contains the PGP key that is used to sign releases.
2+
3+
Importing: `pgp < KEYS` or `gpg --import KEYS`
4+
5+
Adding a key:
6+
`pgp -kxa <your name> >> KEYS`,
7+
or `(pgpk -ll <your name> && pgpk -xa <your name>) >> KEYS`,
8+
or `(gpg --list-sigs <your name> && gpg --armor --export <your name>) >> KEYS`
9+
10+
================================
11+
12+
pub rsa4096 2018-04-08 [SC]
13+
FF6E2C001948C5F2F38B0CC385911F425EC61B51
14+
uid [ unknown] Open Source Development <mail@marcphilipp.de>
15+
sig 3 85911F425EC61B51 2018-04-08 Open Source Development <mail@marcphilipp.de>
16+
sub rsa4096 2018-04-08 [E]
17+
sig 85911F425EC61B51 2018-04-08 Open Source Development <mail@marcphilipp.de>
18+
19+
-----BEGIN PGP PUBLIC KEY BLOCK-----
20+
21+
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
68+
mdzS2PJko7mm
69+
=l0XA
70+
-----END PGP PUBLIC KEY BLOCK-----

‎README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@ For more information, please visit:
66
* [Download and Install guide](https://github.com/junit-team/junit4/wiki/Download-and-Install)
77
* [Getting Started](https://github.com/junit-team/junit4/wiki/Getting-started)
88

9-
[![Latest Build Status](https://junit.ci.cloudbees.com/job/JUnit/badge/icon)](https://junit.ci.cloudbees.com/)
10-
11-
[![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)
12-
9+
[![Build Status](https://travis-ci.org/junit-team/junit4.svg?branch=master)](https://travis-ci.org/junit-team/junit4)

‎acknowledgements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,4 +160,4 @@
160160

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

‎doc/ReleaseNotes4.12.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ thrown.reportMissingExceptionWithMessage("FAIL: Expected exception to be thrown"
155155
If a custom failure message is not provided, a default message is used.
156156

157157

158-
### [Pull request #1013:](https://github.com/junit-team/junit/pull/1013) Make ErrorCollector#checkSucceeds generic
158+
### [Pull request #1013:](https://github.com/junit-team/junit4/pull/1013) Make ErrorCollector#checkSucceeds generic
159159

160160
The method `ErrorCollector.checkSucceeds()` is now generic. Previously, you could only pass
161161
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
252252

253253
### [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.
254254

255+
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.
256+
255257

256258
# Parameterized Tests
257259

0 commit comments

Comments
 (0)