github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Update args4j to 2.33 

CQ: 11068
Change-Id: I7d52cddacff05477f646fda5f7b9f2de844922f6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-4.9
Matthias Sohn 8 years ago
parent
c02c9e8042
commit
3af57b52a3
14 changed files with 28 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
  2. 4
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
  3. 4
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
  4. 4
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20170516192513-Oxygen.tpd
  5. 2
      org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
  6. 2
      org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ResetTest.java
  7. 2
      org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/StatusTest.java
  8. 4
      org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
  9. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
  10. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java
  11. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java
  12. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java
  13. 37
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java
  14. 2
      pom.xml

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
Unescape View File

@ -73,8 +73,8 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201511171540"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201511171540"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/> <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/> <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/> <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/> <unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/> <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
Unescape View File

@ -35,8 +35,8 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201511171540"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201511171540"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/> <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/> <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/> <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/> <unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/> <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
Unescape View File

@ -35,8 +35,8 @@
<unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201511171540"/> <unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201511171540"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/> <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/> <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/> <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/> <unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/> <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20170516192513-Oxygen.tpd
Unescape View File

@ -14,8 +14,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/R2017051619251
org.apache.httpcomponents.httpclient.source [4.3.6.v201511171540,4.3.6.v201511171540] org.apache.httpcomponents.httpclient.source [4.3.6.v201511171540,4.3.6.v201511171540]
org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
org.kohsuke.args4j [2.0.21.v201301150030,2.0.21.v201301150030] org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
org.kohsuke.args4j.source [2.0.21.v201301150030,2.0.21.v201301150030] org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
org.hamcrest.core [1.3.0.v201303031735,1.3.0.v201303031735] org.hamcrest.core [1.3.0.v201303031735,1.3.0.v201303031735]
org.hamcrest.core.source [1.3.0.v201303031735,1.3.0.v201303031735] org.hamcrest.core.source [1.3.0.v201303031735,1.3.0.v201303031735]
org.hamcrest.library [1.3.0.v201505072020,1.3.0.v201505072020] org.hamcrest.library [1.3.0.v201505072020,1.3.0.v201505072020]

2
org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
Unescape View File

@ -27,5 +27,5 @@ Import-Package: org.eclipse.jgit.api;version="[4.9.0,4.10.0)",
org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
org.junit;version="[4.11.0,5.0.0)", org.junit;version="[4.11.0,5.0.0)",
org.junit.rules;version="[4.11.0,5.0.0)", org.junit.rules;version="[4.11.0,5.0.0)",
org.kohsuke.args4j;version="[2.0.12,2.1.0)" org.kohsuke.args4j;version="[2.33.0,3.0.0)"
Require-Bundle: org.tukaani.xz;bundle-version="[1.3.0,2.0.0)" Require-Bundle: org.tukaani.xz;bundle-version="[1.3.0,2.0.0)"

2
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ResetTest.java
Unescape View File

@ -69,7 +69,7 @@ public class ResetTest extends CLIRepositoryTestCase {
public void testPathOptionHelp() throws Exception { public void testPathOptionHelp() throws Exception {
String[] result = execute("git reset -h"); String[] result = execute("git reset -h");
assertTrue("Unexpected argument: " + result[1], assertTrue("Unexpected argument: " + result[1],
result[1].endsWith("[-- path ... ...]")); result[1].endsWith("[-- path ...]"));
} }
@Test @Test

2
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/StatusTest.java
Unescape View File

@ -60,7 +60,7 @@ public class StatusTest extends CLIRepositoryTestCase {
public void testPathOptionHelp() throws Exception { public void testPathOptionHelp() throws Exception {
String[] result = execute("git status -h"); String[] result = execute("git status -h");
assertTrue("Unexpected argument: " + result[1], assertTrue("Unexpected argument: " + result[1],
result[1].endsWith("[-- path ... ...]")); result[1].endsWith("[-- path ...]"));
} }
@Test @Test

4
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
Unescape View File

@ -64,8 +64,8 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
org.eclipse.jgit.treewalk.filter;version="[4.9.0,4.10.0)", org.eclipse.jgit.treewalk.filter;version="[4.9.0,4.10.0)",
org.eclipse.jgit.util;version="[4.9.0,4.10.0)", org.eclipse.jgit.util;version="[4.9.0,4.10.0)",
org.eclipse.jgit.util.io;version="[4.9.0,4.10.0)", org.eclipse.jgit.util.io;version="[4.9.0,4.10.0)",
org.kohsuke.args4j;version="[2.0.12,2.1.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)",
org.kohsuke.args4j.spi;version="[2.0.15,2.1.0)" org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)"
Export-Package: org.eclipse.jgit.console;version="4.9.0"; Export-Package: org.eclipse.jgit.console;version="4.9.0";
uses:="org.eclipse.jgit.transport, uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util", org.eclipse.jgit.util",

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
Unescape View File

@ -77,7 +77,7 @@ class Checkout extends TextBuiltin {
@Argument(required = false, index = 0, metaVar = "metaVar_name", usage = "usage_checkout") @Argument(required = false, index = 0, metaVar = "metaVar_name", usage = "usage_checkout")
private String name; private String name;
@Option(name = "--", metaVar = "metaVar_paths", multiValued = true, handler = RestOfArgumentsHandler.class) @Option(name = "--", metaVar = "metaVar_paths", handler = RestOfArgumentsHandler.class)
private List<String> paths = new ArrayList<>(); private List<String> paths = new ArrayList<>();
@Override @Override

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java
Unescape View File

@ -69,7 +69,7 @@ class Reset extends TextBuiltin {
private String commit; private String commit;
@Argument(required = false, index = 1, metaVar = "metaVar_paths") @Argument(required = false, index = 1, metaVar = "metaVar_paths")
@Option(name = "--", metaVar = "metaVar_paths", multiValued = true, handler = RestOfArgumentsHandler.class) @Option(name = "--", metaVar = "metaVar_paths", handler = RestOfArgumentsHandler.class)
private List<String> paths = new ArrayList<>(); private List<String> paths = new ArrayList<>();
@Override @Override

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java
Unescape View File

@ -124,7 +124,7 @@ abstract class RevWalkTextBuiltin extends TextBuiltin {
private String followPath; private String followPath;
@Argument(index = 0, metaVar = "metaVar_commitish") @Argument(index = 0, metaVar = "metaVar_commitish")
private final List<RevCommit> commits = new ArrayList<>(); private List<RevCommit> commits = new ArrayList<>();
@Option(name = "--", metaVar = "metaVar_path", handler = PathTreeFilterHandler.class) @Option(name = "--", metaVar = "metaVar_path", handler = PathTreeFilterHandler.class)
protected TreeFilter pathFilter = TreeFilter.ALL; protected TreeFilter pathFilter = TreeFilter.ALL;

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java
Unescape View File

@ -83,7 +83,7 @@ class Status extends TextBuiltin {
protected String untrackedFilesMode = "all"; // default value //$NON-NLS-1$ protected String untrackedFilesMode = "all"; // default value //$NON-NLS-1$
@Argument(required = false, index = 0, metaVar = "metaVar_paths") @Argument(required = false, index = 0, metaVar = "metaVar_paths")
@Option(name = "--", metaVar = "metaVar_paths", multiValued = true, handler = RestOfArgumentsHandler.class) @Option(name = "--", metaVar = "metaVar_paths", handler = RestOfArgumentsHandler.class)
protected List<String> filterPaths; protected List<String> filterPaths;
@Override @Override

37
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java
Unescape View File

@ -47,7 +47,6 @@ import java.io.IOException;
import java.io.Writer; import java.io.Writer;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@ -68,6 +67,7 @@ import org.kohsuke.args4j.IllegalAnnotationError;
import org.kohsuke.args4j.NamedOptionDef; import org.kohsuke.args4j.NamedOptionDef;
import org.kohsuke.args4j.Option; import org.kohsuke.args4j.Option;
import org.kohsuke.args4j.OptionDef; import org.kohsuke.args4j.OptionDef;
import org.kohsuke.args4j.OptionHandlerRegistry;
import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.OptionHandler;
import org.kohsuke.args4j.spi.RestOfArgumentsHandler; import org.kohsuke.args4j.spi.RestOfArgumentsHandler;
import org.kohsuke.args4j.spi.Setter; import org.kohsuke.args4j.spi.Setter;
@ -82,13 +82,14 @@ import org.kohsuke.args4j.spi.Setter;
*/ */
public class CmdLineParser extends org.kohsuke.args4j.CmdLineParser { public class CmdLineParser extends org.kohsuke.args4j.CmdLineParser {
static { static {
registerHandler(AbstractTreeIterator.class, OptionHandlerRegistry registry = OptionHandlerRegistry.getRegistry();
registry.registerHandler(AbstractTreeIterator.class,
AbstractTreeIteratorHandler.class); AbstractTreeIteratorHandler.class);
registerHandler(ObjectId.class, ObjectIdHandler.class); registry.registerHandler(ObjectId.class, ObjectIdHandler.class);
registerHandler(RefSpec.class, RefSpecHandler.class); registry.registerHandler(RefSpec.class, RefSpecHandler.class);
registerHandler(RevCommit.class, RevCommitHandler.class); registry.registerHandler(RevCommit.class, RevCommitHandler.class);
registerHandler(RevTree.class, RevTreeHandler.class); registry.registerHandler(RevTree.class, RevTreeHandler.class);
registerHandler(List.class, OptionWithValuesListHandler.class); registry.registerHandler(List.class, OptionWithValuesListHandler.class);
} }
private final Repository db; private final Repository db;
@ -267,8 +268,8 @@ public class CmdLineParser extends org.kohsuke.args4j.CmdLineParser {
class MyOptionDef extends OptionDef { class MyOptionDef extends OptionDef {
public MyOptionDef(OptionDef o) { public MyOptionDef(OptionDef o) {
super(o.usage(), o.metaVar(), o.required(), o.handler(), o super(o.usage(), o.metaVar(), o.required(), o.help(), o.hidden(),
.isMultiValued()); o.handler(), o.isMultiValued());
} }
@Override @Override
@ -300,24 +301,6 @@ public class CmdLineParser extends org.kohsuke.args4j.CmdLineParser {
} }
@SuppressWarnings("unchecked")
private List<OptionHandler> getOptions() {
List<OptionHandler> options = null;
try {
Field field = org.kohsuke.args4j.CmdLineParser.class
.getDeclaredField("options"); //$NON-NLS-1$
field.setAccessible(true);
options = (List<OptionHandler>) field.get(this);
} catch (NoSuchFieldException | SecurityException
| IllegalArgumentException | IllegalAccessException e) {
// ignore
}
if (options == null) {
return Collections.emptyList();
}
return options;
}
@Override @Override
public void printSingleLineUsage(Writer w, ResourceBundle rb) { public void printSingleLineUsage(Writer w, ResourceBundle rb) {
List<OptionHandler> options = getOptions(); List<OptionHandler> options = getOptions();

2
pom.xml
Unescape View File

@ -200,7 +200,7 @@
<javaewah-version>1.1.6</javaewah-version> <javaewah-version>1.1.6</javaewah-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
<test-fork-count>1C</test-fork-count> <test-fork-count>1C</test-fork-count>
<args4j-version>2.0.15</args4j-version> <args4j-version>2.33</args4j-version>
<commons-compress-version>1.6</commons-compress-version> <commons-compress-version>1.6</commons-compress-version>
<osgi-core-version>4.3.1</osgi-core-version> <osgi-core-version>4.3.1</osgi-core-version>
<servlet-api-version>3.1.0</servlet-api-version> <servlet-api-version>3.1.0</servlet-api-version>

Write Preview
Loading…
Cancel
Save