Skip to content

Commit

Permalink
Set next version to 0.4-SNAPSHOT
Browse files Browse the repository at this point in the history
--HG--
extra : source : ef389ebea247297bd63eebe2fb36505ff5649487
  • Loading branch information
testinfected committed Apr 22, 2014
1 parent 71e9699 commit c30cbfc
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion buildfile
@@ -1,6 +1,6 @@
VERSION_NUMBER = "0.3-SNAPSHOT"

Release.next_version = "0.3.1-SNAPSHOT"
Release.next_version = "0.4-SNAPSHOT"
Release.commit_message = lambda { |version| "Bump version number to #{version}" }
Release.tag_name = lambda { |version| "v#{version}" }

Expand Down
25 changes: 12 additions & 13 deletions tasks/oss_pom.rake
Expand Up @@ -35,10 +35,10 @@ module Enhancements
def add_github_project(username, project)
self.scm_connection = "https://github.com/#{username}/#{project}.git"
self.scm_developer_connection = "scm:git:git@github.com:#{username}/#{project}.git"
self.scm_url = "https://github.com/#{username}/#{project}
self.scm_url = "https://github.com/#{username}/#{project}"
self.url = self.scm_url
self.issues_url = "#{self.url}/issues"
self.issues_system = "GitHub Issues"
self.issues_system = 'GitHub Issues'
end

def developers
Expand Down Expand Up @@ -71,14 +71,14 @@ module Enhancements
Proc.new do
xml = Builder::XmlMarkup.new(:indent => 2)
xml.instruct!
xml.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") do
xml.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') do
xml.modelVersion '4.0.0'
xml.parent do
xml.groupId "org.sonatype.oss"
xml.artifactId "oss-parent"
xml.version "7"
xml.groupId 'org.sonatype.oss'
xml.artifactId 'oss-parent'
xml.version '7'
end
xml.groupId project.group
xml.artifactId project.id
Expand Down Expand Up @@ -141,9 +141,8 @@ module Enhancements
select{|d| d.is_a?(Artifact)}.
collect do |d|
f = d.to_s
scope = provided_deps.include?(f) ? "provided" :
runtime_deps.include?(f) ? "runtime" :
"compile"
scope = provided_deps.include?(f) ? 'provided' :
runtime_deps.include?(f) ? 'runtime' : 'compile'
d.to_hash.merge(:scope => scope, :optional => optional_deps.include?(f))
end + Buildr.artifacts(project.test.compile.dependencies).
select{|d| d.is_a?(Artifact)}.collect{|d| d.to_hash.merge(:scope => 'test')}
Expand All @@ -152,7 +151,7 @@ module Enhancements
xml.groupId dependency[:group]
xml.artifactId dependency[:id]
xml.version dependency[:version]
xml.scope dependency[:scope] unless dependency[:scope] == "compile"
xml.scope dependency[:scope] unless dependency[:scope] == 'compile'
xml.optional true if dependency[:optional]
end
end
Expand Down Expand Up @@ -193,7 +192,7 @@ module Buildr
@pom
end
end
package.instance_variable_set("@pom", nil)
package.instance_variable_set('@pom', nil)
package.enhance([package.pom.to_s]) if package.type.to_s == 'jar' && !package.classifier
package
end
Expand Down

0 comments on commit c30cbfc

Please sign in to comment.