From 74198a3e2ae6d0257cfbfae349ffcd151c9d07e8 Mon Sep 17 00:00:00 2001 From: Mauro Talevi Date: Fri, 29 May 2015 17:37:50 +0200 Subject: [PATCH] JBEHAVE-1083: Inherit from jbehave-pom. --- LICENSE.txt | 2 +- README.md | 5 ++++- pom.xml | 25 ++++--------------------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 94255f3531..269dd519a0 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2003-2012 jbehave.org +Copyright (c) 2003-2015 jbehave.org All rights reserved. diff --git a/README.md b/README.md index 14abd597a1..042cfa3c81 100755 --- a/README.md +++ b/README.md @@ -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 @@ -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 diff --git a/pom.xml b/pom.xml index d20c4f7a1f..a5d0e9f251 100755 --- a/pom.xml +++ b/pom.xml @@ -2,23 +2,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.sonatype.oss - oss-parent - 9 + org.jbehave + jbehave-pom + 1 - org.jbehave jbehave pom 4.0-SNAPSHOT JBehave - 2003 - JBehave is a project that supports and facilitates Behaviour-Driven Development. - http://jbehave.org + JBehave Core is a project providing core functionality supporting and facilitating Behaviour-Driven Development. - - UTF-8 - UTF-8 1.5 @@ -352,17 +346,6 @@ - - - BSD license - https://github.com/jbehave/jbehave-core/blob/master/LICENSE.txt - repo - - - - - - scm:git:git://github.com/jbehave/jbehave-core.git scm:git:ssh://git@github.com/jbehave/jbehave-core.git