This is an automated email from the ASF dual-hosted git repository. loogn pushed a commit to branch cp_release_v7 in repository https://gitbox.apache.org/repos/asf/geaflow.git
commit 787b54c39cbb57d0a1c9d1803b7ffbfa9b2797bf Author: loogn zhou <[email protected]> AuthorDate: Thu Oct 30 11:55:30 2025 +0800 fix(incubator): add NOTICE, DISCLAIMER, fix license headers , fix naming --- DISCLAIMER | 7 + NOTICE | 15 ++ geaflow-console/pom.xml | 2 +- geaflow-kubernetes-operator/pom.xml | 2 +- .../src/main/assemblies/package.xml | 20 ++- pom.xml | 174 +++++++++++++-------- 6 files changed, 147 insertions(+), 73 deletions(-) diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 000000000..872f9aa1b --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1,7 @@ +Apache GeaFlow (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, +and decision making process have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness or stability of the code, +it does indicate that the project has yet to be fully endorsed by the ASF. diff --git a/NOTICE b/NOTICE new file mode 100644 index 000000000..3a14f4897 --- /dev/null +++ b/NOTICE @@ -0,0 +1,15 @@ +Apache GeaFlow +Copyright 2023-2025 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Apache Flink +Copyright 2014-2025 The Apache Software Foundation + +Apache Spark +Copyright 2014 and onwards The Apache Software Foundation + +Apache Calcite +Copyright 2012-2025 The Apache Software Foundation + diff --git a/geaflow-console/pom.xml b/geaflow-console/pom.xml index 0728b2b9a..8697d98e7 100644 --- a/geaflow-console/pom.xml +++ b/geaflow-console/pom.xml @@ -237,7 +237,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> + <version>3.4.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/geaflow-kubernetes-operator/pom.xml b/geaflow-kubernetes-operator/pom.xml index e6175edba..2add05f46 100644 --- a/geaflow-kubernetes-operator/pom.xml +++ b/geaflow-kubernetes-operator/pom.xml @@ -190,7 +190,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> + <version>3.4.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/geaflow/geaflow-deploy/geaflow-assembly/src/main/assemblies/package.xml b/geaflow/geaflow-deploy/geaflow-assembly/src/main/assemblies/package.xml index 89091e05e..c4b9d6da8 100644 --- a/geaflow/geaflow-deploy/geaflow-assembly/src/main/assemblies/package.xml +++ b/geaflow/geaflow-deploy/geaflow-assembly/src/main/assemblies/package.xml @@ -47,12 +47,6 @@ </dependencySets> <files> - <!-- copy fat jar --> - <file> - <source>target/geaflow-assembly-${project.version}.jar</source> - <outputDirectory>lib/</outputDirectory> - <fileMode>0644</fileMode> - </file> <!-- copy log4j conf --> <file> @@ -71,6 +65,20 @@ <fileSets> + <!-- copy fat jar --> + <fileSet> + <directory>target</directory> + <outputDirectory>lib/</outputDirectory> + <fileMode>0644</fileMode> + <includes> + <include>geaflow-assembly-${project.version}*.jar</include> + </includes> + <excludes> + <exclude>geaflow-assembly-${project.version}*-sources.jar</exclude> + <exclude>geaflow-assembly-${project.version}*-javadoc.jar</exclude> + </excludes> + </fileSet> + <!-- copy *.txt files --> <fileSet> <directory>src/main/geaflow-bin</directory> diff --git a/pom.xml b/pom.xml index 6a4f20e84..fd0d81fad 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,8 @@ -Djdk.reflect.useDirectMethodHandle=false -Dio.netty.tryReflectionSetAccessible=true </extraJavaTestArgs> + + <incubating.suffix></incubating.suffix> </properties> <modules> @@ -89,9 +91,9 @@ </developers> <scm> - <connection>https://github.com/TuGraph-family/tugraph-analytics.git</connection> - <developerConnection>https://github.com/TuGraph-family/analytics.git</developerConnection> - <url>https://github.com/TuGraph-family/analytics</url> + <connection>https://github.com/apache/geaflow.git</connection> + <developerConnection>https://github.com/apache/geaflow.git</developerConnection> + <url>https://github.com/apache/geaflow</url> </scm> <name>${project.groupId}:${project.artifactId}</name> @@ -140,6 +142,22 @@ <maxmem>1048m</maxmem> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>3.4.1</version> + <configuration> + <finalName>${project.artifactId}-${project.version}${incubating.suffix}</finalName> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + <skipIfEmpty>false</skipIfEmpty> + <forceCreation>true</forceCreation> + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> @@ -151,6 +169,9 @@ <goals> <goal>jar</goal> </goals> + <configuration> + <finalName>${project.artifactId}-${project.version}${incubating.suffix}</finalName> + </configuration> </execution> </executions> </plugin> @@ -267,6 +288,9 @@ <goals> <goal>jar</goal> </goals> + <configuration> + <finalName>${project.artifactId}-${project.version}${incubating.suffix}</finalName> + </configuration> </execution> </executions> </plugin> @@ -281,69 +305,69 @@ <goals> <goal>check</goal> </goals> - <configuration> - <consoleOutput>true</consoleOutput> - <excludeSubProjects>false</excludeSubProjects> - <numUnapprovedLicenses>0</numUnapprovedLicenses> - <licenses> - <license> - <family>AL2</family> - <notes></notes> - <text>Licensed to the Apache Software Foundation (ASF) under one</text> - </license> - </licenses> - <families> - <family> - <id>AL2</id> - <name>ApacheLicense 2.0</name> - </family> - </families> - <approvedLicenses> - <id>AL2</id> - </approvedLicenses> - <addDefaultLicenses>false</addDefaultLicenses> - <excludes> - <!-- Docs related --> - <exclude>docs/**/**</exclude> - <exclude>ci/**/**</exclude> - <exclude>.github/**/**</exclude> - <exclude>tools/**/*</exclude> - <exclude>geaflow-web/**/**</exclude> - <exclude>**/geaflow-web/**</exclude> - <exclude>**/target/**</exclude> - <exclude>**/docs/**</exclude> - <exclude>**/ci/**</exclude> - <exclude>**/web-dashboard/**</exclude> - <exclude>**/codegen/**</exclude> - <exclude>**/template/*.vm</exclude> - <exclude>**/resources/data/**</exclude> - <exclude>**/resources/expect/**</exclude> - <exclude>**/resources/zip_test2.txt</exclude> - <exclude>**/resources/zip_test.txt</exclude> - <exclude>**/resources/demo/demo_job_data.txt</exclude> - <exclude>**/resources/input/**</exclude> - <exclude>**/resources/i18n/**</exclude> - <exclude>**/resources/public/**</exclude> - <exclude>**/dependency-reduced-pom.xml</exclude> - <exclude>**/*.log</exclude> - <exclude>**/*.md</exclude> - <exclude>**/**/data/geaflow.sql</exclude> - <exclude>**/**/Filter.template</exclude> - <exclude>**/**/version.txt</exclude> - <exclude>**/**/graph_data.fbs</exclude> - <exclude>**/**/*.toml</exclude> - <exclude>**/**/.helmignore</exclude> - <exclude>**/**/templates/NOTES.txt</exclude> - <exclude>.readthedocs.yaml</exclude> - <exclude>.aci-plugin-outputs.sh</exclude> - <exclude>.aci.yml</exclude> - <exclude>mkdocs.yml</exclude> - <exclude>data/**</exclude> - <exclude>sync_code.sh</exclude> - </excludes> - </configuration> </execution> </executions> + <configuration> + <consoleOutput>true</consoleOutput> + <excludeSubProjects>false</excludeSubProjects> + <numUnapprovedLicenses>0</numUnapprovedLicenses> + <licenses> + <license> + <family>AL2</family> + <notes></notes> + <text>Licensed to the Apache Software Foundation (ASF) under one</text> + </license> + </licenses> + <families> + <family> + <id>AL2</id> + <name>ApacheLicense 2.0</name> + </family> + </families> + <approvedLicenses> + <id>AL2</id> + </approvedLicenses> + <addDefaultLicenses>false</addDefaultLicenses> + <excludes> + <!-- Docs related --> + <exclude>docs/**/**</exclude> + <exclude>ci/**/**</exclude> + <exclude>.github/**/**</exclude> + <exclude>tools/**/*</exclude> + <exclude>geaflow-web/**/**</exclude> + <exclude>**/geaflow-web/**</exclude> + <exclude>**/target/**</exclude> + <exclude>**/docs/**</exclude> + <exclude>**/ci/**</exclude> + <exclude>**/web-dashboard/**</exclude> + <exclude>**/codegen/**</exclude> + <exclude>**/template/*.vm</exclude> + <exclude>**/resources/data/**</exclude> + <exclude>**/resources/expect/**</exclude> + <exclude>**/resources/zip_test2.txt</exclude> + <exclude>**/resources/zip_test.txt</exclude> + <exclude>**/resources/demo/demo_job_data.txt</exclude> + <exclude>**/resources/input/**</exclude> + <exclude>**/resources/i18n/**</exclude> + <exclude>**/resources/public/**</exclude> + <exclude>**/dependency-reduced-pom.xml</exclude> + <exclude>**/*.log</exclude> + <exclude>**/*.md</exclude> + <exclude>**/**/data/geaflow.sql</exclude> + <exclude>**/**/Filter.template</exclude> + <exclude>**/**/version.txt</exclude> + <exclude>**/**/graph_data.fbs</exclude> + <exclude>**/**/*.toml</exclude> + <exclude>**/**/.helmignore</exclude> + <exclude>**/**/templates/NOTES.txt</exclude> + <exclude>.readthedocs.yaml</exclude> + <exclude>.aci-plugin-outputs.sh</exclude> + <exclude>.aci.yml</exclude> + <exclude>mkdocs.yml</exclude> + <exclude>data/**</exclude> + <exclude>sync_code.sh</exclude> + </excludes> + </configuration> </plugin> </plugins> </build> @@ -389,6 +413,9 @@ <profile> <id>maven-release</id> + <properties> + <incubating.suffix>-incubating</incubating.suffix> + </properties> <build> <plugins> <plugin> @@ -403,6 +430,9 @@ <goal>jar-no-fork</goal> <goal>test-jar-no-fork</goal> </goals> + <configuration> + <finalName>${project.artifactId}-${project.version}${incubating.suffix}</finalName> + </configuration> </execution> </executions> </plugin> @@ -426,6 +456,9 @@ <goals> <goal>jar</goal> </goals> + <configuration> + <finalName>${project.artifactId}-${project.version}${incubating.suffix}</finalName> + </configuration> </execution> </executions> </plugin> @@ -468,6 +501,9 @@ <profile> <id>apache-release</id> + <properties> + <incubating.suffix>-incubating</incubating.suffix> + </properties> <build> <plugins> <plugin> @@ -492,8 +528,16 @@ <descriptorRefs> <descriptorRef>source-release</descriptorRef> </descriptorRefs> - <finalName>apache-geaflow-${project.version}-src</finalName> + <finalName>apache-geaflow-${project.version}${incubating.suffix}-src</finalName> <appendAssemblyId>false</appendAssemblyId> + <!-- Output file format: tar.gz --> + <formats> + <format>tar.gz</format> + </formats> + <tarLongFileMode>gnu</tarLongFileMode> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + </archive> </configuration> </execution> </executions> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
