You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by kw...@apache.org on 2022/12/16 06:07:20 UTC

[jackrabbit-oak] branch bugfix/remove-antrun-to-replace-main-jar created (now 74960ddec7)

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a change to branch bugfix/remove-antrun-to-replace-main-jar
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


      at 74960ddec7 OAK-10032 get rid of m-antrun-p to replace the main artifact

This branch includes the following new commits:

     new 74960ddec7 OAK-10032 get rid of m-antrun-p to replace the main artifact

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[jackrabbit-oak] 01/01: OAK-10032 get rid of m-antrun-p to replace the main artifact

Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch bugfix/remove-antrun-to-replace-main-jar
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git

commit 74960ddec751bcd21d0ef24ce5251292bd772a01
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Dec 16 07:07:11 2022 +0100

    OAK-10032 get rid of m-antrun-p to replace the main artifact
---
 oak-run/pom.xml | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/oak-run/pom.xml b/oak-run/pom.xml
index 68a26bbaa7..5c50c5d70d 100644
--- a/oak-run/pom.xml
+++ b/oak-run/pom.xml
@@ -108,33 +108,12 @@
               <descriptors>
                 <descriptor>src/main/assembly/oak-run.xml</descriptor>
               </descriptors>
+              <!-- use the new assembly as main artifact (i.e replace the original jar -->
+              <appendAssemblyId>false</appendAssemblyId>
             </configuration>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <configuration>
-              <target>
-                <!--
-                Replace the default oak-run with the one created in assembly so
-                as to ensure default artifact oak-run is the one which has all jars
-                embedded
-                -->
-                <copy file="${project.build.directory}/${project.build.finalName}-oak.jar" tofile="${project.build.directory}/${project.build.finalName}.jar" />
-                <delete file="${project.build.directory}/${project.build.finalName}-oak.jar" />
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>com.phasebash.jsdoc</groupId>
         <artifactId>jsdoc3-maven-plugin</artifactId>