Skip to content

Commit 497e6ca

Browse files
author
Tibor Digana
committed
Merge branch 'master' of git://github.com/KentBeck/junit into junit.issues
2 parents a691962 + 3aca014 commit 497e6ca

30 files changed

+675
-760
lines changed

Diff for: ‎BUILDING

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BUILDING FROM GITHUB:
33

44
git clone https://github.com/KentBeck/junit.git
55
cd junit
6-
ant dist
6+
mvn install
77

88
BUILDING FROM JARS OR ZIPS:
99
===========================

Diff for: ‎LICENSE renamed to ‎LICENSE.txt

File renamed without changes.

Diff for: ‎NOTICE.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
===================================================================================
2+
== Notices and attributions required by libraries that the project depends on ==
3+
===================================================================================
4+
5+
The JUnit depends on Java Hamcrest (http://hamcrest.org/JavaHamcrest/).

Diff for: ‎README

-1
This file was deleted.

Diff for: ‎README.html

-671
This file was deleted.

Diff for: ‎README.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# JUnit 4
2+
JUnit is a simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks.
3+
4+
For more information, please visit:
5+
* [Wiki](https://github.com/KentBeck/junit/wiki)
6+
* [Download and Install guide](https://github.com/KentBeck/junit/wiki/Download-and-Install)
7+
* [Getting Started](https://github.com/KentBeck/junit/wiki/Getting-started)
8+
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+

Diff for: ‎build.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<property name="testsrc" location="src/test/java" />
1717
<property name="testbin" location="${target}/test/java" />
1818
<property name="unjarred"
19-
value="**/*.jar, ${testfiles}, doc/**, README.html, .classpath, .project, cpl-v10.html" />
19+
value="**/*.jar, ${testfiles}, doc/**, README.md, .classpath, .project, cpl-v10.html" />
2020

2121
<property name="binjar" value="junit-${version}.jar" />
2222
<property name="srcjar" value="junit-${version}-src.jar" />
@@ -168,7 +168,7 @@
168168
<copy todir="${dist}/doc">
169169
<fileset dir="doc"/>
170170
</copy>
171-
<copy file="README.html" tofile="${dist}/README.html" />
171+
<copy file="README.md" tofile="${dist}/README.md" />
172172
<copy file="BUILDING" tofile="${dist}/BUILDING" />
173173
<copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html" />
174174
<copy file="build.xml" tofile="${dist}/build.xml" />

Diff for: ‎doc/building-junit.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ Steps to build junit:
22

33
- Must be manual
44
- Write release notes
5-
- Update version in build.xml
5+
- Update version in pom.xml
66
- Not too tedious:
77
- Push to github (dsaff _and_ KentBeck)
8-
- Run the ant zip task
8+
- Run the mvn clean install
99
- Upload stuff to github (including tag)
1010
- Push to maven
11-
- ant -lib build/lib stage.maven
11+
- mvn -Dgpg.passphrase="<passphrase>" -Psign clean deploy
1212
- Promote
1313
- Tedious:
1414
- Update SourceForge if major release

Diff for: ‎pom.xml

+319
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,319 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>junit</groupId>
6+
<artifactId>junit</artifactId>
7+
<version>4.12-SNAPSHOT</version>
8+
9+
<name>JUnit</name>
10+
<url>http://junit.org</url>
11+
<description>JUnit is a unit testing framework for Java, created by Erich Gamma and Kent Beck.</description>
12+
<organization>
13+
<name>JUnit</name>
14+
<url>http://www.junit.org</url>
15+
</organization>
16+
<inceptionYear>2002</inceptionYear>
17+
<mailingLists>
18+
<mailingList>
19+
<name>JUnit Mailing List</name>
20+
<post>[email protected]</post>
21+
<archive>http://tech.groups.yahoo.com/group/junit/</archive>
22+
</mailingList>
23+
</mailingLists>
24+
<licenses>
25+
<license>
26+
<name>Common Public License Version 1.0</name>
27+
<url>http://www.opensource.org/licenses/cpl1.0.txt</url>
28+
<distribution>repo</distribution>
29+
</license>
30+
</licenses>
31+
<scm>
32+
<connection>scm:git:git://github.com/KentBeck/junit.git</connection>
33+
<developerConnection>scm:git:[email protected]:KentBeck/junit.git</developerConnection>
34+
<url>http://github.com/KentBeck/junit/tree/master</url>
35+
</scm>
36+
<developers>
37+
<developer>
38+
<id>dsaff</id>
39+
<name>David Saff</name>
40+
<email>[email protected]</email>
41+
</developer>
42+
</developers>
43+
<contributors>
44+
<contributor>
45+
<name>JUnit contributors</name>
46+
<organization>JUnit</organization>
47+
<email>[email protected]</email>
48+
<url>https://github.com/KentBeck/junit/graphs/contributors</url>
49+
<roles>
50+
<role>developers</role>
51+
</roles>
52+
</contributor>
53+
</contributors>
54+
<properties>
55+
<hamcrestVersion>1.3</hamcrestVersion>
56+
<jdkVersion>1.5</jdkVersion>
57+
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
58+
</properties>
59+
<prerequisites>
60+
<maven>3.0.4</maven>
61+
</prerequisites>
62+
<dependencies>
63+
<dependency>
64+
<groupId>org.hamcrest</groupId>
65+
<artifactId>hamcrest-core</artifactId>
66+
<version>${hamcrestVersion}</version>
67+
</dependency>
68+
</dependencies>
69+
<distributionManagement>
70+
<downloadUrl>https://github.com/KentBeck/junit/wiki/Download-and-Install</downloadUrl>
71+
<!--
72+
Currently the deployment is under development and enabled for
73+
the Snapshot Repository of the Maven Central.
74+
-->
75+
<snapshotRepository>
76+
<id>maven-central-snapshots</id>
77+
<name>upload.to.maven.central.snapshots</name>
78+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
79+
</snapshotRepository>
80+
<!--
81+
Remote Release Repository.
82+
-->
83+
<repository>
84+
<id>maven-central</id>
85+
<name>upload.to.maven.central</name>
86+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
87+
</repository>
88+
</distributionManagement>
89+
<build>
90+
<resources>
91+
<resource>
92+
<directory>${project.basedir}/src/main/resources</directory>
93+
</resource>
94+
<resource>
95+
<directory>${project.basedir}</directory>
96+
<includes>
97+
<include>LICENSE.txt</include>
98+
</includes>
99+
</resource>
100+
</resources>
101+
<extensions>
102+
<!--
103+
Specify HTTP providers.
104+
The Maven Wagon is a transport abstraction.
105+
For more information see http://maven.apache.org/wagon/index.html
106+
and the guide
107+
http://maven.apache.org/plugins/maven-deploy-plugin/examples/deploy-ssh-external.html
108+
-->
109+
<extension>
110+
<groupId>org.apache.maven.wagon</groupId>
111+
<artifactId>wagon-http</artifactId>
112+
<version>1.0</version>
113+
</extension>
114+
</extensions>
115+
<plugins>
116+
<!--
117+
Both "org.apache" and "org.codehaus" are default providers of MOJO plugins
118+
which are especially dedicated to Maven projects.
119+
The MOJO stands for "Maven plain Old Java Object".
120+
Each mojo is an executable goal in Maven, and a plugin is a distribution of
121+
one or more related mojos.
122+
For more information see http://maven.apache.org/plugin-developers/index.html
123+
124+
The following plugins are ordered according the Maven build lifecycle.
125+
http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
126+
-->
127+
<plugin>
128+
<!--
129+
Checks that the version of user's maven installation is 3.0.4,
130+
the JDK is 1.5+, no non-standard repositories are specified in
131+
the project, requires only release versions of dependencies of other artifacts.
132+
-->
133+
<artifactId>maven-enforcer-plugin</artifactId>
134+
<version>1.1.1</version>
135+
<executions>
136+
<execution>
137+
<id>enforce-versions</id>
138+
<phase>initialize</phase>
139+
<goals>
140+
<goal>enforce</goal>
141+
</goals>
142+
<configuration>
143+
<fail>true</fail>
144+
<rules>
145+
<requireMavenVersion>
146+
<!-- Some plugin features require a recent Maven runtime to work properly -->
147+
<message>Current version of Maven ${maven.version} required to build the project should be ${project.prerequisites.maven}, or higher!</message>
148+
<version>[${project.prerequisites.maven},)</version>
149+
</requireMavenVersion>
150+
<requireJavaVersion>
151+
<message>Current JDK version ${java.version} should be ${jdkVersion}, or higher!</message>
152+
<version>${jdkVersion}</version>
153+
</requireJavaVersion>
154+
<requireNoRepositories>
155+
<message>Best Practice is to never define repositories in pom.xml (use a repository manager instead).</message>
156+
</requireNoRepositories>
157+
<requireReleaseDeps>
158+
<message>No Snapshots Dependencies Allowed!</message>
159+
</requireReleaseDeps>
160+
</rules>
161+
</configuration>
162+
</execution>
163+
</executions>
164+
</plugin>
165+
<plugin>
166+
<!--
167+
Updates Version#id().
168+
-->
169+
<groupId>com.google.code.maven-replacer-plugin</groupId>
170+
<artifactId>maven-replacer-plugin</artifactId>
171+
<version>1.3.8</version>
172+
<executions>
173+
<execution>
174+
<phase>process-sources</phase>
175+
<goals>
176+
<goal>replace</goal>
177+
</goals>
178+
</execution>
179+
</executions>
180+
<configuration>
181+
<ignoreMissingFile>false</ignoreMissingFile>
182+
<file>src/main/java/junit/runner/Version.java.template</file>
183+
<outputFile>src/main/java/junit/runner/Version.java</outputFile>
184+
<regex>false</regex>
185+
<token>@version@</token>
186+
<value>${project.version}</value>
187+
</configuration>
188+
</plugin>
189+
<plugin><!-- Using jdk 1.5.0_22, package-info.java files are compiled correctly. -->
190+
<!--
191+
java compiler plugin forked in extra process
192+
-->
193+
<artifactId>maven-compiler-plugin</artifactId>
194+
<version>2.5.1</version>
195+
<configuration>
196+
<encoding>${project.build.sourceEncoding}</encoding>
197+
<source>${jdkVersion}</source>
198+
<target>${jdkVersion}</target>
199+
<compilerVersion>1.5</compilerVersion>
200+
<showDeprecation>true</showDeprecation>
201+
<showWarnings>true</showWarnings>
202+
<debug>true</debug>
203+
<fork>true</fork>
204+
<compilerArgument>-Xlint:unchecked</compilerArgument>
205+
<maxmem>128m</maxmem>
206+
</configuration>
207+
</plugin>
208+
<plugin>
209+
<!--
210+
A plugin which uses the JUnit framework in order to start
211+
our junit suite "AllTests" after the sources are compiled.
212+
-->
213+
<artifactId>maven-surefire-plugin</artifactId>
214+
<version>2.12.3</version>
215+
<configuration>
216+
<test>org/junit/tests/AllTests.java</test>
217+
<useSystemClassLoader>true</useSystemClassLoader>
218+
<enableAssertions>false</enableAssertions>
219+
</configuration>
220+
</plugin>
221+
<plugin>
222+
<!--
223+
This plugin can package the main artifact's sources (src/main/java)
224+
in to jar archive. See target/junit-*-sources.jar.
225+
-->
226+
<artifactId>maven-source-plugin</artifactId>
227+
<version>2.2</version>
228+
<executions>
229+
<execution>
230+
<id>attach-sources</id>
231+
<phase>prepare-package</phase>
232+
<goals>
233+
<goal>jar-no-fork</goal>
234+
</goals>
235+
</execution>
236+
</executions>
237+
</plugin>
238+
<plugin>
239+
<!--
240+
This plugin can generate Javadoc by a forked
241+
process and then package the Javadoc
242+
in jar archive target/junit-*-javadoc.jar.
243+
-->
244+
<artifactId>maven-javadoc-plugin</artifactId>
245+
<version>2.8.1</version>
246+
<executions>
247+
<execution>
248+
<id>attach-javadoc</id>
249+
<phase>package</phase>
250+
<goals>
251+
<goal>jar</goal>
252+
</goals>
253+
<configuration>
254+
<stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile>
255+
<show>protected</show>
256+
<author>false</author>
257+
<version>false</version>
258+
<detectLinks>false</detectLinks>
259+
<linksource>true</linksource>
260+
<keywords>true</keywords>
261+
<use>false</use>
262+
<windowtitle>JUnit API</windowtitle>
263+
<encoding>UTF-8</encoding>
264+
<locale>en</locale>
265+
<javadocVersion>1.5</javadocVersion>
266+
<javaApiLinks>
267+
<property>
268+
<name>api_1.5</name>
269+
<value>http://docs.oracle.com/javase/1.5.0/docs/api/index.html</value>
270+
</property>
271+
</javaApiLinks>
272+
<excludePackageNames>junit.*,*.internal,*.internal.*</excludePackageNames>
273+
<verbose>true</verbose>
274+
<minmemory>32m</minmemory>
275+
<maxmemory>128m</maxmemory>
276+
<failOnError>true</failOnError>
277+
<includeDependencySources>true</includeDependencySources>
278+
<dependencySourceIncludes>
279+
<dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude>
280+
</dependencySourceIncludes>
281+
</configuration>
282+
</execution>
283+
</executions>
284+
</plugin>
285+
</plugins>
286+
</build>
287+
<profiles>
288+
<profile>
289+
<id>sign</id>
290+
<!--
291+
Signs all artifacts before deploying to Maven Central.
292+
-->
293+
<build>
294+
<plugins>
295+
<plugin>
296+
<!--
297+
The goal is to sign all artifacts so that the user may verify them before downloading.
298+
The automatic build system may reuire your key ID, and passphrase specified using system properties:
299+
-Dgpg.passphrase="<passphrase>" -Dgpg.keyname="<your key ID>"
300+
In order to create the key pair, use the command "gpg &ndash;&ndash;gen-key".
301+
(&ndash;&ndash; stands for double dash)
302+
-->
303+
<artifactId>maven-gpg-plugin</artifactId>
304+
<version>1.4</version>
305+
<executions>
306+
<execution>
307+
<id>gpg-sign</id>
308+
<phase>install</phase>
309+
<goals>
310+
<goal>sign</goal>
311+
</goals>
312+
</execution>
313+
</executions>
314+
</plugin>
315+
</plugins>
316+
</build>
317+
</profile>
318+
</profiles>
319+
</project>

0 commit comments

Comments
 (0)