Exchange Maven assembly plugin against ant script, being called after…

… 'mavne install' directly on-demand of release: 'mvn antrun:run@prepare-github-release -Pprepare-release'
tdf · Jan 20, 2020 · 155cce8 · 155cce8
1 parent 962f2c1
commit 155cce8
Show file tree

Hide file tree

Showing 6 changed files with 196 additions and 218 deletions.
diff --git a/pom.xml b/pom.xml
diff --git a/src/maven-release-assemble/bin.xml b/src/maven-release-assemble/bin.xml
@@ -16,17 +16,31 @@
 -->
 
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
     <id>bin</id>
     <formats>
         <format>zip</format>
     </formats>
     <fileSets>
         <fileSet>
-            <directory>${project.basedir}/target/release-tmp/${project.version}-bin/</directory>
-            <outputDirectory></outputDirectory>
+            <directory>${release.tmpdir.bin}</directory>
+            <outputDirectory>${basedir}/target</outputDirectory>
+            <includes>
+                <include>*.txt</include>
+                <include>KEYS</include>
+                <include>NOTICE</include>
+                <include>LICENSE</include>
+                <include>odfdom/target/*.jar</include>
+                <include>simple/target/*.jar</include>
+                <include>validator/target/*.war</include>
+                <include>validator/target/*.jar</include>
+                <include>xslt-runner/target/*.jar</include>
+                <include>xslt-runner-task/target/*.jar</include>
+            </includes>
             <excludes>
+                <exclude>**/target/**-javadoc.jar</exclude>
+                <exclude>**/target/**-sources.jar</exclude>
                 <exclude>**/DEPENDENCIES</exclude>
             </excludes>
         </fileSet>

diff --git a/src/maven-release-assemble/doc.xml b/src/maven-release-assemble/doc.xml
@@ -16,17 +16,23 @@
 -->
 
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
     <id>doc</id>
     <formats>
         <format>zip</format>
     </formats>
     <fileSets>
         <fileSet>
-            <directory>${project.basedir}/target/release-tmp/${project.version}-docs</directory>
-            <outputDirectory></outputDirectory>
-            <useDefaultExcludes>true</useDefaultExcludes>
+            <directory>${release.tmpdir.doc}</directory>
+            <outputDirectory>${basedir}/target</outputDirectory>
+            <includes>
+                <include>*.txt</include>
+                <include>KEYS</include>
+                <include>NOTICE</include>
+                <include>LICENSE</include>
+                <include>**/target/*-javadoc.jar</include>
+            </includes>
         </fileSet>
     </fileSets>
 </assembly>
diff --git a/src/maven-release-assemble/src.xml b/src/maven-release-assemble/src.xml
@@ -16,7 +16,7 @@
 -->
 
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
     <id>src</id>
     <formats>
@@ -25,11 +25,19 @@
     <fileSets>
         <fileSet>
             <directory>${project.basedir}</directory>
-            <outputDirectory></outputDirectory>
+            <outputDirectory>${basedir}/target</outputDirectory>
+            <includes>
+                <include>**</include>
+            </includes>
             <excludes>
                 <exclude>**/target/**</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>legal/**</exclude>
+                <exclude>**/.vscode/**</exclude>
+                <exclude>**/.project</exclude>
+                <exclude>**/.classpath</exclude>
+                <exclude>**/.nb-configuration.xml</exclude>
+                <exclude>**/.settings/**</exclude>
+                <exclude>**/.classes/**</exclude>
+                <exclude>**/.idea</exclude>
             </excludes>
         </fileSet>
     </fileSets>

diff --git a/taglets/pom.xml b/taglets/pom.xml
@@ -184,39 +184,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- GPG Signature on release -->
-        <profile>
-            <id>release-sign-artifacts</id>
-            <activation>
-                <property>
-                    <name>gpg.keyname</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <!-- see http://maven.apache.org/plugins/maven-gpg-plugin/usage.html -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>release-sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                                <configuration>
-                                    <!-- Add GPG passphrase in Maven settings.xml under .m2 home, see
-                                    https://dzone.com/articles/publish-your-artifacts-to-maven-central -->
-                                    <keyname>${gpg.keyname}</keyname>
-                                    <passphraseServerId>${gpg.keyname}</passphraseServerId>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>doclint-java8-disable</id>
             <activation>

diff --git a/xslt-runner/manifest.mf b/xslt-runner/manifest.mf