You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/01/31 04:16:52 UTC
[sling-org-apache-sling-app-cms] branch master updated: Adding
support for the newest Sling Parent and Java 11 builds
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/master by this push:
new 3071f7a Adding support for the newest Sling Parent and Java 11 builds
3071f7a is described below
commit 3071f7a197c5f2a302c413d567071fb206b222ed
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Jan 30 23:16:37 2020 -0500
Adding support for the newest Sling Parent and Java 11 builds
---
api/pom.xml | 47 ++-----------
.../sling/cms/{insights => i18n}/package-info.java | 7 +-
.../apache/sling/cms/insights/package-info.java | 3 +-
archetype/pom.xml | 4 ++
.../src/main/resources/archetype-resources/pom.xml | 48 +------------
core/bnd.bnd | 1 +
core/pom.xml | 60 +++--------------
pom.xml | 10 ++-
reference/bnd.bnd | 8 +++
reference/pom.xml | 58 ++--------------
transformer/bnd.bnd | 3 +
transformer/pom.xml | 75 +++++++--------------
transformer/src/test/resources/thumbnail.png | Bin 20437 -> 21183 bytes
ui/bnd.bnd | 4 ++
ui/pom.xml | 44 +-----------
.../components/cms/staticnav/staticnav.jsp | 2 +-
16 files changed, 88 insertions(+), 286 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 3ca5e11..9ad519b 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 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
+<!-- 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>
@@ -12,7 +12,6 @@
<version>0.14.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.sling.cms.api</artifactId>
- <packaging>bundle</packaging>
<name>Apache Sling - CMS API</name>
<description>An API for the Apache Sling Reference CMS Application</description>
@@ -23,9 +22,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -35,40 +33,9 @@
<target>8</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <configuration>
- <slingUrl>${sling.protocol}://${sling.host}:${sling.port}/system/console</slingUrl>
- <user>${sling.username}</user>
- <password>${sling.password}</password>
- </configuration>
- </plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>autoInstallBundle</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <executions>
- <execution>
- <id>install-bundle</id>
- <goals>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
@@ -115,4 +82,4 @@
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/api/src/main/java/org/apache/sling/cms/insights/package-info.java b/api/src/main/java/org/apache/sling/cms/i18n/package-info.java
similarity index 85%
copy from api/src/main/java/org/apache/sling/cms/insights/package-info.java
copy to api/src/main/java/org/apache/sling/cms/i18n/package-info.java
index 07fd7d0..8bbc139 100644
--- a/api/src/main/java/org/apache/sling/cms/insights/package-info.java
+++ b/api/src/main/java/org/apache/sling/cms/i18n/package-info.java
@@ -18,8 +18,9 @@
*/
/**
- * Support for Content Insights
+ * Package for managing i18n in Sling CMS
*
- * @version 0.10.2
+ * @since 0.10.0
*/
-package org.apache.sling.cms.insights;
\ No newline at end of file
+@org.osgi.annotation.versioning.Version("1.0.0")
+package org.apache.sling.cms.i18n;
diff --git a/api/src/main/java/org/apache/sling/cms/insights/package-info.java b/api/src/main/java/org/apache/sling/cms/insights/package-info.java
index 07fd7d0..3f81695 100644
--- a/api/src/main/java/org/apache/sling/cms/insights/package-info.java
+++ b/api/src/main/java/org/apache/sling/cms/insights/package-info.java
@@ -22,4 +22,5 @@
*
* @version 0.10.2
*/
-package org.apache.sling.cms.insights;
\ No newline at end of file
+@org.osgi.annotation.versioning.Version("1.0.0")
+package org.apache.sling.cms.insights;
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 57b0014..1e9b930 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -15,6 +15,10 @@ License. -->
<name>Apache Sling - CMS Archetype</name>
<description>A Maven Archetype for creating Sling CMS projects</description>
+ <properties>
+ <bnd.baseline.skip>true</bnd.baseline.skip>
+ </properties>
+
<build>
<resources>
<resource>
diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
index 91d1ee4..e42de37 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -65,26 +65,9 @@ License. -->
</executions>
</plugin>
- <!-- Build the bundle -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>4.2.1</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Sling-Initial-Content>
- jcr_root,
- jcr_root/apps/${appName};overwrite:=true;uninstall:=true;path:=/apps/${appName},
- jcr_root/conf/${appName};overwrite:=false;uninstall:=false;path:=/conf/${appName},
- jcr_root/static/clientlibs/${appName};overwrite=true;ignoreImportProviders:=xml;path:=/static/clientlibs/${appName}
- </Sling-Initial-Content>
- <Sling-Model-Packages>
- ${package}
- </Sling-Model-Packages>
- <Include-Resource>{maven-resources},${basedir}/target/dist</Include-Resource>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
@@ -231,31 +214,4 @@ License. -->
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>autoInstallBundle</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <version>2.4.2</version>
- <executions>
- <execution>
- <id>install-bundle</id>
- <goals>
- <goal>install</goal>
- </goals>
- <configuration>
- <slingUrl>${sling.protocol}://${sling.host}:${sling.port}/system/console</slingUrl>
- <user>${sling.username}</user>
- <password>${sling.password}</password>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/core/bnd.bnd b/core/bnd.bnd
new file mode 100644
index 0000000..8512c3d
--- /dev/null
+++ b/core/bnd.bnd
@@ -0,0 +1 @@
+Sling-Model-Packages: org.apache.sling.cms.core.models,org.apache.sling.cms.core.internal.models
diff --git a/core/pom.xml b/core/pom.xml
index b165800..767e09a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 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
+<!-- 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>
@@ -12,7 +12,6 @@
<version>0.14.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.sling.cms.core</artifactId>
- <packaging>bundle</packaging>
<name>Apache Sling - CMS Core</name>
<description>The core for the Apache Sling Reference CMS Application</description>
@@ -23,18 +22,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Sling-Model-Packages>
- org.apache.sling.cms.core.models,
- org.apache.sling.cms.core.internal.models
- </Sling-Model-Packages>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -45,15 +34,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <configuration>
- <slingUrl>${sling.protocol}://${sling.host}:${sling.port}/system/console</slingUrl>
- <user>${sling.username}</user>
- <password>${sling.password}</password>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -63,28 +43,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>autoInstallBundle</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <executions>
- <execution>
- <id>install-bundle</id>
- <goals>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -267,5 +225,9 @@
<artifactId>oak-jcr</artifactId>
<groupId>org.apache.jackrabbit</groupId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 130f3c2..5a7d37e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,8 +8,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>36</version>
<relativePath />
</parent>
@@ -190,6 +190,12 @@
<!-- Utilities / Misc -->
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
<version>1.5</version>
diff --git a/reference/bnd.bnd b/reference/bnd.bnd
new file mode 100644
index 0000000..be8e267
--- /dev/null
+++ b/reference/bnd.bnd
@@ -0,0 +1,8 @@
+Sling-Initial-Content: jcr_root,jcr_root/apps/reference;overwrite:=true;
+ uninstall:=true;path:=/apps/reference,jcr_root/content/apache;overwrite
+ :=false;uninstall:=false;path:=/content/apache,jcr_root/etc/taxonomy/re
+ ference;overwrite:=false;uninstall:=false;path:=/etc/taxonomy/reference
+ ,jcr_root/static/clientlibs/reference;overwrite=true;ignoreImportProvid
+ ers:=xml;path:=/static/clientlibs/reference
+Sling-Model-Packages: org.apache.sling.cms.reference.models,org.apache.s
+ ling.cms.reference.forms.impl,
diff --git a/reference/pom.xml b/reference/pom.xml
index 21c73f3..b7fd085 100644
--- a/reference/pom.xml
+++ b/reference/pom.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 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
+<!-- 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>
@@ -12,7 +12,6 @@
<version>0.14.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.sling.cms.reference</artifactId>
- <packaging>bundle</packaging>
<name>Apache Sling - CMS Reference Application</name>
<description>A reference application within the Apache Sling Reference CMS Application</description>
@@ -39,24 +38,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Sling-Initial-Content>
- jcr_root,
- jcr_root/apps/reference;overwrite:=true;uninstall:=true;path:=/apps/reference,
- jcr_root/content/apache;overwrite:=false;uninstall:=false;path:=/content/apache,
- jcr_root/etc/taxonomy/reference;overwrite:=false;uninstall:=false;path:=/etc/taxonomy/reference,
- jcr_root/static/clientlibs/reference;overwrite=true;ignoreImportProviders:=xml;path:=/static/clientlibs/reference
- </Sling-Initial-Content>
- <Sling-Model-Packages>
- org.apache.sling.cms.reference.models,
- org.apache.sling.cms.reference.forms.impl,
- </Sling-Model-Packages>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
@@ -161,31 +144,4 @@
<artifactId>mockito-core</artifactId>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>autoInstallBundle</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <executions>
- <execution>
- <id>install-bundle</id>
- <goals>
- <goal>install</goal>
- </goals>
- <configuration>
- <slingUrl>${sling.protocol}://${sling.host}:${sling.port}/system/console</slingUrl>
- <user>${sling.username}</user>
- <password>${sling.password}</password>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/transformer/bnd.bnd b/transformer/bnd.bnd
new file mode 100644
index 0000000..e9910b2
--- /dev/null
+++ b/transformer/bnd.bnd
@@ -0,0 +1,3 @@
+Sling-Model-Packages: org.apache.sling.cms.transformer
+
+-includeresource: lib/thumbnailator.jar=thumbnailator-[[0-9\.]]*.jar;lib:=true
diff --git a/transformer/pom.xml b/transformer/pom.xml
index 6ac1792..8e7ccbc 100644
--- a/transformer/pom.xml
+++ b/transformer/pom.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 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
+<!-- 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>
@@ -12,7 +12,6 @@
<version>0.14.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.sling.cms.transformer</artifactId>
- <packaging>bundle</packaging>
<name>Apache Sling - Transformer</name>
<description>An API and Service for creating and transforming images and documents into thumbnails</description>
@@ -23,19 +22,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- <Export-Package>org.apache.sling.cms.transformer,net.coobird.thumbnailator.*</Export-Package>
-
- <Sling-Model-Packages>
- org.apache.sling.cms.transformer
- </Sling-Model-Packages>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -46,15 +34,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <configuration>
- <slingUrl>${sling.protocol}://${sling.host}:${sling.port}/system/console</slingUrl>
- <user>${sling.username}</user>
- <password>${sling.password}</password>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -81,28 +60,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>autoInstallBundle</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <executions>
- <execution>
- <id>install-bundle</id>
- <goals>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
@@ -178,12 +135,15 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
<!-- Document handling -->
<dependency>
<groupId>net.coobird</groupId>
<artifactId>thumbnailator</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<artifactId>pdfbox</artifactId>
@@ -219,5 +179,18 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.2</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/transformer/src/test/resources/thumbnail.png b/transformer/src/test/resources/thumbnail.png
index f38c3a4..62cf067 100644
Binary files a/transformer/src/test/resources/thumbnail.png and b/transformer/src/test/resources/thumbnail.png differ
diff --git a/ui/bnd.bnd b/ui/bnd.bnd
new file mode 100644
index 0000000..68cff48
--- /dev/null
+++ b/ui/bnd.bnd
@@ -0,0 +1,4 @@
+Sling-Nodetypes: SLING-INF/nodetypes/nodetypes.cnd
+Sling-Initial-Content: jcr_root;ignoreImportProviders:=xml,jcr_root/oak%3Aindex;overwrite:=false;uninstall:=true;path:=/oak:index,jcr_root/conf/global;overwrite:=false;uninstall:=true;path:=/conf/global,jcr_root/etc/clientlibs;overwrite=true;ignoreImportProviders:=xml;path:=/etc/clientlibs,jcr_root/etc/taxonomy;overwrite:=false;uninstall:=true;path:=/etc/taxonomy,jcr_root/libs/sling/servlet/errorhandler;overwriteProperties:=true;overwrite:=true;uninstall:=true;path:=/libs/sling/servlet/e [...]
+
+-includeresource: target/frontend/dist
diff --git a/ui/pom.xml b/ui/pom.xml
index bd0b537..ba46695 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -11,7 +11,6 @@ License. -->
<version>0.14.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.sling.cms.ui</artifactId>
- <packaging>bundle</packaging>
<name>Apache Sling - CMS UI</name>
<description>A bundle providing the User Interface for the Apache Sling Reference CMS Application</description>
@@ -121,24 +120,9 @@ License. -->
</execution>
</executions>
</plugin>
-
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Sling-Nodetypes>SLING-INF/nodetypes/nodetypes.cnd</Sling-Nodetypes>
- <Sling-Initial-Content>
- jcr_root;ignoreImportProviders:=xml, jcr_root/oak%3Aindex;overwrite:=false;uninstall:=true;path:=/oak:index, jcr_root/conf/global;overwrite:=false;uninstall:=true;path:=/conf/global,
- jcr_root/etc/clientlibs;overwrite=true;ignoreImportProviders:=xml;path:=/etc/clientlibs, jcr_root/etc/taxonomy;overwrite:=false;uninstall:=true;path:=/etc/taxonomy,
- jcr_root/libs/sling/servlet/errorhandler;overwriteProperties:=true;overwrite:=true;uninstall:=true;path:=/libs/sling/servlet/errorhandler, jcr_root/libs/sling-cms;overwrite:=true;uninstall:=true;path:=/libs/sling-cms,
- jcr_root/static/clientlibs/sling-cms;overwrite:=true;uninstall:=true;path:=/static/clientlibs/sling-cms;ignoreImportProviders:=xml,
- jcr_root/static/sling-cms/thumbnails;overwrite:=true;uninstall:=true;path:=/static/sling-cms/thumbnails;ignoreImportProviders:=xml
- </Sling-Initial-Content>
- <Include-Resource>{maven-resources},${basedir}/target/frontend/dist</Include-Resource>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
</plugin>
</plugins>
@@ -181,29 +165,5 @@ License. -->
<frontend.mode>prod</frontend.mode>
</properties>
</profile>
- <profile>
- <id>autoInstallBundle</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <executions>
- <execution>
- <id>install-bundle</id>
- <goals>
- <goal>install</goal>
- </goals>
- <configuration>
- <slingUrl>${sling.protocol}://${sling.host}:${sling.port}/system/console</slingUrl>
- <user>${sling.username}</user>
- <password>${sling.password}</password>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp
index 80c1bfd..9c031dc 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp
@@ -60,4 +60,4 @@
</c:if>
</c:forEach>
</ul>
-</div>
\ No newline at end of file
+</div>