Skip to content

Commit

Permalink
JBEHAVE-1083: Inherit from jbehave-pom.
Browse files Browse the repository at this point in the history
  • Loading branch information
maurotalevi committed May 29, 2015
1 parent 704146e commit 74198a3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 23 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2003-2012 jbehave.org
Copyright (c) 2003-2015 jbehave.org

All rights reserved.

Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Canonical information for JBehave:
Please report issues, feature requests on [JIRA](http://jbehave.org/issue-tracking.html) or discuss them on the
[dev mailing list](http://jbehave.org/mailing-lists.html).

Keep an eye on the [Travis CI](http://travis-ci.org/jbehave/jbehave-core) server for JBehave builds.
Keep an eye on the [Travis CI](http://travis-ci.org/jbehave) server for JBehave builds.

### JDK

Expand Down Expand Up @@ -88,7 +88,10 @@ Note: profiles are additive and the default profile is always active.

See also:

- [jbehave-pom](jbehave-pom) JBehave POM
- [jbehave-web](jbehave-web) web extensions to JBehave
- [jbehave-osgi](jbehave-osgi) OSGi extensions to JBehave
- [jbehave-eclipse](jbehave-eclipse) Eclipse integration for JBehave
- [jbehave-tutorial](jbehave-tutorial) for an example of JBehave testing of a real web application.

## License
Expand Down
25 changes: 4 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,17 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>9</version>
<groupId>org.jbehave</groupId>
<artifactId>jbehave-pom</artifactId>
<version>1</version>
</parent>
<groupId>org.jbehave</groupId>
<artifactId>jbehave</artifactId>
<packaging>pom</packaging>
<version>4.0-SNAPSHOT</version>
<name>JBehave</name>
<inceptionYear>2003</inceptionYear>
<description>JBehave is a project that supports and facilitates Behaviour-Driven Development.</description>
<url>http://jbehave.org</url>
<description>JBehave Core is a project providing core functionality supporting and facilitating Behaviour-Driven Development.</description>

<properties>
<!-- NOTE: Set -Dfile.encoding=UTF-8 in MAVEN_OPTS -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<resource.encoding>UTF-8</resource.encoding>
<jdk.version>1.5</jdk.version>
</properties>

Expand Down Expand Up @@ -352,17 +346,6 @@
</profile>
</profiles>

<licenses>
<license>
<name>BSD license</name>
<url>https://github.com/jbehave/jbehave-core/blob/master/LICENSE.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<developers />
<contributors />

<scm>
<connection>scm:git:git://github.com/jbehave/jbehave-core.git</connection>
<developerConnection>scm:git:ssh://[email protected]/jbehave/jbehave-core.git</developerConnection>
Expand Down

0 comments on commit 74198a3

Please sign in to comment.