diff options
Diffstat (limited to 'org.eclipse.jgit.ant')
-rw-r--r-- | org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.ant/OSGI-INF/l10n/plugin.properties (renamed from org.eclipse.jgit.ant/plugin.properties) | 0 | ||||
-rw-r--r-- | org.eclipse.jgit.ant/build.properties | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.ant/pom.xml | 3 | ||||
-rw-r--r-- | org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitAddTask.java | 1 | ||||
-rw-r--r-- | org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCheckoutTask.java | 1 | ||||
-rw-r--r-- | org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCloneTask.java | 1 | ||||
-rw-r--r-- | org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitInitTask.java | 1 |
9 files changed, 4 insertions, 9 deletions
diff --git a/org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs index f79df5b9dd..a08ba7b56f 100644 --- a/org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs @@ -52,7 +52,7 @@ org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error org.eclipse.jdt.core.compiler.problem.missingJavadocComments=error org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 4408441cfe..b5d8d5c07b 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" -Bundle-Localization: plugin +Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.ant;version="7.0.0", org.eclipse.jgit.ant.tasks;version="7.0.0"; diff --git a/org.eclipse.jgit.ant/plugin.properties b/org.eclipse.jgit.ant/OSGI-INF/l10n/plugin.properties index 7c9e5f04a4..7c9e5f04a4 100644 --- a/org.eclipse.jgit.ant/plugin.properties +++ b/org.eclipse.jgit.ant/OSGI-INF/l10n/plugin.properties diff --git a/org.eclipse.jgit.ant/build.properties b/org.eclipse.jgit.ant/build.properties index 43a5be6a54..17f6d12a99 100644 --- a/org.eclipse.jgit.ant/build.properties +++ b/org.eclipse.jgit.ant/build.properties @@ -2,8 +2,8 @@ source.. = src/,\ resources/ output.. = bin/ bin.includes = META-INF/,\ + OSGI-INF/,\ .,\ - plugin.properties,\ about.html additional.bundles = org.apache.ant,\ org.eclipse.jgit,\ diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index adbee5c74b..7c3edf475c 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -38,7 +38,6 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.12</version> </dependency> </dependencies> @@ -70,7 +69,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitAddTask.java b/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitAddTask.java index 0d409bbf03..07b60cfc79 100644 --- a/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitAddTask.java +++ b/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitAddTask.java @@ -75,7 +75,6 @@ public class GitAddTask extends Task { return path; } - /** {@inheritDoc} */ @Override public void execute() throws BuildException { if (src == null) { diff --git a/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCheckoutTask.java b/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCheckoutTask.java index 1f10588b4e..ecb5f9addd 100644 --- a/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCheckoutTask.java +++ b/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCheckoutTask.java @@ -77,7 +77,6 @@ public class GitCheckoutTask extends Task { this.force = force; } - /** {@inheritDoc} */ @Override public void execute() throws BuildException { CheckoutCommand checkout; diff --git a/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCloneTask.java b/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCloneTask.java index c143c9c6e1..facf2ac6a0 100644 --- a/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCloneTask.java +++ b/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitCloneTask.java @@ -76,7 +76,6 @@ public class GitCloneTask extends Task { this.branch = branch; } - /** {@inheritDoc} */ @Override public void execute() throws BuildException { log("Cloning repository " + uri); diff --git a/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitInitTask.java b/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitInitTask.java index 161168fbe3..5c2a26b9ee 100644 --- a/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitInitTask.java +++ b/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitInitTask.java @@ -48,7 +48,6 @@ public class GitInitTask extends Task { this.bare = bare; } - /** {@inheritDoc} */ @Override public void execute() throws BuildException { if (bare) { |