[activemq] Removed geronimo-annotation optional dependency (#913872)
by Matt Spaulding
commit 20e4acd150707a4c9cd00c723f9ed48576e05c9c
Author: Matt Spaulding <mspaulding06(a)gmail.com>
Date: Sun Mar 3 13:21:35 2013 -0800
Removed geronimo-annotation optional dependency (#913872)
activemq.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/activemq.spec b/activemq.spec
index e3bf231..5db7d54 100644
--- a/activemq.spec
+++ b/activemq.spec
@@ -1,6 +1,6 @@
Name: activemq
Version: 5.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Open source messaging and Integration Patterns server
Group: Development/Libraries
License: ASL 2.0
@@ -147,6 +147,7 @@ rm -rf %{name}-core/src/main/java/org/apache/activemq/transport/mqtt
%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec %{name}-core/pom.xml
%pom_remove_dep org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec %{name}-core/pom.xml
%pom_remove_dep org.apache.geronimo.specs:geronimo-jacc_1.1_spec %{name}-core/pom.xml
+%pom_remove_dep org.apache.geronimo.specs:geronimo-annotation_1.0_spec %{name}-core/pom.xml
chmod 644 LICENSE README.txt
@@ -202,6 +203,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%{_mavenpomdir}/JPP.%{name}-kahadb.pom
%changelog
+* Sun Mar 03 2013 Matt Spaulding <mspaulding06(a)gmail.com> - 5.6.0-5
+- Removed optional geronimo-annotation dependency from activemq-core
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 5.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
11 years
[tycho] Update to using Jetty 9 API.
by Roland Grunberg
commit 7b807213fcfbad053d6100b27fca61576d2ac84b
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Thu Feb 28 14:02:25 2013 -0500
Update to using Jetty 9 API.
tycho-fix-build.patch | 32 ++++++++++++++++++++++++++++++--
tycho.spec | 5 ++++-
2 files changed, 34 insertions(+), 3 deletions(-)
---
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index 8453287..ac60d8b 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -1,4 +1,4 @@
-From 60d5610ddd39fb890687bb8c0a3b1255c6d01914 Mon Sep 17 00:00:00 2001
+From afb7aaef05da393028d1bfddf8eb472e6ba6a893 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400
Subject: [PATCH] Fix the Tycho build to work on Fedora.
@@ -17,6 +17,8 @@ so we must provide a way to disable it. (skipTychoVersionCheck)
As of Eclipse Kepler, the bundle 'org.junit4' is no longer provided.
Packages requiring JUnit 4 must use proper versioning on 'org.junit'.
+Update to using Jetty 9 API.
+
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
---
pom.xml | 5 -----
@@ -24,13 +26,14 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java | 2 +-
+ .../src/main/java/org/eclipse/tycho/test/util/HttpServer.java | 5 +++--
.../tycho-bundles-external/tycho-bundles-external.product | 1 -
.../tycho-standalone-p2-director/p2 Director.product | 1 -
tycho-compiler-jdt/pom.xml | 4 ----
.../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++-
.../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
.../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
- 11 files changed, 21 insertions(+), 23 deletions(-)
+ 12 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5776b0e..41e8bdf 100644
@@ -107,6 +110,31 @@ index 87c9e11..927cea5 100644
result.add(new SystemCapability(Type.OSGI_EE, name, version));
} else if (PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE.equals(namespace)) {
result.add(new SystemCapability(Type.JAVA_PACKAGE, name, version));
+diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java
+index 1a27b00..eb110dc 100644
+--- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java
++++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java
+@@ -20,9 +20,10 @@ import java.util.Random;
+ import org.eclipse.jetty.security.ConstraintMapping;
+ import org.eclipse.jetty.security.ConstraintSecurityHandler;
+ import org.eclipse.jetty.security.HashLoginService;
++import org.eclipse.jetty.server.AbstractNetworkConnector;
+ import org.eclipse.jetty.server.Connector;
+ import org.eclipse.jetty.server.Server;
+-import org.eclipse.jetty.server.bio.SocketConnector;
++import org.eclipse.jetty.server.ServerConnector;
+ import org.eclipse.jetty.servlet.ServletContextHandler;
+ import org.eclipse.jetty.servlet.ServletHolder;
+ import org.eclipse.jetty.util.security.Constraint;
+@@ -68,7 +69,7 @@ public class HttpServer {
+
+ private static HttpServer doStartServer(String username, String password, int port) throws Exception {
+ Server server = new Server();
+- Connector connector = new SocketConnector();
++ AbstractNetworkConnector connector = new ServerConnector(server);
+ connector.setPort(port);
+ server.addConnector(connector);
+
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
index dea801e..4733ad0 100644
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
diff --git a/tycho.spec b/tycho.spec
index 4aed15f..8ade019 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -8,7 +8,7 @@
Name: tycho
Version: 0.17.0
-Release: 0.2.git3351b1%{?dist}
+Release: 0.3.git3351b1%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -259,6 +259,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
+* Thu Feb 28 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.17.0-0.3.git3351b1
+- Update to using Jetty 9 API.
+
* Mon Feb 25 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.17.0-0.2.git3351b1
- Set the global default execution environment to JavaSE-1.6.
- Patch clean-up.
11 years, 1 month
[Bug 917084] CVE-2013-0253 maven: all SSL certificate checking is disabled by default
by Red Hat Bugzilla
Product: Security Response
https://bugzilla.redhat.com/show_bug.cgi?id=917084
Vincent Danen <vdanen(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |akurtako(a)redhat.com,
| |bkabrda(a)redhat.com,
| |bleanhar(a)redhat.com,
| |ccoleman(a)redhat.com,
| |dmcphers(a)redhat.com,
| |java-sig-commits(a)lists.fedo
| |raproject.org,
| |jialiu(a)redhat.com,
| |lmeyer(a)redhat.com,
| |mizdebsk(a)redhat.com,
| |msrb(a)redhat.com,
| |sochotni(a)redhat.com
CC| |tkramer(a)redhat.com,
| |tradej(a)redhat.com
--
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=NNCLPbmmQv&a=cc_unsubscribe
11 years, 1 month