You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/01/16 14:48:31 UTC
[cxf] branch 3.3.x-fixes updated (e32d89a -> f5299b7)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from e32d89a [CXF-8193]add missing file for test
new 3a2dfea fix OSGi tests after Central Repository is Moving to HTTPS
new bcd5339 Recording .gitmergeinfo Changes
new f5299b7 Recording .gitmergeinfo Changes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 4 ++++
.../java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 9 +++++++++
.../cxf/systest/sts/itests/BasicSTSIntegrationTest.java | 9 +++++++++
.../org/apache/cxf/xkms/itests/BasicIntegrationTest.java | 13 +++++++------
4 files changed, 29 insertions(+), 6 deletions(-)
[cxf] 01/03: fix OSGi tests after Central Repository is Moving to
HTTPS
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3a2dfead4f48b9c9e41e48eddb512c1dfe3c046c
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Jan 16 14:28:28 2020 +0300
fix OSGi tests after Central Repository is Moving to HTTPS
(cherry picked from commit 3bc04a93816d7d60e0d5ee8dbd6397cf26ec7ae8)
---
.../java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 9 +++++++++
.../cxf/systest/sts/itests/BasicSTSIntegrationTest.java | 9 +++++++++
.../org/apache/cxf/xkms/itests/BasicIntegrationTest.java | 13 +++++++------
3 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index 47dc108..b25eb07 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -50,6 +50,11 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDist
*/
public class CXFOSGiTestSupport {
+ // Adding apache snapshots as cxf trunk may contain snapshot dependencies
+ // https://blog.sonatype.com/central-repository-moving-to-https
+ private static final String REPOS = "https://repo1.maven.org/maven2@id=central,"
+ + "http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases";
+
@Inject
protected BundleContext bundleContext;
@@ -90,6 +95,8 @@ public class CXFOSGiTestSupport {
//debugConfiguration(), // nor this
systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
systemProperty("java.awt.headless").value("true"),
+ editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+ "org.ops4j.pax.url.mvn.repositories", REPOS),
when(localRepo != null)
.useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
"org.ops4j.pax.url.mvn.localRepository",
@@ -134,6 +141,8 @@ public class CXFOSGiTestSupport {
//debugConfiguration(), // nor this
systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
systemProperty("java.awt.headless").value("true"),
+ editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+ "org.ops4j.pax.url.mvn.repositories", REPOS),
when(localRepo != null)
.useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
"org.ops4j.pax.url.mvn.localRepository",
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
index 9064b65..7a1a3c0 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
@@ -42,6 +42,11 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceCo
@ExamReactorStrategy(PerClass.class)
public class BasicSTSIntegrationTest {
+ // Adding apache snapshots as cxf trunk may contain snapshot dependencies
+ // https://blog.sonatype.com/central-repository-moving-to-https
+ private static final String REPOS = "https://repo1.maven.org/maven2@id=central,"
+ + "http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases";
+
@Configuration
public Option[] getConfig() {
String port = TestUtil.getPortNumber(BasicSTSIntegrationTest.class);
@@ -69,6 +74,8 @@ public class BasicSTSIntegrationTest {
.useDeployFolder(false),
systemProperty("java.awt.headless").value("true"),
systemProperty("BasicSTSIntegrationTest.PORT").value(port),
+ editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+ "org.ops4j.pax.url.mvn.repositories", REPOS),
copy("clientKeystore.properties"), copy("clientstore.jks"),
editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
@@ -112,6 +119,8 @@ public class BasicSTSIntegrationTest {
.useDeployFolder(false),
systemProperty("java.awt.headless").value("true"),
systemProperty("BasicSTSIntegrationTest.PORT").value(port),
+ editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+ "org.ops4j.pax.url.mvn.repositories", REPOS),
copy("clientKeystore.properties"), copy("clientstore.jks"),
editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
index 669aead..f3b0eea 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
@@ -53,8 +53,9 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceCo
public class BasicIntegrationTest {
// Adding apache snapshots as cxf trunk may contain snapshot dependencies
- //private static final String REPOS = "http://repo1.maven.org/maven2@id=central, "
- // + "http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache-snapshots ";
+ // https://blog.sonatype.com/central-repository-moving-to-https
+ private static final String REPOS = "https://repo1.maven.org/maven2@id=central,"
+ + "http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases";
@Inject
protected XKMSPortType xkmsService;
@@ -91,8 +92,8 @@ public class BasicIntegrationTest {
copy("data/xkms/certificates/cas/alice.cer"),
copy("data/xkms/certificates/dave.cer"),
copy("data/xkms/certificates/http___localhost_8080_services_TestService.cer"),
- // editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- // "org.ops4j.pax.url.mvn.repositories", REPOS),
+ editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+ "org.ops4j.pax.url.mvn.repositories", REPOS),
editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
"org.osgi.service.http.port", port),
editConfigurationFilePut("etc/org.apache.cxf.xkms.client.cfg",
@@ -150,8 +151,8 @@ public class BasicIntegrationTest {
copy("data/xkms/certificates/cas/alice.cer"),
copy("data/xkms/certificates/dave.cer"),
copy("data/xkms/certificates/http___localhost_8080_services_TestService.cer"),
- // editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
- // "org.ops4j.pax.url.mvn.repositories", REPOS),
+ editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+ "org.ops4j.pax.url.mvn.repositories", REPOS),
editConfigurationFilePut("etc/org.ops4j.pax.web.cfg",
"org.osgi.service.http.port", port),
editConfigurationFilePut("etc/org.apache.cxf.xkms.client.cfg",
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f5299b7d9fc72b64e154edd57c299df5cea7616e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Jan 16 14:48:17 2020 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1a30228..bd01bc2 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -19,6 +19,7 @@ B 1e01eef91b69706c55874d8df5e14a555d11c91a
B 1e3eb7b3edf841d00a284d891b3cee76b64f4b89
B 212b83f2da31deff076e5869a30563a90d633aea
B 214e375e1a3771ece687294c4313da0641bea99b
+B 2425fad2eb3a31b643e4f6d23115f3dc146027a7
B 24af0f4bb4737a08a8211340f8c85d74bb5d8450
B 26212d8581b27825fd9ccaf2894c1ce3c8854743
B 27092895f73a6611190634a6d04a1e83e6c6fdd5
[cxf] 02/03: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit bcd5339dc3dd41e9a8d07c4b9e5d6913833883b3
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Jan 16 14:48:04 2020 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1c16ff2..1a30228 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -59,6 +59,7 @@ B 71b0cee7b2148af88c005cccd4c46f64ffbf62dd
B 723bb16431f1f03ed600c1b0c39049cb55c105d0
B 75bd4e800746b9f483146e4d15ffef3ad4f934cf
B 75e9ae0a7d31c14098e821e723cd766aa1e88785
+B 760cbae3a958897bdad61aa6779a1677e1bfb53e
B 7689d884a64db0352cdb1ac9ee0628a26491f35a
B 7b333d06910b3d4a84dd77a3c76b48d1b44525b3
B 7f20ddfabf5b2ed4c84b1ae6a1cac715f8d6b076
@@ -66,6 +67,7 @@ B 85ba0e6e65374df37b253f32a183b336b6d64991
B 8723ff4f63020ba966268561b689fd9eb4349fda
B 8bbe66a1ae5744ec72d9619e95efa606b080b169
B 8f93152ae86c2d24b95ed9ce5599e6f5453091bc
+B 91634e844c1a062588ee3b338949d77621e3f8ab
B 9196f3364085c9f9ba6319d7b068d44206b0e290
B 930e6e5cbd64279a356560100090f04d81941182
B 964573a4d386339fd38a21885317ddfe338fd7a6
@@ -105,6 +107,7 @@ M 160f50ed9bd9391b61417716b3a67653c9e81a98
M 2275d49772676ac72bc14ebbc3173719cd72e635
M 325ed0436bc9cfa9150b3504a54b5911b47e3266
M 3b119ca6630f1384b93cd718d0cd95ccabc81e91
+M 528b35178ec31860cf5ad2095d6f3cc3c951d914
M 55abc6f8416fd81f26627fa42a37f903f9ef7965
M 589e321622b72ae57fab910d76b3e4fb0c160979
M 59ba4821c92146723df063f9eb6e1c3ae0be5834