summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Beust <cedric@beust.com>2014-10-05 08:53:37 -0700
committerCedric Beust <cedric@beust.com>2014-10-05 08:53:37 -0700
commitf5bc65089dc0a58c3855868c985f291b6e9e1afe (patch)
tree9040f6c9ecd700565a46f1734176c61fe26840fa
parent460b51f6319bb8b8c621fce06346eaab7902c9b8 (diff)
downloadplatform_external_jcommander-f5bc65089dc0a58c3855868c985f291b6e9e1afe.tar.gz
platform_external_jcommander-f5bc65089dc0a58c3855868c985f291b6e9e1afe.tar.bz2
platform_external_jcommander-f5bc65089dc0a58c3855868c985f291b6e9e1afe.zip
Preparing release.
-rwxr-xr-xbuild-with-maven7
-rw-r--r--pom.xml35
-rw-r--r--src/test/java/com/beust/jcommander/JCommanderTest.java2
3 files changed, 39 insertions, 5 deletions
diff --git a/build-with-maven b/build-with-maven
index 176ca1a..8323640 100755
--- a/build-with-maven
+++ b/build-with-maven
@@ -2,11 +2,12 @@ mvn -B clean source:jar javadoc:jar repository:bundle-create -P sign
#v=6.5.2beta
-export TESTNG=`echo ../testng/target/testng-6.9beta.jar`
+export TESTNG=`echo ../testng/target/testng-6.8.8.jar`
-run="java -classpath target/classes:target/test-classes:${TESTNG}:$CLASSPATH org.testng.TestNG src/test/resources/testng.xml"
+run="java -classpath \"target/classes;target/test-classes;${TESTNG};$CLASSPATH\" org.testng.TestNG src/test/resources/testng.xml"
echo "Launching tests: ${run}"
-java -classpath target/classes:target/test-classes:${TESTNG}:$CLASSPATH org.testng.TestNG src/test/resources/testng.xml
+$run
+#java -classpath target/classes:target/test-classes:${TESTNG}:$CLASSPATH org.testng.TestNG src/test/resources/testng.xml
echo "To deploy to the snapshot repository: mvn deploy"
echo "To deploy to the release directory: mvn -DskipTests=true release:clean release:prepare release:perform"
diff --git a/pom.xml b/pom.xml
index 2d5ff92..5507f7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<artifactId>jcommander</artifactId>
<packaging>jar</packaging>
<name>JCommander</name>
- <version>1.36-SNAPSHOT</version>
+ <version>1.37-SNAPSHOT</version>
<description>A Java framework to parse command line options with annotations.</description>
<url>http://beust.com/jcommander</url>
<licenses>
@@ -155,6 +155,39 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>
+ maven-bundle-plugin
+ </artifactId>
+ <versionRange>
+ [2.1.0,)
+ </versionRange>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
diff --git a/src/test/java/com/beust/jcommander/JCommanderTest.java b/src/test/java/com/beust/jcommander/JCommanderTest.java
index 342b858..ad2c5e8 100644
--- a/src/test/java/com/beust/jcommander/JCommanderTest.java
+++ b/src/test/java/com/beust/jcommander/JCommanderTest.java
@@ -1056,7 +1056,7 @@ public class JCommanderTest {
@Test(enabled = false)
public static void main(String[] args) throws Exception {
-// new JCommanderTest().a();
+ new JCommanderTest().enumArgsFail();
// class A {
// @Parameter(names = "-short", required = true)
// List<String> parameters;