From 461eae64143cadc2b1dc8ebb664048b89cb07963 Mon Sep 17 00:00:00 2001 From: Fernando Dobladez Date: Tue, 24 Apr 2012 16:36:38 -0300 Subject: [PATCH 1/5] Prepare release 1.0.0 --- README.md | 4 ++-- pom.xml | 2 +- project.clj | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ef78186..f3f3f41 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Simply add `buildversion-plugin` to your pom, executing the `set-properties` goa com.code54.mojo buildversion-plugin - 1.0.0-SNAPSHOT + 1.0.0 set-properties @@ -88,7 +88,7 @@ Example 1: com.code54.mojo buildversion-plugin - 1.0.0-SNAPSHOT + 1.0.0 set-properties diff --git a/pom.xml b/pom.xml index 2cef0ab..dd60312 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ com.code54.mojo buildversion-plugin - 1.0.0-SNAPSHOT + 1.0.0 maven-plugin buildversion-plugin diff --git a/project.clj b/project.clj index dd39035..d2b74d8 100644 --- a/project.clj +++ b/project.clj @@ -1,7 +1,9 @@ -(defproject buildversion-maven-plugin "1.0.0-SNAPSHOT" +(defproject buildversion-maven-plugin "1.0.0" :dependencies [[org.clojure/clojure "1.3.0"] - [org.cloudhoist/clojure-maven-mojo-annotations "0.3.2-SNAPSHOT"] - [org.cloudhoist/clojure-maven-mojo "0.3.2-SNAPSHOT"] + ;[org.cloudhoist/clojure-maven-mojo-annotations "0.3.2-SNAPSHOT"] + [org.cloudhoist/clojure-maven-mojo-annotations "0.3.1"] + ;[org.cloudhoist/clojure-maven-mojo "0.3.2-SNAPSHOT"] + [org.cloudhoist/clojure-maven-mojo "0.3.1"] [org.apache.maven/maven-plugin-api "3.0.3"] [org.clojure/tools.trace "0.7.1"] [conch "0.2.1"]] From 467555be309cad54307554f3ce3591b3bf43c357 Mon Sep 17 00:00:00 2001 From: Fernando Dobladez Date: Sun, 29 Apr 2012 00:52:32 -0300 Subject: [PATCH 2/5] Some clarifications on the docs --- README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f3f3f41..950e173 100644 --- a/README.md +++ b/README.md @@ -72,17 +72,17 @@ add these repos to your `settings.xml` or your project `pom.xml`. Example: tstampFormat yyyyMMddHHmmss - Specify a custom format for the `build-tstamp` property. Use the pattern syntax defined by Java's [SimpleDateFormat](http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html) + Specify a custom format for the `build-tstamp` property. Use the pattern syntax defined by Java's SimpleDateFormat customProperties - - Optional. A Clojure snippet of code that evaluates to a Map. You have locally define symbols for each `build-*` property. The Map returned is merged into the project properties. See below for examples. + Optional. A Clojure snippet of code you may specify in order to modify or create new properties. The code must evaluate to a Map. The name of the keys in the Map become Maven properties on the project. For convenience, for each `build-*` property you have a local variable with the same name already defined for you. See below for an example. -Example 1: +Example: ```xml @@ -128,15 +128,15 @@ Reference: * [Another explanation](http://www.xerxesb.com/2010/git-describe-and-the-tale-of-the-wrong-commits/) of this same issue with `git describe`. * [GIT mailing list discussion](http://kerneltrap.org/mailarchive/git/2010/9/21/40071/thread) about `git describe`'s logic and lack of `--first-parent`. - * Here's a [working patch to add `--first-parent` to `git describe`](https://github.com/gitigit/git/tree/mrb/describe-first-parent) + * Here's a [working patch to add `--first-parent` to `git describe`](https://github.com/git/git/tree/mrb/describe-first-parent) ## Future Some ideas: * Find a way to inject the project version from git tags into the project's - pom. The goal is to get rid of the need to modify the project version inside - `pom.xml`: just leave a fixed 0.0.0 version and let the plugin infer it from + pom. The goal is to stop maintaining the project version inside + `pom.xml`: just leave the pom version fixed at 0.0.0 and let the plugin infer it from git. We tried the obvious: calling project.setVersion(), but some Maven phases still "see" the version that is in the `pom.xml` file. Need to research further. @@ -166,4 +166,5 @@ addition. He did the heavy-lifting to integrate Clojure with Maven and Plexus. ## License Licensed under the [Eclipse Public License](http://www.eclipse.org/legal/epl-v10.html). -Copyright 2012 Code54 S.A. (http://code54.com) +Copyright 2012 Fernando Dobladez & Code54 S.A. (http://code54.com) + From 1857f9fe53b3c9ad21607d0e808778dac9e3f6cc Mon Sep 17 00:00:00 2001 From: Ben Podgursky Date: Mon, 24 Aug 2015 19:17:27 -0700 Subject: [PATCH 3/5] tweak and work without external aliases --- pom.xml | 17 +++++++++++++++++ src/test/bash/create-sample-git-project.sh | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/pom.xml b/pom.xml index 8e16dde..b2d3b35 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,23 @@ + + + sonatype-releases + http://oss.sonatype.org/content/repositories/releases + + + clojars.org + http://clojars.org/repo + + + + + sonatype-snapshots + http://oss.sonatype.org/content/repositories/snapshots + + + release-sign-artifacts diff --git a/src/test/bash/create-sample-git-project.sh b/src/test/bash/create-sample-git-project.sh index 2c0c6e2..4a62259 100755 --- a/src/test/bash/create-sample-git-project.sh +++ b/src/test/bash/create-sample-git-project.sh @@ -3,6 +3,11 @@ echo "Running $0 ..." TARGET_DIR="$1" +git config --global alias.co checkout +git config --global alias.br branch +git config --global alias.ci commit +git config --global alias.st status + #rm -rf $TARGET_DIR mkdir -p $TARGET_DIR cd $TARGET_DIR From 6fc541388dcc242592e0793cb31b77f5f1681d78 Mon Sep 17 00:00:00 2001 From: Ben Podgursky Date: Mon, 24 Aug 2015 19:19:17 -0700 Subject: [PATCH 4/5] no need for bloba --- src/test/bash/create-sample-git-project.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/bash/create-sample-git-project.sh b/src/test/bash/create-sample-git-project.sh index 4a62259..58eaf31 100755 --- a/src/test/bash/create-sample-git-project.sh +++ b/src/test/bash/create-sample-git-project.sh @@ -3,10 +3,10 @@ echo "Running $0 ..." TARGET_DIR="$1" -git config --global alias.co checkout -git config --global alias.br branch -git config --global alias.ci commit -git config --global alias.st status +git config alias.co checkout +git config alias.br branch +git config alias.ci commit +git config alias.st status #rm -rf $TARGET_DIR mkdir -p $TARGET_DIR From 6e54b41e3cdc52b92ef717601b71e564bbe04f69 Mon Sep 17 00:00:00 2001 From: Ben Podgursky Date: Tue, 25 Aug 2015 15:05:18 -0700 Subject: [PATCH 5/5] undo --- pom.xml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pom.xml b/pom.xml index b2d3b35..8e16dde 100644 --- a/pom.xml +++ b/pom.xml @@ -44,23 +44,6 @@ - - - sonatype-releases - http://oss.sonatype.org/content/repositories/releases - - - clojars.org - http://clojars.org/repo - - - - - sonatype-snapshots - http://oss.sonatype.org/content/repositories/snapshots - - - release-sign-artifacts