SLING-10515 - Updating to Parent 43 and some other dependencies
diff --git a/core/src/test/java/org/apache/sling/cms/core/publication/ForwardAgentEndpointSynchronizationTest.java b/core/src/test/java/org/apache/sling/cms/core/publication/ForwardAgentEndpointSynchronizationTest.java
index 6b4e81f..95afcae 100644
--- a/core/src/test/java/org/apache/sling/cms/core/publication/ForwardAgentEndpointSynchronizationTest.java
+++ b/core/src/test/java/org/apache/sling/cms/core/publication/ForwardAgentEndpointSynchronizationTest.java
@@ -52,54 +52,12 @@
Mockito.when(event.getNewView()).thenReturn(view);
ConfigurationAdmin configAdmin = Mockito.mock(ConfigurationAdmin.class);
- Configuration sampleConfig = new Configuration() {
- private Dictionary<String, Object> properties = new Hashtable<>();
+ Configuration sampleConfig = Mockito.mock(Configuration.class);
- @Override
- public String getPid() {
- return "org.apache.sling";
- }
-
- @Override
- public Dictionary<String, Object> getProperties() {
- return properties;
- }
-
- @Override
- public void update(Dictionary<String, ?> properties) throws IOException {
- this.properties = (Dictionary<String, Object>) properties;
- }
-
- @Override
- public void delete() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String getFactoryPid() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void update() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void setBundleLocation(String location) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String getBundleLocation() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public long getChangeCount() {
- throw new UnsupportedOperationException();
- }
- };
+ Dictionary<String,Object> properties = new Hashtable<>();
+ Mockito.when(sampleConfig.getPid()).thenReturn("org.apache.sling");
+ Mockito.when(sampleConfig.getProperties()).thenReturn(properties);
+
Mockito.when(configAdmin.listConfigurations(Mockito.any())).thenReturn(new Configuration[] { sampleConfig });
ForwardAgentEndpointSynchronization sync = new ForwardAgentEndpointSynchronization(configAdmin,
@@ -118,7 +76,7 @@
});
sync.handleTopologyEvent(event);
assertTrue(Arrays.equals(new String[] { "https://sling.apache.org/libs/distribute" },
- (String[]) sampleConfig.getProperties().get(ForwardAgentEndpointSynchronization.ENDPOINT_PROPERTY)));
+ (String[]) properties.get(ForwardAgentEndpointSynchronization.ENDPOINT_PROPERTY)));
}
@Test
diff --git a/pom.xml b/pom.xml
index c517e21..5be013a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>38</version>
+ <version>43</version>
<relativePath />
</parent>
@@ -53,14 +53,14 @@
<org-apache-sling-api-version>2.23.0</org-apache-sling-api-version>
<org-apache-sling-caconfig-api-version>1.2.0</org-apache-sling-caconfig-api-version>
<org-apache-sling-commons-johnzon-version>1.2.6</org-apache-sling-commons-johnzon-version>
- <org-apache-sling-engine-version>2.7.2</org-apache-sling-engine-version>
+ <org-apache-sling-engine-version>2.7.6</org-apache-sling-engine-version>
<org-apache-sling-fileoptim-version>0.9.4</org-apache-sling-fileoptim-version>
<org-apache-sling-models-api-version>1.3.8</org-apache-sling-models-api-version>
<org-apache-sling-scripting-api-version>2.2.0</org-apache-sling-scripting-api-version>
<org-apache-sling-scripting-jsp-taglib-version>2.4.0</org-apache-sling-scripting-jsp-taglib-version>
<org-apache-sling-testing-sling-mock-junit4-version>2.6.2</org-apache-sling-testing-sling-mock-junit4-version>
<org.apache.felix.webconsole-version>4.6.0</org.apache.felix.webconsole-version>
- <osgi-annotation-version>6.0.1</osgi-annotation-version>
+ <osgi-annotation-version>8.0.0</osgi-annotation-version>
<guava-version>15.0</guava-version>
<pdfbox-version>2.0.23</pdfbox-version>
<servlet-api-version>2.5</servlet-api-version>
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/package-info.java b/reference/src/main/java/org/apache/sling/cms/reference/package-info.java
new file mode 100644
index 0000000..9fbe1a2
--- /dev/null
+++ b/reference/src/main/java/org/apache/sling/cms/reference/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+/**
+ * Sling CMS Reference
+ */
+@org.osgi.annotation.versioning.Version("1.0.0")
+package org.apache.sling.cms.reference;
diff --git a/transformer/bnd.bnd b/transformer/bnd.bnd
index e9910b2..1c528db 100644
--- a/transformer/bnd.bnd
+++ b/transformer/bnd.bnd
@@ -1,3 +1,4 @@
Sling-Model-Packages: org.apache.sling.cms.transformer
+Export-Package: org.apache.sling.cms.transformer,net.coobird.thumbnailator.*
-includeresource: lib/thumbnailator.jar=thumbnailator-[[0-9\.]]*.jar;lib:=true
