This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch update_7.0.X
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
The following commit(s) were added to refs/heads/update_7.0.X by this push:
new b3c8e183 update poms
b3c8e183 is described below
commit b3c8e183fedb068463bb80808aeab31bc2f31c11
Author: Lee Rhodes <[email protected]>
AuthorDate: Thu May 28 11:59:26 2026 -0700
update poms
---
datasketches-memory-java11/pom.xml | 6 ++---
datasketches-memory-java17_21/pom.xml | 6 ++---
pom.xml | 41 ++++++++++++++---------------------
3 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/datasketches-memory-java11/pom.xml
b/datasketches-memory-java11/pom.xml
index e0707a14..c9086c14 100644
--- a/datasketches-memory-java11/pom.xml
+++ b/datasketches-memory-java11/pom.xml
@@ -140,8 +140,8 @@ under the License.
<goals><goal>add-source</goal></goals>
<configuration>
<sources>
-
<source>${maven.multiModuleProjectDirectory}/datasketches-memory-common/src/main/java</source>
-
<source>${maven.multiModuleProjectDirectory}/datasketches-memory-common/src/main/javadoc</source>
+
<source>${project.basedir}/../datasketches-memory-common/src/main/java</source>
+
<source>${project.basedir}/../datasketches-memory-common/src/main/javadoc</source>
</sources>
</configuration>
</execution>
@@ -151,7 +151,7 @@ under the License.
<goals><goal>add-test-source</goal></goals>
<configuration>
<sources>
-
<source>${maven.multiModuleProjectDirectory}/datasketches-memory-common/src/test/java</source>
+
<source>${project.basedir}/../datasketches-memory-common/src/test/java</source>
</sources>
</configuration>
</execution>
diff --git a/datasketches-memory-java17_21/pom.xml
b/datasketches-memory-java17_21/pom.xml
index e67ababf..648d0e1f 100644
--- a/datasketches-memory-java17_21/pom.xml
+++ b/datasketches-memory-java17_21/pom.xml
@@ -136,8 +136,8 @@ under the License.
<goals><goal>add-source</goal></goals>
<configuration>
<sources>
-
<source>${maven.multiModuleProjectDirectory}/datasketches-memory-common/src/main/java</source>
-
<source>${maven.multiModuleProjectDirectory}/datasketches-memory-common/src/main/javadoc</source>
+
<source>${project.basedir}/../datasketches-memory-common/src/main/java</source>
+
<source>${project.basedir}/../datasketches-memory-common/src/main/javadoc</source>
</sources>
</configuration>
</execution>
@@ -147,7 +147,7 @@ under the License.
<goals><goal>add-test-source</goal></goals>
<configuration>
<sources>
-
<source>${maven.multiModuleProjectDirectory}/datasketches-memory-common/src/test/java</source>
+
<source>${project.basedir}/../datasketches-memory-common/src/test/java</source>
</sources>
</configuration>
</execution>
diff --git a/pom.xml b/pom.xml
index 59e801cd..923eb41b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,6 +215,22 @@ under the License.
</dependencyManagement>
<build>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${maven.multiModuleProjectDirectory}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>DEPENDENCIES</include>
+ </includes>
+ </resource>
+ </resources>
+
<pluginManagement>
<plugins>
@@ -405,31 +421,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-plugin.version}</version>
- <executions>
- <execution>
- <id>default-resources</id>
- <phase>process-resources</phase>
- <goals><goal>resources</goal></goals>
- </execution>
- <execution>
- <id>copy-legal-docs</id>
- <phase>prepare-package</phase>
- <goals><goal>copy-resources</goal></goals>
- <configuration>
-
<outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
- <resources>
- <resource>
- <directory>${maven.multiModuleProjectDirectory}</directory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>DEPENDENCIES</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
<configuration>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>DS_Store</nonFilteredFileExtension>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
