Skip to content
This repository has been archived by the owner on Jun 25, 2018. It is now read-only.

Commit

Permalink
Added finalName and targetDir to build-option. Bumped 0.1.2 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
lefou committed Mar 2, 2011
1 parent deb4a32 commit 99ad5d8
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 3 deletions.
1 change: 1 addition & 0 deletions Changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cmvn-0.1.2:
module/directory
* Added new build option --build-from-root to start Maven always from root
project with the complete reactor (alowing to use -am and -amd options)
* Added support for finalName and targetDir in build-block

cmvn-0.1.1:
* Generated files now have correct default XML namespace set
Expand Down
2 changes: 1 addition & 1 deletion cmvncommon.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-val: CMVN_VERSION=0.1.2-SNAPSHOT
-val: CMVN_VERSION=0.1.2

property: maven.compiler.source=1.6
property: maven.compiler.target=1.6
Expand Down
1 change: 1 addition & 0 deletions de.tototec.tools.cmvn-executable/cmvn.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ compile: org.apache.xmlbeans:xmlbeans:2.4.0;optional;exclude=net.sf.saxon:saxon
runtime: org.apache.servicemix.bundles:org.apache.servicemix.bundles.saxon:9.1.0.1_1;optional
runtime: org.apache.xmlbeans:xmlbeans-xpath:2.4.0;optional;exclude=net.sf.saxon:saxon

# requires released version 0.1.2
#build: finalName=cmvn-executable-${project.version}

# Use the bundle-plugin because of bnd's feature of Conditional-Package
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ public void read(final CmvnProjectConfig projectConfig, final KeyValue keyValue)
final String oVal = option.getValue();
if (oKey.equals("sources")) {
build.setSources(oVal);
} else if (oKey.equals("finalName")) {
build.setFinalName(oVal);
} else if (oKey.equals("targetDir")) {
build.setFinalName(oVal);
} else {
throw new RuntimeException("Unsupported build option: " + option);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package de.tototec.tools.cmvn;

// Class generated by cmvn-0.1.1
// Class generated by cmvn-0.1.2
public abstract class Config {

public static String cmvnVersion() {
return "0.1.2-SNAPSHOT";
return "0.1.2";
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@ private void generateBuild(final Model mvn) {
if (build.getSources() != null) {
mvnBuild.setSourceDirectory(build.getSources());
}
if(build.getFinalName() != null) {
mvnBuild.setFinalName(build.getFinalName());
}
if(build.getTargetDir() != null) {
mvnBuild.setDirectory(build.getTargetDir());
}

}

protected void generatePlugins(final Model mvn, final boolean forceSystemScope) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@
@Data
public class Build {
private String sources;
private String finalName;
private String targetDir;
}

0 comments on commit 99ad5d8

Please sign in to comment.