akurtakov pushed to tycho-extras (master). "Update to upstream 0.23."
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Jun 9 16:26:51 UTC 2015
From 5151ce3babcffc3a397659e9c3ec16915a3917ec Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako at redhat.com>
Date: Tue, 9 Jun 2015 19:26:43 +0300
Subject: Update to upstream 0.23.
diff --git a/.gitignore b/.gitignore
index eea668b..f6b8e9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/tycho-extras-*.bz2
/org.eclipse.tycho.extras-*.bz2
+/org.eclipse.tycho.extras-tycho-extras-0.23.0.tar.xz
diff --git a/0001-Update-to-JGit-4.0.patch b/0001-Update-to-JGit-4.0.patch
new file mode 100644
index 0000000..c111fa2
--- /dev/null
+++ b/0001-Update-to-JGit-4.0.patch
@@ -0,0 +1,106 @@
+From f7c05e9cd2e7cb72b16fb2a93ce699b58943443d Mon Sep 17 00:00:00 2001
+From: Alexander Kurtakov <akurtako at redhat.com>
+Date: Tue, 9 Jun 2015 19:17:30 +0300
+Subject: [PATCH] Update to JGit 4.0
+
+---
+ pom.xml | 2 +-
+ .../buildtimestamp/jgit/JGitBuildTimestampProvider.java | 15 +++++++--------
+ .../tycho/extras/buildtimestamp/jgit/PathFilter.java | 10 +++++-----
+ 3 files changed, 13 insertions(+), 14 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index c476294..717e6ee 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -74,7 +74,7 @@
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven-version>3.0</maven-version>
+ <plugin-tools-version>3.3</plugin-tools-version>
+- <jgit-version>3.5.3.201412180710-r</jgit-version>
++ <jgit-version>4.0.0.201506020755-rc3</jgit-version>
+ <!-- tycho-extras and tycho are normally developed and released in parallel using the same version -->
+ <tycho-version>${project.version}</tycho-version>
+ <min.jdk.version>1.7</min.jdk.version>
+diff --git a/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java b/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java
+index ae5b7fa..fb0d785 100644
+--- a/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java
++++ b/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/JGitBuildTimestampProvider.java
+@@ -152,12 +152,10 @@ public class JGitBuildTimestampProvider implements BuildTimestampProvider {
+ logger.warn("Fallback to default timestamp provider");
+ return defaultTimestampProvider.getTimestamp(session, project, execution);
+ } else {
+- throw new MojoExecutionException(
+- message
+- + "\n"
+- + "You are trying to use tycho-buildtimestamp-jgit on a directory that has uncommitted changes (see details above)."
+- + "\nEither commit all changes/add files to .gitignore, or enable fallback to default timestamp provider by configuring "
+- + "\njgit.dirtyWorkingTree=warning for tycho-packaging-plugin");
++ throw new MojoExecutionException(message + "\n"
++ + "You are trying to use tycho-buildtimestamp-jgit on a directory that has uncommitted changes (see details above)."
++ + "\nEither commit all changes/add files to .gitignore, or enable fallback to default timestamp provider by configuring "
++ + "\njgit.dirtyWorkingTree=warning for tycho-packaging-plugin");
+ }
+ }
+ }
+@@ -172,12 +170,13 @@ public class JGitBuildTimestampProvider implements BuildTimestampProvider {
+ // When dirtyBehaviour==ignore and no commit was ever done,
+ // the commit is null, so we fallback to the defaultTimestampProvider
+ if (commit == null) {
+- logger.info("Fallback to default timestamp provider, because no commit could be found for that project (Shared but not commited yet).");
++ logger.info(
++ "Fallback to default timestamp provider, because no commit could be found for that project (Shared but not commited yet).");
+ return defaultTimestampProvider.getTimestamp(session, project, execution);
+ }
+ return new Date(commit.getCommitTime() * 1000L);
+ } finally {
+- walk.release();
++ walk.close();
+ }
+ } finally {
+ repository.close();
+diff --git a/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/PathFilter.java b/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/PathFilter.java
+index ce349e9..96e6c51 100644
+--- a/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/PathFilter.java
++++ b/tycho-buildtimestamp-jgit/src/main/java/org/eclipse/tycho/extras/buildtimestamp/jgit/PathFilter.java
+@@ -18,7 +18,7 @@ import java.util.StringTokenizer;
+
+ import org.eclipse.jgit.errors.IncorrectObjectTypeException;
+ import org.eclipse.jgit.errors.MissingObjectException;
+-import org.eclipse.jgit.ignore.IgnoreRule;
++import org.eclipse.jgit.ignore.FastIgnoreRule;
+ import org.eclipse.jgit.lib.Constants;
+ import org.eclipse.jgit.treewalk.TreeWalk;
+ import org.eclipse.jgit.treewalk.filter.TreeFilter;
+@@ -27,16 +27,16 @@ public class PathFilter extends TreeFilter {
+
+ private final byte[] basedir;
+
+- private final List<IgnoreRule> rules;
++ private final List<FastIgnoreRule> rules;
+
+ public PathFilter(String basedir, String filters) {
+ this.basedir = Constants.encode(basedir);
+
+ if (filters != null) {
+ StringTokenizer st = new StringTokenizer(filters, "\n\r\f", false);
+- List<IgnoreRule> rules = new ArrayList<IgnoreRule>();
++ List<FastIgnoreRule> rules = new ArrayList<FastIgnoreRule>();
+ while (st.hasMoreTokens()) {
+- rules.add(new IgnoreRule(st.nextToken().trim()));
++ rules.add(new FastIgnoreRule(st.nextToken().trim()));
+ }
+ this.rules = Collections.unmodifiableList(rules);
+ } else {
+@@ -53,7 +53,7 @@ public class PathFilter extends TreeFilter {
+
+ if (!tw.isSubtree() && rules != null) {
+ String path = tw.getPathString();
+- for (IgnoreRule rule : rules) {
++ for (FastIgnoreRule rule : rules) {
+ if (rule.isMatch(path, tw.isSubtree())) {
+ return !rule.getResult();
+ }
+--
+2.4.2
+
diff --git a/sources b/sources
index 284f312..f3df8cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3b25e3899acb29434f88b6800dcad7d org.eclipse.tycho.extras-tycho-extras-0.22.0.tar.bz2
+a1fe2331fb20e84e647f5359cc33b949 org.eclipse.tycho.extras-tycho-extras-0.23.0.tar.xz
diff --git a/tycho-extras-use-custom-resolver.patch b/tycho-extras-use-custom-resolver.patch
index 6931a6e..e5bc919 100644
--- a/tycho-extras-use-custom-resolver.patch
+++ b/tycho-extras-use-custom-resolver.patch
@@ -12,22 +12,6 @@ Change-Id: Ifd0aae3f32c8077cd0ae33e70f40698c1129788d
.../org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java | 10 ++++++++++
2 files changed, 15 insertions(+)
-diff --git a/tycho-eclipserun-plugin/pom.xml b/tycho-eclipserun-plugin/pom.xml
-index 708b35c..c4e9b17 100644
---- a/tycho-eclipserun-plugin/pom.xml
-+++ b/tycho-eclipserun-plugin/pom.xml
-@@ -38,6 +38,11 @@
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-p2-extras-plugin</artifactId>
- </dependency>
-+ <dependency>
-+ <groupId>org.fedoraproject.p2</groupId>
-+ <artifactId>org.fedoraproject.p2</artifactId>
-+ <version>0.0.1-SNAPSHOT</version>
-+ </dependency>
- </dependencies>
- <profiles>
- <profile>
diff --git a/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java b/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
index 4c4baf0..18db847 100644
--- a/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
diff --git a/tycho-extras.spec b/tycho-extras.spec
index 198721b..1e2f4e1 100644
--- a/tycho-extras.spec
+++ b/tycho-extras.spec
@@ -3,21 +3,22 @@
%global snap %{nil}
Name: tycho-extras
-Version: 0.22.0
-Release: 2%{?dist}
+Version: 0.23.0
+Release: 1%{?dist}
Summary: Additional plugins for Tycho
License: EPL
URL: http://eclipse.org/tycho/
-Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/org.eclipse.tycho.extras-tycho-extras-0.22.0.tar.bz2
+Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/org.eclipse.tycho.extras-tycho-extras-%{version}.tar.xz
Patch0: %{name}-fix-build.patch
Patch1: %{name}-use-custom-resolver.patch
+Patch2: 0001-Update-to-JGit-4.0.patch
BuildArch: noarch
BuildRequires: jgit
BuildRequires: maven-local
-BuildRequires: tycho >= 0.22.0-3
+BuildRequires: tycho >= 0.23.0
Requires: java-headless >= 1.5
@@ -36,15 +37,17 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q -n org.eclipse.tycho.extras-tycho-extras-0.22.0
+%setup -q -n org.eclipse.tycho.extras-tycho-extras-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# maven-properties-plugin is only needed for tests
%pom_remove_plugin org.eclipse.m2e:lifecycle-mapping
%pom_remove_plugin org.sonatype.plugins:maven-properties-plugin tycho-p2-extras-plugin
# remove org.apache.maven:apache-maven zip
%pom_remove_dep org.apache.maven:apache-maven tycho-p2-extras-plugin
+%pom_add_dep org.fedoraproject.p2:org.fedoraproject.p2 tycho-eclipserun-plugin/pom.xml
%mvn_alias :{*} org.eclipse.tycho:@1
@@ -63,6 +66,9 @@ This package contains the API documentation for %{name}.
%files javadoc -f .mfiles-javadoc
%changelog
+* Tue Jun 9 2015 Alexander Kurtakov <akurtako at redhat.com> 0.23.0-1
+- Update to upstream 0.23.
+
* Fri Dec 5 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.22.0-2
- Port to latest fedoraproject-p2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/tycho-extras.git/commit/?h=master&id=5151ce3babcffc3a397659e9c3ec16915a3917ec
More information about the scm-commits
mailing list