[tycho] fedoraproject-p2: Bump BREE to JavaSE-1.8
by Mikolaj Izdebski
commit 3472fb8204ce8db1af005970379c69da1de28c92
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 16:34:21 2015 +0100
fedoraproject-p2: Bump BREE to JavaSE-1.8
- fedoraproject-p2: Fix installing of virtual bundles provided by p2.inf
sources | 2 +-
tycho.spec | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 93e77d6..3adb551 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-b42b7d6e92a7971615a21e8c63624fe3 fedoraproject-p2-b1a848.tar.xz
+0c7c5bc738676674028f23bd25824966 fedoraproject-p2-d701d8.tar.xz
d7ee912e8da240c8d87892ed876960ae org.eclipse.tycho-tycho-0.22.0.tar.bz2
c600a5115f29962c974b75b4b25e74f1 eclipse-bootstrap.tar.xz
diff --git a/tycho.spec b/tycho.spec
index 04fc902..5855898 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -17,7 +17,7 @@
# %%global snap -SNAPSHOT
%global snap %{nil}
-%global fp_p2_sha b1a848
+%global fp_p2_sha d701d8
%global fp_p2_version 0.0.1
%global fp_p2_snap -SNAPSHOT
@@ -25,7 +25,7 @@
Name: %{?scl_prefix}tycho
Version: 0.22.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -64,7 +64,7 @@ Patch6: %{pkg_name}-running-env-only.patch
BuildArch: noarch
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1:1.8
BuildRequires: maven-local >= 4.2.0
BuildRequires: maven-clean-plugin
BuildRequires: maven-dependency-plugin
@@ -427,6 +427,10 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
%{_javadocdir}/tycho
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-10
+- fedoraproject-p2: Bump BREE to JavaSE-1.8
+- fedoraproject-p2: Fix installing of virtual bundles provided by p2.inf
+
* Wed Jan 28 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-9
- fedoraproject-p2: Allow installation of bundles not built with tycho
9 years, 3 months
[jenkins-instance-identity] Add missing BR: mvn(org.kohsuke:access-modifier-checker)
by Michal Srb
commit 806310eaa8e2e89d1d643ba7f6b9f9707b5b37f7
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Feb 4 14:24:51 2015 +0100
Add missing BR: mvn(org.kohsuke:access-modifier-checker)
jenkins-instance-identity.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/jenkins-instance-identity.spec b/jenkins-instance-identity.spec
index 4854752..00a0c76 100644
--- a/jenkins-instance-identity.spec
+++ b/jenkins-instance-identity.spec
@@ -17,6 +17,7 @@ BuildRequires: mvn(org.bouncycastle:bcmail-jdk15on)
BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on)
BuildRequires: mvn(org.jenkins-ci.plugins:plugin:pom:)
BuildRequires: mvn(org.jenkins-ci.tools:maven-hpi-plugin)
+BuildRequires: mvn(org.kohsuke:access-modifier-checker)
BuildArch: noarch
9 years, 3 months
[jenkins-mailer-plugin] Update to upstream version 1.14
by Michal Srb
commit aa30186db6c0b50918d1c69d16d84b95ce32d6b4
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Feb 4 13:30:27 2015 +0100
Update to upstream version 1.14
.gitignore | 1 +
jenkins-mailer-plugin.spec | 6 +++++-
sources | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cdd7347..015a268 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/mailer-1.8.tar.gz
/mailer-1.11.tar.gz
/mailer-1.12.tar.gz
+/mailer-1.14.tar.gz
diff --git a/jenkins-mailer-plugin.spec b/jenkins-mailer-plugin.spec
index bf9bc73..f8a50f2 100644
--- a/jenkins-mailer-plugin.spec
+++ b/jenkins-mailer-plugin.spec
@@ -3,7 +3,7 @@
%global plugin_home %{_datadir}/jenkins/webroot/WEB-INF/plugins/%{short_name}.jpi
Name: jenkins-mailer-plugin
-Version: 1.12
+Version: 1.14
Release: 1%{?dist}
Summary: Jenkins Mailer Plugin
@@ -20,6 +20,7 @@ BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(org.jenkins-ci.plugins:plugin:pom:)
BuildRequires: mvn(org.kohsuke:access-modifier-checker)
BuildRequires: mvn(org.jenkins-ci.main:jenkins-core)
+BuildRequires: mvn(org.jenkins-ci.modules:instance-identity)
# test deps
#BuildRequires: mvn(junit:junit)
@@ -67,6 +68,9 @@ sed -i 's|%{plugin_home}/WEB-INF/lib/%{short_name}.jar||' .mfiles
%doc LICENSE.txt
%changelog
+* Wed Feb 04 2015 Michal Srb <msrb(a)redhat.com> - 1.14-1
+- Update to upstream version 1.14
+
* Fri Nov 21 2014 Michal Srb <msrb(a)redhat.com> - 1.12-1
- Update to upstream version 1.12
diff --git a/sources b/sources
index 9974c5c..c667f1e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
b28808853537299bae3b2025e2c38d89 LICENSE.txt
-136c8e0a7d31dac58ff1acd88394794e mailer-1.12.tar.gz
+5a623e19111b697a6da3c0415cc93d84 mailer-1.14.tar.gz
9 years, 3 months
[jenkins-instance-identity] Update to upstream version 1.4
by Michal Srb
commit 04c2dd85dc17e4c29ad4ef9feaec767cbb44cf28
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Feb 4 13:36:24 2015 +0100
Update to upstream version 1.4
.gitignore | 1 +
0001-Update-bouncycastle-to-1.50.patch | 89 +++++++++++++++++++-------------
jenkins-instance-identity.spec | 7 ++-
sources | 2 +-
4 files changed, 60 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f9950c2..d75d34c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/instance-identity-1.3.tar.gz
+/instance-identity-1.4.tar.gz
diff --git a/0001-Update-bouncycastle-to-1.50.patch b/0001-Update-bouncycastle-to-1.50.patch
index 44a6291..41bc499 100644
--- a/0001-Update-bouncycastle-to-1.50.patch
+++ b/0001-Update-bouncycastle-to-1.50.patch
@@ -1,18 +1,18 @@
-From b778048a262d7bccbb3521c19c627b0d0b944fa5 Mon Sep 17 00:00:00 2001
+From 1e2a5b0b7272b010a4ea742d38da7253d84ccac1 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb(a)redhat.com>
-Date: Tue, 25 Feb 2014 11:02:00 +0100
+Date: Wed, 4 Feb 2015 14:04:44 +0100
Subject: [PATCH] Update bouncycastle to 1.50
---
- pom.xml | 2 +-
- .../main/modules/instance_identity/InstanceIdentity.java | 14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
+ pom.xml | 2 +-
+ .../modules/instance_identity/InstanceIdentity.java | 17 ++++++++++-------
+ 2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 9aabe6f..0cc9e47 100644
+index c648eb2..e8c7bb7 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -40,7 +40,7 @@
+@@ -29,7 +29,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
@@ -22,45 +22,62 @@ index 9aabe6f..0cc9e47 100644
</dependencies>
</project>
diff --git a/src/main/java/org/jenkinsci/main/modules/instance_identity/InstanceIdentity.java b/src/main/java/org/jenkinsci/main/modules/instance_identity/InstanceIdentity.java
-index 4feedad..b3e534c 100644
+index 5e4d225..c60e7c8 100644
--- a/src/main/java/org/jenkinsci/main/modules/instance_identity/InstanceIdentity.java
+++ b/src/main/java/org/jenkinsci/main/modules/instance_identity/InstanceIdentity.java
-@@ -3,8 +3,11 @@ package org.jenkinsci.main.modules.instance_identity;
+@@ -3,9 +3,11 @@ package org.jenkinsci.main.modules.instance_identity;
import hudson.FilePath;
- import hudson.model.Hudson;
+ import hudson.Util;
import hudson.model.PageDecorator;
--import org.bouncycastle.openssl.PEMReader;
+
+ import java.io.File;
+ import java.io.FileOutputStream;
+ import java.io.FileReader;
++import java.io.FileWriter;
+ import java.io.IOException;
+ import java.io.OutputStream;
+ import java.io.Reader;
+@@ -19,11 +21,15 @@ import java.security.interfaces.RSAPrivateKey;
+ import java.security.interfaces.RSAPublicKey;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
++
+ import jenkins.model.Jenkins;
+ import jenkins.security.CryptoConfidentialKey;
++
+ import org.apache.commons.io.FileUtils;
+-import org.bouncycastle.openssl.PEMReader;
+import org.bouncycastle.openssl.PEMKeyPair;
+import org.bouncycastle.openssl.PEMParser;
import org.bouncycastle.openssl.PEMWriter;
+import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
- import java.io.File;
- import java.io.FileReader;
-@@ -40,11 +43,8 @@ public class InstanceIdentity {
- if (keyFile.exists()) {
- FileReader in = new FileReader(keyFile);
- try {
-- // a hack to work around a problem in PEMReader (or JCE, depending on how you look at it.)
-- // I can't just pass in null as a provider --- JCE doesn't default to the default provider,
-- // but it chokes that I passed in null. Urgh.
-- final String provider = KeyPairGenerator.getInstance("RSA").getProvider().getName();
-- keys = (KeyPair)new PEMReader(in,null,provider).readObject();
-+ PEMKeyPair kp = (PEMKeyPair) new PEMParser(in).readObject();
-+ keys = new JcaPEMKeyConverter().getKeyPair(kp);
- } finally {
- in.close();
- }
-@@ -53,7 +53,7 @@ public class InstanceIdentity {
- gen.initialize(2048,new SecureRandom()); // going beyond 2048 requires crypto extension
- keys = gen.generateKeyPair();
+ /**
+ * Captures the RSA key pair that identifies/authenticates this instance.
+@@ -70,12 +76,9 @@ public class InstanceIdentity {
+ }
+
+ private static KeyPair read(Reader in, KeyPairGenerator gen) throws IOException {
+- // a hack to work around a problem in PEMReader (or JCE, depending on how you look at it.)
+- // I can't just pass in null as a provider --- JCE doesn't default to the default provider,
+- // but it chokes that I passed in null. Urgh.
+- String provider = gen.getProvider().getName();
+ try {
+- return (KeyPair) new PEMReader(in, null, provider).readObject();
++ PEMKeyPair kp = (PEMKeyPair) new PEMParser(in).readObject();
++ return new JcaPEMKeyConverter().getKeyPair(kp);
+ } finally {
+ in.close();
+ }
+@@ -83,7 +86,7 @@ public class InstanceIdentity {
-- PEMWriter w = new PEMWriter(new FileWriter(keyFile),"SunJCE");
-+ PEMWriter w = new PEMWriter(new FileWriter(keyFile));
- try {
- w.writeObject(keys);
- } finally {
+ private static void write(KeyPair keys, File keyFile) throws IOException {
+ StringWriter sw = new StringWriter();
+- PEMWriter w = new PEMWriter(sw, "SunJCE");
++ PEMWriter w = new PEMWriter(new FileWriter(keyFile));
+ try {
+ w.writeObject(keys);
+ } finally {
--
-1.9.0
+2.1.0
diff --git a/jenkins-instance-identity.spec b/jenkins-instance-identity.spec
index e378ed4..4854752 100644
--- a/jenkins-instance-identity.spec
+++ b/jenkins-instance-identity.spec
@@ -2,8 +2,8 @@
%global short_name instance-identity
Name: jenkins-instance-identity
-Version: 1.3
-Release: 4%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: Jenkins identity instance
License: MIT
@@ -57,6 +57,9 @@ This package contains the API documentation for %{name}.
%doc LICENSE.txt
%changelog
+* Wed Feb 04 2015 Michal Srb <msrb(a)redhat.com> - 1.4-1
+- Update to upstream version 1.4
+
* Mon Jun 09 2014 Michal Srb <msrb(a)redhat.com> - 1.3-4
- Install only JAR files
diff --git a/sources b/sources
index c42e0de..9bb9e3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98b3eba5b41e84545c12e232c4a4878a instance-identity-1.3.tar.gz
+a53fe58aacabf91e464abfac1f8bb70f instance-identity-1.4.tar.gz
9 years, 3 months
[hamcrest] Port to QDox 2.0
by Mikolaj Izdebski
commit 1ff4a50d8fbdcbdc224f9d664750b8aaf1fa5685
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 13:59:47 2015 +0100
Port to QDox 2.0
- Resolves: rhbz#1166700
hamcrest-1.3-qdox-2.0.patch | 92 +++++++++++++++++++++++++++++++++++++++++++
hamcrest.spec | 9 ++++-
2 files changed, 100 insertions(+), 1 deletions(-)
---
diff --git a/hamcrest-1.3-qdox-2.0.patch b/hamcrest-1.3-qdox-2.0.patch
new file mode 100644
index 0000000..d9eb779
--- /dev/null
+++ b/hamcrest-1.3-qdox-2.0.patch
@@ -0,0 +1,92 @@
+diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
+index efaf615..338178d 100644
+--- a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
++++ b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
+@@ -1,6 +1,6 @@
+ package org.hamcrest.generator;
+
+-import com.thoughtworks.qdox.JavaDocBuilder;
++import com.thoughtworks.qdox.JavaProjectBuilder;
+ import com.thoughtworks.qdox.model.JavaClass;
+
+ import java.io.File;
+@@ -16,7 +16,7 @@ import java.io.Reader;
+ */
+ public class QDox {
+
+- private final JavaDocBuilder javaDocBuilder = new JavaDocBuilder();
++ private final JavaProjectBuilder javaDocBuilder = new JavaProjectBuilder();
+
+ public void addSourceTree(File sourceDir) {
+ javaDocBuilder.addSourceTree(sourceDir);
+diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
+index 5108140..ec02f54 100644
+--- a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
++++ b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
+@@ -4,8 +4,10 @@ import com.thoughtworks.qdox.model.DocletTag;
+ import com.thoughtworks.qdox.model.JavaClass;
+ import com.thoughtworks.qdox.model.JavaMethod;
+ import com.thoughtworks.qdox.model.JavaParameter;
+-import com.thoughtworks.qdox.model.Type;
++import com.thoughtworks.qdox.model.JavaType;
++import com.thoughtworks.qdox.model.impl.DefaultJavaType;
+
++import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.regex.Pattern;
+@@ -56,15 +58,15 @@ public class QDoxFactoryReader implements Iterable<FactoryMethod> {
+ JavaMethod methodSource = findMethodInSource(factoryMethod);
+ if (methodSource != null) {
+ factoryMethod.setJavaDoc(createJavaDocComment(methodSource));
+- JavaParameter[] parametersFromSource
++ List<JavaParameter> parametersFromSource
+ = methodSource.getParameters();
+ List<FactoryMethod.Parameter> parametersFromReflection
+ = factoryMethod.getParameters();
+
+- if (parametersFromReflection.size() == parametersFromSource.length) {
+- for (int i = 0; i < parametersFromSource.length; i++) {
++ if (parametersFromReflection.size() == parametersFromSource.size()) {
++ for (int i = 0; i < parametersFromSource.size(); i++) {
+ parametersFromReflection.get(i).setName(
+- parametersFromSource[i].getName());
++ parametersFromSource.get(i).getName());
+ }
+ }
+ }
+@@ -79,18 +81,18 @@ public class QDoxFactoryReader implements Iterable<FactoryMethod> {
+ // Note, this doesn't always work - it struggles with some kinds of generics.
+ // This seems to cover most cases though.
+ List<FactoryMethod.Parameter> params = factoryMethod.getParameters();
+- Type[] types = new Type[params.size()];
++ List<JavaType> types = new ArrayList<JavaType>(params.size());
+ boolean varArgs = false;
+- for (int i = 0; i < types.length; i++) {
++ for (int i = 0; i < params.size(); i++) {
+ String type = params.get(i).getType();
+ varArgs = VARARGS_REGEX.matcher(type).find();
+ // QDox ignores varargs and generics, so we strip them out to help QDox.
+ type = GENERIC_REGEX.matcher(type).replaceAll("");
+ type = VARARGS_REGEX.matcher(type).replaceAll("");
+- types[i] = new Type(type);
++ types.add(new DefaultJavaType(type));
+ }
+- JavaMethod[] methods = classSource.getMethodsBySignature(factoryMethod.getName(), types, false, varArgs);
+- return methods.length == 1 ? methods[0] : null;
++ List<JavaMethod> methods = classSource.getMethodsBySignature(factoryMethod.getName(), types, false, varArgs);
++ return methods.size() == 1 ? methods.get(0) : null;
+ }
+
+ /**
+@@ -98,8 +100,8 @@ public class QDoxFactoryReader implements Iterable<FactoryMethod> {
+ */
+ private static String createJavaDocComment(JavaMethod methodSource) {
+ String comment = methodSource.getComment();
+- DocletTag[] tags = methodSource.getTags();
+- if ((comment == null || comment.trim().length() == 0) && tags.length == 0) {
++ List<DocletTag> tags = methodSource.getTags();
++ if ((comment == null || comment.trim().length() == 0) && tags.size() == 0) {
+ return null;
+ }
+ StringBuilder result = new StringBuilder();
diff --git a/hamcrest.spec b/hamcrest.spec
index e2cd5b8..00038b5 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -42,7 +42,7 @@
Name: hamcrest
Version: 1.3
-Release: 8%{?dist}
+Release: 9%{?dist}
Epoch: 0
Summary: Library of matchers for building test expressions
License: BSD
@@ -68,6 +68,7 @@ Source12: hamcrest-generator-MANIFEST.MF
Patch0: %{name}-%{version}-build.patch
Patch1: %{name}-%{version}-no-jarjar.patch
Patch3: %{name}-%{version}-javadoc.patch
+Patch4: %{name}-%{version}-qdox-2.0.patch
Requires: java-headless >= 1:1.6.0
Requires: qdox
@@ -79,6 +80,7 @@ BuildRequires: ant >= 0:1.6.5
BuildRequires: ant-junit
BuildRequires: zip
BuildRequires: easymock3
+BuildRequires: perl
%if %with jarjar
BuildRequires: jarjar
%endif
@@ -141,6 +143,7 @@ ln -sf $(build-classpath testng-jdk15) lib/integration/
%patch1 -p1
%endif
%patch3 -p1
+%patch4 -p1
perl -pi -e 's/\r$//g' LICENSE.txt
@@ -238,6 +241,10 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name}
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.3-9
+- Port to QDox 2.0
+- Resolves: rhbz#1166700
+
* Wed Jul 30 2014 Mat Booth <mat.booth(a)redhat.com> - 0:1.3-8
- Fix FTBFS
- Always build integration jar (removes some complexity from the spec)
9 years, 3 months
[Bug 1069919] CVE-2014-0033 tomcat: session fixation still possible with disableURLRewriting enabled
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1069919
Ján Rusnačko <jrusnack(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |jrusnack(a)redhat.com
Whiteboard|impact=moderate,public=2014 |impact=moderate,public=2014
|0225,reported=20140225,sour |0225,reported=20140225,sour
|ce=internet,cvss2=4.3/AV:N/ |ce=internet,cvss2=4.3/AV:N/
|AC:M/Au:N/C:P/I:N/A:N,bpms- |AC:M/Au:N/C:P/I:N/A:N,bpms-
|6/jbossweb=notaffected,brms |6/jbossweb=notaffected,brms
|-6/jbossweb=notaffected,dts |-6/jbossweb=notaffected,dts
|-2.0/devtoolset-2-tomcat=no |-2.0/devtoolset-2-tomcat=no
|taffected,eap-6/jbossweb=no |taffected,eap-6/jbossweb=no
|taffected,fedora-all/tomcat |taffected,fedora-all/tomcat
|=notaffected,fsw-6/jbossweb |=notaffected,fsw-6/jbossweb
|=notaffected,jbews-1/tomcat |=notaffected,jbews-1/tomcat
|5=notaffected,jbews-1/tomca |5=notaffected,jbews-1/tomca
|t6=notaffected,jbews-2/tomc |t6=notaffected,jbews-2/tomc
|at6=affected,jbews-2/tomcat |at6=affected,jbews-2/tomcat
|7=notaffected,jboss/jbosswe |7=notaffected,jboss/jbosswe
|b7=notaffected,jdg-6/jbossw |b7=notaffected,jdg-6/jbossw
|eb=notaffected,jdv-6/jbossw |eb=notaffected,jdv-6/jbossw
|eb=notaffected,jon-3/jbossw |eb=notaffected,jon-3/jbossw
|eb=notaffected,jpp-6/jbossw |eb=notaffected,jpp-6/jbossw
|eb=notaffected,openshift-1/ |eb=notaffected,openshift-1/
|tomcat7=notaffected,rhel-5/ |tomcat7=notaffected,rhel-5/
|tomcat5=notaffected,rhel-6. |tomcat5=notaffected,rhel-6.
|5.z/tomcat6=notaffected,rhe |5.z/tomcat6=notaffected,rhe
|l-6/tomcat6=notaffected,rhe |l-6/tomcat6=notaffected,rhe
|l-7/tomcat=notaffected,rhel |l-7/tomcat=notaffected,rhel
|-6.5.z/tomcat6=notaffected, |-6.5.z/tomcat6=notaffected,
|rhel-6.6/tomcat6=notaffecte |rhel-6.6/tomcat6=notaffecte
|d,eap-5/jbossweb=wontfix,jb |d,eap-5/jbossweb=wontfix,jb
|oss/jbossweb2=wontfix |oss/jbossweb2=wontfix,cwe=C
| |WE-384
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=AVfXUklifI&a=cc_unsubscribe
9 years, 3 months
[aether-ant-tasks] Update to upstream version 1.0.1
by Mikolaj Izdebski
commit 39fddbe176e2714ff466b8f43cc82468c91128d8
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 13:37:35 2015 +0100
Update to upstream version 1.0.1
.gitignore | 1 +
0001-Add-support-for-XMvn-workspace-reader.patch | 6 +++---
...3.2.3.patch => 0002-Update-to-Maven-3.2.3.patch | 12 ++++++------
aether-ant-tasks.spec | 11 +++++++----
sources | 2 +-
5 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1d0a15c..b3b2dca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/aether-ant-tasks-0.9.0.M4.tar.bz2
/aether-ant-tasks-0.9.0.v20140226.tar.bz2
/aether-ant-tasks-1.0.0.v20140518.tar.bz2
+/aether-ant-tasks-1.0.1.v20141111.tar.bz2
diff --git a/0001-Add-support-for-XMvn-workspace-reader.patch b/0001-Add-support-for-XMvn-workspace-reader.patch
index 86e6389..bc71a10 100644
--- a/0001-Add-support-for-XMvn-workspace-reader.patch
+++ b/0001-Add-support-for-XMvn-workspace-reader.patch
@@ -1,7 +1,7 @@
-From 59f7850fd2cde1c5af1aaa6f2a8a50585e490ff8 Mon Sep 17 00:00:00 2001
+From 5b975bc4bb0d61c686fb3f0fbdbf4a8f6d23e26c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed, 11 Sep 2013 18:31:04 +0200
-Subject: [PATCH] Add support for XMvn workspace reader
+Subject: [PATCH 1/2] Add support for XMvn workspace reader
---
.../org/eclipse/aether/internal/ant/AntRepoSys.java | 21 +++++++++++++++++++++
@@ -61,5 +61,5 @@ index 76cc927..ee1d444 100644
}
--
-1.9.0
+2.1.0
diff --git a/0001-Update-to-Maven-3.2.3.patch b/0002-Update-to-Maven-3.2.3.patch
similarity index 91%
rename from 0001-Update-to-Maven-3.2.3.patch
rename to 0002-Update-to-Maven-3.2.3.patch
index 28ef4e9..fb2d49c 100644
--- a/0001-Update-to-Maven-3.2.3.patch
+++ b/0002-Update-to-Maven-3.2.3.patch
@@ -1,7 +1,7 @@
-From a31528c40665cefc216a2cf8a37f1b00a29a55f8 Mon Sep 17 00:00:00 2001
+From 240b4be7a73fb83f14065cca917615a06a3b4fb0 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri, 7 Nov 2014 14:48:21 +0100
-Subject: [PATCH] Update to Maven 3.2.3
+Subject: [PATCH 2/2] Update to Maven 3.2.3
---
pom.xml | 2 +-
@@ -9,16 +9,16 @@ Subject: [PATCH] Update to Maven 3.2.3
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 7f0eb73..03ef826 100644
+index 7d22ca6..18ce0d3 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -114,7 +114,7 @@
+@@ -117,7 +117,7 @@
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<sonatypeOssDistMgmtSnapshotsId>sonatype-nexus-snapshots</sonatypeOssDistMgmtSnapshotsId>
<sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
- <mavenVersion>3.1.0</mavenVersion>
+ <mavenVersion>3.2.3</mavenVersion>
- <aetherVersion>1.0.0.v20140518</aetherVersion>
+ <aetherVersion>1.0.1.v20141111</aetherVersion>
</properties>
diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java
@@ -60,5 +60,5 @@ index dc7ef72..e0d40c5 100644
+
}
--
-1.9.3
+2.1.0
diff --git a/aether-ant-tasks.spec b/aether-ant-tasks.spec
index 63b3971..a26eb4e 100644
--- a/aether-ant-tasks.spec
+++ b/aether-ant-tasks.spec
@@ -1,9 +1,9 @@
-%global vertag v20140518
+%global vertag v20141111
Name: aether-ant-tasks
Epoch: 1
-Version: 1.0.0
-Release: 3%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
Summary: Ant tasks using Aether to resolve, install and deploy artifacts
Group: Development/Libraries
BuildArch: noarch
@@ -14,7 +14,7 @@ Source0: http://git.eclipse.org/c/aether/aether-ant.git/snapshot/%{name}-
Source5: ant-classpath
Patch0001: 0001-Add-support-for-XMvn-workspace-reader.patch
-Patch0002: 0001-Update-to-Maven-3.2.3.patch
+Patch0002: 0002-Update-to-Maven-3.2.3.patch
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
@@ -80,6 +80,9 @@ install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/ant.d/%{name}
%doc epl-v10.html notice.html
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:1.0.1-1
+- Update to upstream version 1.0.1
+
* Fri Nov 7 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:1.0.0-3
- Update to Maven 3.2.3
diff --git a/sources b/sources
index 1246244..13c3363 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d257385d092f579585ab423f27a25a0 aether-ant-tasks-1.0.0.v20140518.tar.bz2
+37c2b83c5dd2ed2d23853a2e1e2cba5a aether-ant-tasks-1.0.1.v20141111.tar.bz2
9 years, 3 months