Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/KentBeck/junit into junit.i…
Browse files Browse the repository at this point in the history
…ssues
  • Loading branch information
Tibor Digana committed Jan 20, 2013
2 parents a691962 + 3aca014 commit 497e6ca
Show file tree
Hide file tree
Showing 30 changed files with 675 additions and 760 deletions.
2 changes: 1 addition & 1 deletion BUILDING
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILDING FROM GITHUB:

git clone https://github.com/KentBeck/junit.git
cd junit
ant dist
mvn install

BUILDING FROM JARS OR ZIPS:
===========================
Expand Down
File renamed without changes.
5 changes: 5 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
===================================================================================
== Notices and attributions required by libraries that the project depends on ==
===================================================================================

The JUnit depends on Java Hamcrest (http://hamcrest.org/JavaHamcrest/).
1 change: 0 additions & 1 deletion README

This file was deleted.

671 changes: 0 additions & 671 deletions README.html

This file was deleted.

12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# JUnit 4
JUnit is a simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks.

For more information, please visit:
* [Wiki](https://github.com/KentBeck/junit/wiki)
* [Download and Install guide](https://github.com/KentBeck/junit/wiki/Download-and-Install)
* [Getting Started](https://github.com/KentBeck/junit/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)

4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<property name="testsrc" location="src/test/java" />
<property name="testbin" location="${target}/test/java" />
<property name="unjarred"
value="**/*.jar, ${testfiles}, doc/**, README.html, .classpath, .project, cpl-v10.html" />
value="**/*.jar, ${testfiles}, doc/**, README.md, .classpath, .project, cpl-v10.html" />

<property name="binjar" value="junit-${version}.jar" />
<property name="srcjar" value="junit-${version}-src.jar" />
Expand Down Expand Up @@ -168,7 +168,7 @@
<copy todir="${dist}/doc">
<fileset dir="doc"/>
</copy>
<copy file="README.html" tofile="${dist}/README.html" />
<copy file="README.md" tofile="${dist}/README.md" />
<copy file="BUILDING" tofile="${dist}/BUILDING" />
<copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html" />
<copy file="build.xml" tofile="${dist}/build.xml" />
Expand Down
6 changes: 3 additions & 3 deletions doc/building-junit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ Steps to build junit:

- Must be manual
- Write release notes
- Update version in build.xml
- Update version in pom.xml
- Not too tedious:
- Push to github (dsaff _and_ KentBeck)
- Run the ant zip task
- Run the mvn clean install
- Upload stuff to github (including tag)
- Push to maven
- ant -lib build/lib stage.maven
- mvn -Dgpg.passphrase="<passphrase>" -Psign clean deploy
- Promote
- Tedious:
- Update SourceForge if major release
Expand Down
319 changes: 319 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,319 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>

<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12-SNAPSHOT</version>

<name>JUnit</name>
<url>http://junit.org</url>
<description>JUnit is a unit testing framework for Java, created by Erich Gamma and Kent Beck.</description>
<organization>
<name>JUnit</name>
<url>http://www.junit.org</url>
</organization>
<inceptionYear>2002</inceptionYear>
<mailingLists>
<mailingList>
<name>JUnit Mailing List</name>
<post>[email protected]</post>
<archive>http://tech.groups.yahoo.com/group/junit/</archive>
</mailingList>
</mailingLists>
<licenses>
<license>
<name>Common Public License Version 1.0</name>
<url>http://www.opensource.org/licenses/cpl1.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:git://github.com/KentBeck/junit.git</connection>
<developerConnection>scm:git:[email protected]:KentBeck/junit.git</developerConnection>
<url>http://github.com/KentBeck/junit/tree/master</url>
</scm>
<developers>
<developer>
<id>dsaff</id>
<name>David Saff</name>
<email>[email protected]</email>
</developer>
</developers>
<contributors>
<contributor>
<name>JUnit contributors</name>
<organization>JUnit</organization>
<email>[email protected]</email>
<url>https://github.com/KentBeck/junit/graphs/contributors</url>
<roles>
<role>developers</role>
</roles>
</contributor>
</contributors>
<properties>
<hamcrestVersion>1.3</hamcrestVersion>
<jdkVersion>1.5</jdkVersion>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
</properties>
<prerequisites>
<maven>3.0.4</maven>
</prerequisites>
<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${hamcrestVersion}</version>
</dependency>
</dependencies>
<distributionManagement>
<downloadUrl>https://github.com/KentBeck/junit/wiki/Download-and-Install</downloadUrl>
<!--
Currently the deployment is under development and enabled for
the Snapshot Repository of the Maven Central.
-->
<snapshotRepository>
<id>maven-central-snapshots</id>
<name>upload.to.maven.central.snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<!--
Remote Release Repository.
-->
<repository>
<id>maven-central</id>
<name>upload.to.maven.central</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<build>
<resources>
<resource>
<directory>${project.basedir}/src/main/resources</directory>
</resource>
<resource>
<directory>${project.basedir}</directory>
<includes>
<include>LICENSE.txt</include>
</includes>
</resource>
</resources>
<extensions>
<!--
Specify HTTP providers.
The Maven Wagon is a transport abstraction.
For more information see http://maven.apache.org/wagon/index.html
and the guide
http://maven.apache.org/plugins/maven-deploy-plugin/examples/deploy-ssh-external.html
-->
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<version>1.0</version>
</extension>
</extensions>
<plugins>
<!--
Both "org.apache" and "org.codehaus" are default providers of MOJO plugins
which are especially dedicated to Maven projects.
The MOJO stands for "Maven plain Old Java Object".
Each mojo is an executable goal in Maven, and a plugin is a distribution of
one or more related mojos.
For more information see http://maven.apache.org/plugin-developers/index.html
The following plugins are ordered according the Maven build lifecycle.
http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
-->
<plugin>
<!--
Checks that the version of user's maven installation is 3.0.4,
the JDK is 1.5+, no non-standard repositories are specified in
the project, requires only release versions of dependencies of other artifacts.
-->
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.1.1</version>
<executions>
<execution>
<id>enforce-versions</id>
<phase>initialize</phase>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<fail>true</fail>
<rules>
<requireMavenVersion>
<!-- Some plugin features require a recent Maven runtime to work properly -->
<message>Current version of Maven ${maven.version} required to build the project should be ${project.prerequisites.maven}, or higher!</message>
<version>[${project.prerequisites.maven},)</version>
</requireMavenVersion>
<requireJavaVersion>
<message>Current JDK version ${java.version} should be ${jdkVersion}, or higher!</message>
<version>${jdkVersion}</version>
</requireJavaVersion>
<requireNoRepositories>
<message>Best Practice is to never define repositories in pom.xml (use a repository manager instead).</message>
</requireNoRepositories>
<requireReleaseDeps>
<message>No Snapshots Dependencies Allowed!</message>
</requireReleaseDeps>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<!--
Updates Version#id().
-->
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
<version>1.3.8</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<ignoreMissingFile>false</ignoreMissingFile>
<file>src/main/java/junit/runner/Version.java.template</file>
<outputFile>src/main/java/junit/runner/Version.java</outputFile>
<regex>false</regex>
<token>@version@</token>
<value>${project.version}</value>
</configuration>
</plugin>
<plugin><!-- Using jdk 1.5.0_22, package-info.java files are compiled correctly. -->
<!--
java compiler plugin forked in extra process
-->
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<source>${jdkVersion}</source>
<target>${jdkVersion}</target>
<compilerVersion>1.5</compilerVersion>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<debug>true</debug>
<fork>true</fork>
<compilerArgument>-Xlint:unchecked</compilerArgument>
<maxmem>128m</maxmem>
</configuration>
</plugin>
<plugin>
<!--
A plugin which uses the JUnit framework in order to start
our junit suite "AllTests" after the sources are compiled.
-->
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.3</version>
<configuration>
<test>org/junit/tests/AllTests.java</test>
<useSystemClassLoader>true</useSystemClassLoader>
<enableAssertions>false</enableAssertions>
</configuration>
</plugin>
<plugin>
<!--
This plugin can package the main artifact's sources (src/main/java)
in to jar archive. See target/junit-*-sources.jar.
-->
<artifactId>maven-source-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>prepare-package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!--
This plugin can generate Javadoc by a forked
process and then package the Javadoc
in jar archive target/junit-*-javadoc.jar.
-->
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version>
<executions>
<execution>
<id>attach-javadoc</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile>
<show>protected</show>
<author>false</author>
<version>false</version>
<detectLinks>false</detectLinks>
<linksource>true</linksource>
<keywords>true</keywords>
<use>false</use>
<windowtitle>JUnit API</windowtitle>
<encoding>UTF-8</encoding>
<locale>en</locale>
<javadocVersion>1.5</javadocVersion>
<javaApiLinks>
<property>
<name>api_1.5</name>
<value>http://docs.oracle.com/javase/1.5.0/docs/api/index.html</value>
</property>
</javaApiLinks>
<excludePackageNames>junit.*,*.internal,*.internal.*</excludePackageNames>
<verbose>true</verbose>
<minmemory>32m</minmemory>
<maxmemory>128m</maxmemory>
<failOnError>true</failOnError>
<includeDependencySources>true</includeDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude>
</dependencySourceIncludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>sign</id>
<!--
Signs all artifacts before deploying to Maven Central.
-->
<build>
<plugins>
<plugin>
<!--
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="<passphrase>" -Dgpg.keyname="<your key ID>"
In order to create the key pair, use the command "gpg &ndash;&ndash;gen-key".
(&ndash;&ndash; stands for double dash)
-->
<artifactId>maven-gpg-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>gpg-sign</id>
<phase>install</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Loading

0 comments on commit 497e6ca

Please sign in to comment.