Skip to content

Commit

Permalink
Using glassfishbuild-maven-plugin 4.0.0-SNAPSHOT + fixes
Browse files Browse the repository at this point in the history
- Reviewed all assemblies and custom lifecycles
- Fixed file permissions: ug+rw(x)
- Permissions are really controlled just for distributed artifacts.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
  • Loading branch information
dmatej committed Sep 30, 2023
1 parent 95e7c0f commit 4a2b7df
Show file tree
Hide file tree
Showing 19 changed files with 289 additions and 235 deletions.
9 changes: 0 additions & 9 deletions appserver/distributions/glassfish-common/pom.xml
Expand Up @@ -80,15 +80,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>create-artifact</id>
<phase>process-resources</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
Expand All @@ -17,52 +18,59 @@
-->

<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd"
>

<id>stage-package</id>

<formats>
<format>dir</format>
</formats>

<includeBaseDirectory>false</includeBaseDirectory>

<fileSets>
<fileSet>
<directory>${temp.dir}</directory>
<fileMode>640</fileMode>
<excludes>
<exclude>nucleus-common/**</exclude>
</excludes>
<outputDirectory>${install.dir.name}</outputDirectory>
</fileSet>
<fileSet>
<directory>${temp.dir}/nucleus-common/nucleus/bin</directory>
<fileMode>640</fileMode>
<excludes>
<exclude>nadmin*</exclude>
</excludes>
<outputDirectory>${install.dir.name}/glassfish/bin</outputDirectory>
</fileSet>
<fileSet>
<directory>${temp.dir}/nucleus-common/nucleus/bin</directory>
<fileMode>755</fileMode>
<fileMode>750</fileMode>
<includes>
<include>nadmin*</include>
</includes>
<outputDirectory>${install.dir.name}/glassfish/lib</outputDirectory>
</fileSet>
<fileSet>
<fileMode>640</fileMode>
<directory>${temp.dir}/nucleus-common/nucleus/config</directory>
<outputDirectory>${install.dir.name}/glassfish/config</outputDirectory>
</fileSet>
<fileSet>
<fileMode>640</fileMode>
<directory>${temp.dir}/nucleus-common/nucleus/docs</directory>
<outputDirectory>${install.dir.name}/glassfish/docs</outputDirectory>
</fileSet>
<fileSet>
<fileMode>640</fileMode>
<directory>${temp.dir}/nucleus-common/nucleus/domains</directory>
<outputDirectory>${install.dir.name}/glassfish/domains</outputDirectory>
</fileSet>
<fileSet>
<fileMode>640</fileMode>
<directory>${temp.dir}/nucleus-common/nucleus/lib</directory>
<outputDirectory>${install.dir.name}/glassfish/lib</outputDirectory>
<excludes>
Expand Down
10 changes: 3 additions & 7 deletions appserver/distributions/glassfish/pom.xml
Expand Up @@ -70,15 +70,11 @@
<build>
<plugins>
<plugin>
<groupId>org.glassfish.build</groupId>
<artifactId>glassfishbuild-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>create-domain</id>
<goals>
<goal>exec</goal>
</goals>
<phase>process-resources</phase>
</execution>
</executions>
</plugin>
Expand All @@ -88,7 +84,7 @@
<executions>
<execution>
<id>do stuff</id>
<phase>process-resources</phase>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
Expand Down

0 comments on commit 4a2b7df

Please sign in to comment.