This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/master by this push:
new f948903 Fix source generation issues (had to duplicate assembly
configuration from Apache parent to add exclusions)
f948903 is described below
commit f9489038457a44b5d7bc626c53cda8fdb4f31c29
Author: Serge Huber <[email protected]>
AuthorDate: Sat May 2 19:36:50 2020 +0200
Fix source generation issues (had to duplicate assembly configuration from
Apache parent to add exclusions)
---
pom.xml | 36 +++++++-
src/main/resources/assemblies/source-release.xml | 28 ++++++
src/main/resources/assemblies/source-shared.xml | 106 +++++++++++++++++++++++
3 files changed, 167 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0296678..de60a74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>23</version>
<relativePath />
</parent>
@@ -635,6 +635,37 @@
</plugins>
</reporting>
</profile>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>unomi-source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptors>
+
<descriptor>src/main/resources/assemblies/source-release.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>posix</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<dependencyManagement>
@@ -1051,7 +1082,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
@@ -1152,7 +1183,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
<configuration>
<tags>
<tag>
diff --git a/src/main/resources/assemblies/source-release.xml
b/src/main/resources/assemblies/source-release.xml
new file mode 100644
index 0000000..aa146fd
--- /dev/null
+++ b/src/main/resources/assemblies/source-release.xml
@@ -0,0 +1,28 @@
+<!--
+
+ 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.
+-->
+<assembly>
+ <id>source-release</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <componentDescriptors>
+
<componentDescriptor>src/main/resources/assemblies/source-shared.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
\ No newline at end of file
diff --git a/src/main/resources/assemblies/source-shared.xml
b/src/main/resources/assemblies/source-shared.xml
new file mode 100644
index 0000000..78c8903
--- /dev/null
+++ b/src/main/resources/assemblies/source-shared.xml
@@ -0,0 +1,106 @@
+<!--
+
+ 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.
+-->
+<component>
+ <fileSets>
+ <!-- main project directory structure -->
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory/>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <!-- build output -->
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]
+ </exclude>
+ <!--
+ NOTE: Most of the following excludes should not be required
+ if the standard release process is followed. This
is because the
+ release plugin checks out project sources into a
location like
+ target/checkout, then runs the build from there.
The result is
+ a source-release archive that comes from a pretty
clean directory
+ structure.
+
+ HOWEVER, if the release plugin is configured to
run extra goals
+ or generate a project website, it's definitely
possible that some
+ of these files will be present. So, it's safer to
exclude them.
+
+ -->
+ <!-- IDEs -->
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]
+ </exclude>
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]
+ </exclude>
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]
+ </exclude>
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]
+ </exclude>
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]
+ </exclude>
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]
+ </exclude>
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]
+ </exclude>
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]
+ </exclude>
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]
+ </exclude>
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]
+ </exclude>
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]
+ </exclude>
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]
+ </exclude>
+ <!-- misc -->
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]
+ </exclude>
+ <!-- release-plugin temp files -->
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]
+ </exclude>
+ <exclude>
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]
+ </exclude>
+ <!-- NodeJS projects -->
+
<exclude>**/extensions/web-tracker/javascript/node/**/*</exclude>
+
<exclude>**/extensions/web-tracker/javascript/node_modules/**/*</exclude>
+ </excludes>
+ </fileSet>
+ <!-- license, readme, etc. calculated at build time -->
+ <fileSet>
+ <directory>
+
${project.build.directory}/maven-shared-archive-resources/META-INF
+ </directory>
+ <outputDirectory/>
+ </fileSet>
+ </fileSets>
+</component>
\ No newline at end of file
