You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:56:43 UTC
[sling-org-apache-sling-paxexam-util] annotated tag
org.apache.sling.paxexam.util-1.0.4 created (now 1a7557e)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git.
at 1a7557e (tag)
tagging 8ef31dc4f156a53217803fa0ab6c2eb178ca0402 (commit)
by Stefan Seifert
on Thu May 4 19:55:28 2017 +0000
- Log -----------------------------------------------------------------
org.apache.sling.paxexam.util-1.0.4
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new a2c690a Playing with pax exam bundle provisioning driven by Sling bundle lists - still quite rough
new 1c36770 Sling pax utilities - SlingRepositoryTest demonstrates a simple launchpad-based test
new f2653fb Take sling.run.modes into account
new 3482129 Use specific launchpad version
new 2393110 SLING-3147 - move sling-pax-util under contrib
new ba53539 Cannot logout if session is null...
new bd3205f Explain how to create such tests
new 09971e2 SLING-2788 - move sling-pax-util under testing
new 0f39771 SLING-2788 - move sling-pax-util under testing
new 3d6a06f SLING-2788 - prepare for release
new 038bd42 SLING-2788 - explain this better
new ddedcb9 [maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.2
new f04d875 SLING-2788 - add missing <scm> section
new 71c6989 [maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.2
new b388414 [maven-release-plugin] prepare for next development iteration
new 40a7200 Update to parent pom v19
new ee6bb43 Update .gitignore files
new 7636d9f Updated to parent version 20
new 08babab Update to Sling Parent POM 22 with baselining enabled
new d40f7c2 Use released Sling Launchpad 7 and adapt bundle lists
new 14ab9e5 Add local StartupHandler so that SlingSettingsService starts
new 56bc050 Add missing excludes for rat
new 9377f69 SLING-4698 - Set parent.relativePath to empty for all modules
new ede4f47 SLING-4832 - SlingPaxOptions.setIgnoredBundles added, with tests
new 103f590 Update to Sling Parent 23
new e5551e3 set parent version to 24 and add empty relativePath where missing
new ccb5dd0 Update the main reactor to parent 25
new 92498ea Switch to parent pom 26
new 5db9d91 Move to parent pom 30
new b0da372 fix javadoc errors
new d4c8c26 [maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.4
new 8ef31dc [maven-release-plugin] copy for tag org.apache.sling.paxexam.util-1.0.4
The 32 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.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-paxexam-util] 04/18: Updated to parent
version 20
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 7636d9f11a7e05303871de9a9c91bca044733765
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Aug 1 19:16:26 2014 +0000
Updated to parent version 20
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1615208 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8cf7aa5..9a4bcfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>19</version>
+ <version>20</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 12/18: set parent version to
24 and add empty relativePath where missing
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit e5551e386d826ac02ce12cf8f239b8b6366dc7e3
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 08:09:17 2015 +0000
set parent version to 24 and add empty relativePath where missing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1689593 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index affdd36..d6a39ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>23</version>
+ <version>24</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 01/18: [maven-release-plugin]
prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit b388414ed3eb390310d517b642d106fc614f356a
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jan 24 13:10:28 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1560984 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ad9784d..25ee230 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.paxexam.util</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Sling Pax Exam Utilities</name>
@@ -40,9 +40,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.paxexam.util-1.0.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 07/18: Add local
StartupHandler so that SlingSettingsService starts
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 14ab9e5774c3b7c77020cdd6ac079cadc5c8d738
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Nov 3 14:13:27 2014 +0000
Add local StartupHandler so that SlingSettingsService starts
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1636357 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/paxexam/util/SlingSetupTest.java | 40 +++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
index 2d8ad19..13e40c2 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
@@ -25,6 +25,10 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.sling.launchpad.api.StartupHandler;
+import org.apache.sling.launchpad.api.StartupMode;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -34,6 +38,7 @@ import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
/** Verify that we get a working Sling launchpad with what SlingPaxOptions provide */
@RunWith(PaxExam.class)
@@ -46,10 +51,42 @@ public class SlingSetupTest {
@Inject
private BundleContext bundleContext;
+ private ServiceRegistration<?> startupHandlerRegistration;
+
@org.ops4j.pax.exam.Configuration
public Option[] config() {
return SlingPaxOptions.defaultLaunchpadOptions(SLING_LAUNCHPAD_VERSION).getOptions();
}
+
+ @Before
+ public void setup() {
+ // In Sling launchpad 7 the SlingSettings service
+ // requires a StartupHandler, and that's usually provided
+ // by the launchpad bootstrap code. Supply our own so that
+ // everything starts properly.
+ // TODO should be provided by a utility/bootstrap bundle
+ final StartupHandler h = new StartupHandler() {
+ public void waitWithStartup(boolean b) {
+ }
+
+ public boolean isFinished() {
+ return true;
+ }
+
+ public StartupMode getMode() {
+ return StartupMode.INSTALL;
+ }
+ };
+ startupHandlerRegistration = bundleContext.registerService(StartupHandler.class.getName(), h, null);
+ }
+
+ @After
+ public void cleanup() {
+ if(startupHandlerRegistration != null) {
+ startupHandlerRegistration.unregister();
+ startupHandlerRegistration = null;
+ }
+ }
private void assertBundleActive(String symbolicName) {
assertEquals("Expecting bundle to be active:" + symbolicName, Bundle.ACTIVE, getBundleState(symbolicName));
@@ -220,7 +257,8 @@ public class SlingSetupTest {
final String [] services = {
"org.apache.sling.engine.SlingRequestProcessor",
"org.apache.sling.commons.mime.MimeTypeService",
- "org.apache.sling.jcr.api.SlingRepository"
+ "org.apache.sling.jcr.api.SlingRepository",
+ "org.apache.sling.settings.SlingSettingsService"
};
final List<String> missing = new ArrayList<String>();
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 09/18: SLING-4698 - Set
parent.relativePath to empty for all modules
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 9377f69caaa66b3093338ee676fd56353c41953d
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 7 10:14:40 2015 +0000
SLING-4698 - Set parent.relativePath to empty for all modules
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1678154 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8ccb357..6e9b378 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <relativePath/>
</parent>
<groupId>org.apache.sling</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 05/18: Update to Sling Parent
POM 22 with baselining enabled
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 08babab70e5edd78333d38b4e6685cf5803ebb89
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:36:14 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1628610 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9a4bcfd..9a32f1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 03/18: Update .gitignore files
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit ee6bb4323e906f9efc0b3e817e8639fb2065ad49
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri May 2 09:38:33 2014 +0000
Update .gitignore files
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1591844 13f79535-47bb-0310-9956-ffa450edef68
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b302b02
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/jackrabbit
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 06/18: Use released Sling
Launchpad 7 and adapt bundle lists
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit d40f7c2c8c2ccef02558bb8e16ab8b80f1eee1ea
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Nov 3 11:18:09 2014 +0000
Use released Sling Launchpad 7 and adapt bundle lists
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1636322 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/paxexam/util/SlingRepositoryTest.java | 2 +-
.../apache/sling/paxexam/util/SlingSetupTest.java | 75 ++++++++++++++++++++--
2 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
index 18bbd3e..4abc6a9 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
@@ -46,7 +46,7 @@ public class SlingRepositoryTest {
private SlingRepository repository;
/** Use a released launchpad for this example */
- public static final String SLING_LAUNCHPAD_VERSION = "6";
+ public static final String SLING_LAUNCHPAD_VERSION = "7";
@org.ops4j.pax.exam.Configuration
public Option[] config() {
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
index 0738efd..2d8ad19 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
@@ -41,7 +41,7 @@ import org.osgi.framework.ServiceReference;
public class SlingSetupTest {
/** Use a released launchpad for this example */
- public static final String SLING_LAUNCHPAD_VERSION = "6";
+ public static final String SLING_LAUNCHPAD_VERSION = "7";
@Inject
private BundleContext bundleContext;
@@ -90,56 +90,117 @@ public class SlingSetupTest {
@Test
public void testSlingBundles() {
- final String [] bundles = {
+ final String [] LAUNCHPAD_7_BUNDLES = {
+ "derby",
+ "jcl.over.slf4j",
+ "log4j.over.slf4j",
+ "org.apache.aries.jmx.api",
+ "org.apache.aries.jmx.core",
+ "org.apache.aries.jmx.whiteboard",
+ "org.apache.aries.util",
+ "org.apache.commons.codec",
+ "org.apache.commons.collections",
+ "org.apache.commons.fileupload",
+ "org.apache.commons.io",
+ "org.apache.commons.lang",
+ "org.apache.commons.math",
+ "org.apache.commons.pool",
+ "org.apache.felix.bundlerepository",
+ "org.apache.felix.configadmin",
+ "org.apache.felix.eventadmin",
+ "org.apache.felix.framework",
+ //"org.apache.felix.http.api",
+ "org.apache.felix.http.jetty",
+ //"org.apache.felix.http.servlet-api",
+ "org.apache.felix.http.whiteboard",
+ "org.apache.felix.inventory",
+ "org.apache.felix.metatype",
+ "org.apache.felix.prefs",
+ "org.apache.felix.scr",
+ "org.apache.felix.webconsole",
+ "org.apache.felix.webconsole.plugins.ds",
+ "org.apache.felix.webconsole.plugins.event",
+ "org.apache.felix.webconsole.plugins.memoryusage",
+ "org.apache.felix.webconsole.plugins.obr",
+ "org.apache.felix.webconsole.plugins.packageadmin",
+ "org.apache.geronimo.bundles.commons-httpclient",
+ "org.apache.geronimo.bundles.json",
+ "org.apache.geronimo.bundles.jstl",
+ "org.apache.jackrabbit.jackrabbit-api",
+ "org.apache.jackrabbit.jackrabbit-jcr-commons",
+ "org.apache.jackrabbit.jackrabbit-jcr-rmi",
+ "org.apache.jackrabbit.jackrabbit-spi",
+ "org.apache.jackrabbit.jackrabbit-spi-commons",
+ "org.apache.jackrabbit.jackrabbit-webdav",
+ "org.apache.servicemix.bundles.concurrent",
"org.apache.sling.adapter",
"org.apache.sling.api",
"org.apache.sling.auth.core",
"org.apache.sling.auth.form",
- "org.apache.sling.auth.openid",
- "org.apache.sling.auth.selector",
"org.apache.sling.bundleresource.impl",
"org.apache.sling.commons.classloader",
+ "org.apache.sling.commons.compiler",
"org.apache.sling.commons.json",
"org.apache.sling.commons.log",
+ "org.apache.sling.commons.logservice",
"org.apache.sling.commons.mime",
"org.apache.sling.commons.osgi",
"org.apache.sling.commons.scheduler",
"org.apache.sling.commons.threads",
+ "org.apache.sling.discovery.api",
+ "org.apache.sling.discovery.impl",
+ "org.apache.sling.discovery.support",
"org.apache.sling.engine",
"org.apache.sling.event",
"org.apache.sling.extensions.explorer",
"org.apache.sling.extensions.threaddump",
"org.apache.sling.extensions.webconsolebranding",
"org.apache.sling.extensions.webconsolesecurityprovider",
+ "org.apache.sling.fragment.transaction",
+ "org.apache.sling.fragment.ws",
+ "org.apache.sling.fragment.xml",
"org.apache.sling.fsresource",
+ "org.apache.sling.installer.console",
"org.apache.sling.installer.core",
+ "org.apache.sling.installer.factory.configuration",
"org.apache.sling.installer.provider.file",
"org.apache.sling.installer.provider.jcr",
+ "org.apache.sling.javax.activation",
"org.apache.sling.jcr.api",
"org.apache.sling.jcr.base",
"org.apache.sling.jcr.classloader",
"org.apache.sling.jcr.contentloader",
+ "org.apache.sling.jcr.davex",
"org.apache.sling.jcr.jackrabbit.accessmanager",
"org.apache.sling.jcr.jackrabbit.server",
"org.apache.sling.jcr.jackrabbit.usermanager",
- "org.apache.sling.jcr.ocm",
+ "org.apache.sling.jcr.jcr-wrapper",
+ "org.apache.sling.jcr.registration",
"org.apache.sling.jcr.resource",
"org.apache.sling.jcr.webconsole",
+ "org.apache.sling.jcr.webdav",
"org.apache.sling.launchpad.content",
"org.apache.sling.launchpad.installer",
+ "org.apache.sling.models.api",
+ "org.apache.sling.models.impl",
+ "org.apache.sling.resourceresolver",
"org.apache.sling.scripting.api",
"org.apache.sling.scripting.core",
"org.apache.sling.scripting.javascript",
"org.apache.sling.scripting.jsp",
"org.apache.sling.scripting.jsp.taglib",
+ "org.apache.sling.serviceusermapper",
"org.apache.sling.servlets.get",
"org.apache.sling.servlets.post",
"org.apache.sling.servlets.resolver",
- "org.apache.sling.settings"
+ "org.apache.sling.settings",
+ "org.apache.tika.bundle",
+ "org.apache.tika.core",
+ "slf4j.api"
};
final List<String> missing = new ArrayList<String>();
- for(String bundleName : bundles) {
+ for(String bundleName : LAUNCHPAD_7_BUNDLES) {
final int state = getBundleState(bundleName);
if(state != Bundle.ACTIVE) {
missing.add(bundleName + " (state=" + state + ")");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 15/18: Move to parent pom 30
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 5db9d913b514bc56ec3e652a7bcf33deaede2bc2
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Mar 29 07:32:59 2017 +0000
Move to parent pom 30
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1789283 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 07d3375..975524a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>30</version>
<relativePath/>
</parent>
@@ -96,9 +96,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
@@ -126,7 +124,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>4.2.1</version>
+ <version>5.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -162,7 +160,6 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -176,7 +173,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 14/18: Switch to parent pom 26
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 92498ead6ec2136f09fd64f64ca42b4b28231139
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000
Switch to parent pom 26
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b4d20ec..07d3375 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>25</version>
+ <version>26</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 18/18: [maven-release-plugin]
copy for tag org.apache.sling.paxexam.util-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 8ef31dc4f156a53217803fa0ab6c2eb178ca0402
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu May 4 19:55:28 2017 +0000
[maven-release-plugin] copy for tag org.apache.sling.paxexam.util-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.4@1793866 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 13/18: Update the main
reactor to parent 25
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit ccb5dd0d2f2f61132bc2fa01ee3f3e92f1bf169f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000
Update the main reactor to parent 25
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d6a39ea..b4d20ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 16/18: fix javadoc errors
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit b0da372a290fd928a127442141f53791cd732112
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu May 4 19:45:37 2017 +0000
fix javadoc errors
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1793861 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/paxexam/util/SlingPaxOptions.java | 34 +++++++++++++++-------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java b/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
index 5368d71..56cfdf7 100644
--- a/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
+++ b/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
@@ -44,11 +44,12 @@ import org.ops4j.pax.exam.options.DefaultCompositeOption;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/** Pax exam options and utilities to test Sling applications
- * The basic idea is to get a vanilla Sling launchpad instance
- * setup with a minimal amount of boilerplate code.
- * See {@link SlingSetupTest} for an example.
- * */
+/**
+ * Pax exam options and utilities to test Sling applications
+ * The basic idea is to get a vanilla Sling launchpad instance
+ * setup with a minimal amount of boilerplate code.
+ * See SlingSetupTest for an example.
+ */
public class SlingPaxOptions {
private static final Logger log = LoggerFactory.getLogger(SlingPaxOptions.class);
public static final int DEFAULT_SLING_START_LEVEL = 30;
@@ -68,8 +69,11 @@ public class SlingPaxOptions {
return result;
}
- /** When reading bundle lists, ignore bundles which have symbolic names
- * starting with one of the supplied prefixes */
+ /**
+ * When reading bundle lists, ignore bundles which have symbolic names
+ * starting with one of the supplied prefixes
+ * @param symbolicNamePrefix Symbolic name prefixes
+ */
public static void setIgnoredBundles(String ... symbolicNamePrefix) {
if(symbolicNamePrefix == null || symbolicNamePrefix.length == 0) {
ignoredBundlePrefixes = new String[] {};
@@ -78,13 +82,20 @@ public class SlingPaxOptions {
}
}
- /** Get run modes to use for our tests, as set by the sling.run.modes property */
+ /**
+ * Get run modes to use for our tests, as set by the sling.run.modes property
+ * @return Run modes
+ */
public static Collection<String> getTestRunModes() {
final String runModes = System.getProperty("sling.run.modes", DEFAULT_RUN_MODES);
return Arrays.asList(runModes.split(","));
}
- /** @param launchpadVersion null means use the latest */
+ /**
+ * Set default launchpad options
+ * @param launchpadVersion null means use the latest
+ * @return Composite option
+ */
public static CompositeOption defaultLaunchpadOptions(String launchpadVersion) {
final String paxLogLevel = System.getProperty("pax.exam.log.level", "INFO");
@@ -219,7 +230,10 @@ public class SlingPaxOptions {
return slingBundleList("org.apache.sling", "org.apache.sling.launchpad", version, "xml", "bundlelist");
}
- /** @param version can be null, to use default */
+ /**
+ * Felix remote shell bundles
+ * @return Composite option
+ */
public static CompositeOption felixRemoteShellBundles() {
final String gogoVersion = "0.10.0";
return new DefaultCompositeOption(
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 10/18: SLING-4832 -
SlingPaxOptions.setIgnoredBundles added, with tests
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit ede4f47b78b26569cb5d8b144725bfbeb4ec5226
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Jun 24 20:20:23 2015 +0000
SLING-4832 - SlingPaxOptions.setIgnoredBundles added, with tests
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1687359 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +
.../apache/sling/paxexam/util/SlingPaxOptions.java | 33 +++++++++++-
.../sling/paxexam/util/IgnoredBundlesTest.java | 63 ++++++++++++++++++++++
.../apache/sling/paxexam/util/SlingSetupTest.java | 11 ++--
4 files changed, 105 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e9b378..af14bac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
<exam.version>3.0.3</exam.version>
<url.version>1.5.2</url.version>
<pax.exam.log.level>INFO</pax.exam.log.level>
+ <pax.vm.options>-Xmx256M -XX:MaxPermSize=256m</pax.vm.options>
</properties>
<scm>
@@ -76,6 +77,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <argLine>${pax.vm.options}</argLine>
<systemProperties>
<property>
<name>pax.exam.log.level</name>
diff --git a/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java b/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
index 9b1dcef..5368d71 100644
--- a/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
+++ b/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
@@ -55,6 +55,7 @@ public class SlingPaxOptions {
public static final String PROP_TELNET_PORT = "osgi.shell.telnet.port";
public static final String PROP_HTTP_PORT = "org.osgi.service.http.port";
public static final String DEFAULT_RUN_MODES = "jackrabbit";
+ private static String [] ignoredBundlePrefixes;
private static int getAvailablePort() {
int result = Integer.MIN_VALUE;
@@ -67,6 +68,16 @@ public class SlingPaxOptions {
return result;
}
+ /** When reading bundle lists, ignore bundles which have symbolic names
+ * starting with one of the supplied prefixes */
+ public static void setIgnoredBundles(String ... symbolicNamePrefix) {
+ if(symbolicNamePrefix == null || symbolicNamePrefix.length == 0) {
+ ignoredBundlePrefixes = new String[] {};
+ } else {
+ ignoredBundlePrefixes = symbolicNamePrefix;
+ }
+ }
+
/** Get run modes to use for our tests, as set by the sling.run.modes property */
public static Collection<String> getTestRunModes() {
final String runModes = System.getProperty("sling.run.modes", DEFAULT_RUN_MODES);
@@ -96,6 +107,20 @@ public class SlingPaxOptions {
);
}
+ private static boolean ignore(Bundle b) {
+ boolean result = false;
+ if(ignoredBundlePrefixes != null) {
+ final String sn = b.getArtifactId();
+ for(String prefix : ignoredBundlePrefixes) {
+ if(sn.startsWith(prefix)) {
+ result = true;
+ break;
+ }
+ }
+ }
+ return result;
+ }
+
public static CompositeOption slingBundleList(String groupId, String artifactId, String version, String type, String classifier) {
final DefaultCompositeOption result = new DefaultCompositeOption();
@@ -121,12 +146,18 @@ public class SlingPaxOptions {
tmp = dumpMvnUrlToTmpFile(paxUrl);
final BundleList list = BundleListUtils.readBundleList(tmp);
int counter = 0;
+ int ignored = 0;
for(StartLevel s : list.getStartLevels()) {
// Start level < 0 means bootstrap in our bundle lists
final int startLevel = s.getStartLevel() < 0 ? 1 : s.getStartLevel();
for(Bundle b : s.getBundles()) {
+ if(ignore(b)) {
+ log.info("Bundle ignored due to setIgnoredBundles: {}", b);
+ ignored++;
+ continue;
+ }
counter++;
// TODO need better fragment detection
@@ -163,7 +194,7 @@ public class SlingPaxOptions {
log.info("Bundle added: {}/{}/{}", new Object [] { b.getGroupId(), b.getArtifactId(), b.getVersion()});
}
}
- log.info("Got {} bundles from {}", counter, paxUrl);
+ log.info("Got {} bundles ({} ignored) from {}", new Object[] { counter, ignored, paxUrl });
} catch(Exception e) {
throw new RuntimeException("Error getting bundle list " + paxUrl, e);
} finally {
diff --git a/src/test/java/org/apache/sling/paxexam/util/IgnoredBundlesTest.java b/src/test/java/org/apache/sling/paxexam/util/IgnoredBundlesTest.java
new file mode 100644
index 0000000..23e8ff1
--- /dev/null
+++ b/src/test/java/org/apache/sling/paxexam/util/IgnoredBundlesTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.paxexam.util;
+
+import static org.junit.Assert.assertNull;
+
+import javax.inject.Inject;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.framework.BundleContext;
+
+/** Test the bundles ignoring feature */
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class IgnoredBundlesTest {
+ /** Use a released launchpad for this example */
+ public static final String SLING_LAUNCHPAD_VERSION = "7";
+
+ public static final String MIME_BUNDLE_SN = "org.apache.sling.commons.mime";
+ public static final String JSON_BUNDLE_SN = "org.apache.sling.commons.json";
+
+ @Inject
+ private BundleContext bundleContext;
+
+ @org.ops4j.pax.exam.Configuration
+ public Option[] config() {
+ SlingPaxOptions.setIgnoredBundles(MIME_BUNDLE_SN, JSON_BUNDLE_SN);
+ try {
+ return SlingPaxOptions.defaultLaunchpadOptions(SLING_LAUNCHPAD_VERSION).getOptions();
+ } finally {
+ SlingPaxOptions.setIgnoredBundles();
+ }
+ }
+
+ @Test
+ public void testMimeBundle() {
+ assertNull(SlingSetupTest.getBundle(bundleContext, MIME_BUNDLE_SN));
+ }
+
+ @Test
+ public void testJsonBundle() {
+ assertNull(SlingSetupTest.getBundle(bundleContext, JSON_BUNDLE_SN));
+ }
+ }
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
index 13e40c2..d3157e1 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
@@ -97,13 +97,18 @@ public class SlingSetupTest {
}
private Bundle getBundle(String symbolicName) {
- for(Bundle b : bundleContext.getBundles()) {
+ return getBundle(bundleContext, symbolicName);
+ }
+
+ static Bundle getBundle(BundleContext bc, String symbolicName) {
+ for(Bundle b : bc.getBundles()) {
if(symbolicName.equals(b.getSymbolicName())) {
return b;
}
}
return null;
}
+
/** @return bundle state, UNINSTALLED if absent */
private int getBundleState(String symbolicName) {
return getBundleState(getBundle(symbolicName));
@@ -177,10 +182,10 @@ public class SlingSetupTest {
"org.apache.sling.bundleresource.impl",
"org.apache.sling.commons.classloader",
"org.apache.sling.commons.compiler",
- "org.apache.sling.commons.json",
+ IgnoredBundlesTest.JSON_BUNDLE_SN,
"org.apache.sling.commons.log",
"org.apache.sling.commons.logservice",
- "org.apache.sling.commons.mime",
+ IgnoredBundlesTest.MIME_BUNDLE_SN,
"org.apache.sling.commons.osgi",
"org.apache.sling.commons.scheduler",
"org.apache.sling.commons.threads",
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 08/18: Add missing excludes
for rat
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 56bc0504cffa77c8056a050f752b4fb9454e1af3
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 27 16:02:12 2015 +0000
Add missing excludes for rat
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1676320 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/pom.xml b/pom.xml
index 9a32f1a..8ccb357 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,16 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>derby.log</exclude>
+ <exclude>jackrabbit/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 02/18: Update to parent pom
v19
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 40a720068ec05de32b3334ce5b17e8d8e2f9e42a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 31 14:39:20 2014 +0000
Update to parent pom v19
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1583337 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 25ee230..8cf7aa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
+ <version>19</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 17/18: [maven-release-plugin]
prepare release org.apache.sling.paxexam.util-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit d4c8c26cc7e2a432ebdc0a3b2c0d3a23567dfdc7
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu May 4 19:55:15 2017 +0000
[maven-release-plugin] prepare release org.apache.sling.paxexam.util-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1793865 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 358 ++++++++++++++++++++++++++++++++--------------------------------
1 file changed, 179 insertions(+), 179 deletions(-)
diff --git a/pom.xml b/pom.xml
index 975524a..404721e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,179 +1,179 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
- <relativePath/>
- </parent>
-
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.paxexam.util</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Apache Sling Pax Exam Utilities</name>
-
- <description>
- Utilities that make it easier to test Sling code with Pax Exam.
- See this module's tests for usage examples.
- </description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <exam.version>3.0.3</exam.version>
- <url.version>1.5.2</url.version>
- <pax.exam.log.level>INFO</pax.exam.log.level>
- <pax.vm.options>-Xmx256M -XX:MaxPermSize=256m</pax.vm.options>
- </properties>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>derby.log</exclude>
- <exclude>jackrabbit/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <includes>
- <include>derby.log</include>
- <include>jackrabbit/**</include>
- <include>coverage.ec</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${pax.vm.options}</argLine>
- <systemProperties>
- <property>
- <name>pax.exam.log.level</name>
- <value>${pax.exam.log.level}</value>
- </property>
- <property>
- <name>java.protocol.handler.pkgs</name>
- <value>org.ops4j.pax.url</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-native</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit4</artifactId>
- <version>${exam.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-aether</artifactId>
- <version>${url.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-launchpad-plugin</artifactId>
- <version>2.2.0</version>
- <type>maven-plugin</type>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.api</artifactId>
- <version>2.4.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.settings</artifactId>
- <version>1.3.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>30</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.paxexam.util</artifactId>
+ <version>1.0.4</version>
+ <packaging>jar</packaging>
+
+ <name>Apache Sling Pax Exam Utilities</name>
+
+ <description>
+ Utilities that make it easier to test Sling code with Pax Exam.
+ See this module's tests for usage examples.
+ </description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <exam.version>3.0.3</exam.version>
+ <url.version>1.5.2</url.version>
+ <pax.exam.log.level>INFO</pax.exam.log.level>
+ <pax.vm.options>-Xmx256M -XX:MaxPermSize=256m</pax.vm.options>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.4</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.paxexam.util-1.0.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.paxexam.util-1.0.4</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>derby.log</exclude>
+ <exclude>jackrabbit/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>derby.log</include>
+ <include>jackrabbit/**</include>
+ <include>coverage.ec</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${pax.vm.options}</argLine>
+ <systemProperties>
+ <property>
+ <name>pax.exam.log.level</name>
+ <value>${pax.exam.log.level}</value>
+ </property>
+ <property>
+ <name>java.protocol.handler.pkgs</name>
+ <value>org.ops4j.pax.url</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-native</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${exam.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>${url.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>5.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-launchpad-plugin</artifactId>
+ <version>2.2.0</version>
+ <type>maven-plugin</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.api</artifactId>
+ <version>1.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
+ <version>2.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings</artifactId>
+ <version>1.3.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-paxexam-util] 11/18: Update to Sling Parent
23
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.paxexam.util-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-paxexam-util.git
commit 103f59062ee68cca0726cfde09f2504f5527a74a
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:08:16 2015 +0000
Update to Sling Parent 23
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/sling-pax-util@1687500 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index af14bac..affdd36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>22</version>
+ <version>23</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.