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 601ef30 Fixes SLING-9484 where BND was not configured correctly, thus
not exposing the models or installing content
601ef30 is described below
commit 601ef302669fd5d45b46e2442c4038eabed1ecff
Author: Dan Klco <[email protected]>
AuthorDate: Thu May 28 22:22:25 2020 -0400
Fixes SLING-9484 where BND was not configured correctly, thus not exposing
the models or installing content
---
.../src/main/resources/archetype-resources/pom.xml | 8 +++++++
.../java/__packageInPathFormat__/package-info.java | 26 ++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/archetype/src/main/resources/archetype-resources/pom.xml
b/archetype/src/main/resources/archetype-resources/pom.xml
index 6dc3dc3..3ca0dae 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -89,8 +89,16 @@ License. -->
<configuration>
<bnd>
<![CDATA[
+#set( $dollar = '$' )
+# export all versioned packages except for conditional ones
(https://github.com/bndtools/bnd/issues/3721#issuecomment-579026778)
+-exportcontents:
${dollar}{removeall;${dollar}{packages;VERSIONED};${dollar}{packages;CONDITIONAL}}
# see https://issues.apache.org/jira/browse/SLING-8980
-snapshot: SNAPSHOT
+# reproducible builds (https://github.com/bndtools/bnd/issues/3521)
+-noextraheaders: true
+-includeresource: target/dist
+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-Model-Packages: ${package}
]]>
</bnd>
</configuration>
diff --git
a/archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/package-info.java
b/archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/package-info.java
new file mode 100644
index 0000000..129424d
--- /dev/null
+++
b/archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/package-info.java
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+/**
+ * Models package for ${appName}
+ *
+ * @version ${version}
+ */
[email protected]("1.0.0")
+package ${package};
