This is an automated email from the ASF dual-hosted git repository.
zhangyonglun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu-wasm.git
The following commit(s) were added to refs/heads/master by this push:
new 2219a39 init shenyu-wasm-dist module (#11)
2219a39 is described below
commit 2219a39952e2b41f6279eafcdfcb3b3542a89094
Author: dragon-zhang <[email protected]>
AuthorDate: Sun Dec 24 14:54:21 2023 +0800
init shenyu-wasm-dist module (#11)
* init shenyu-wasm-dist module
* remove native-lib-loader NOTICE
---
LICENSE | 30 ++++++++
MIT-LICENSE => licenses/LICENSE-jni-rs.txt | 7 +-
licenses/LICENSE-native-lib-loader.txt | 28 +++++++
MIT-LICENSE => licenses/LICENSE-wasmer-java.txt | 3 +
MIT-LICENSE => licenses/LICENSE-wasmer.txt | 3 +
pom.xml | 4 +
shenyu-wasm-dist/pom.xml | 70 +++++++++++++++++
shenyu-wasm-dist/shenyu-wasm-src-dist/pom.xml | 66 ++++++++++++++++
.../src/main/assembly/source.xml | 89 ++++++++++++++++++++++
.../src/test/resources/no_memory.wat | 7 --
10 files changed, 298 insertions(+), 9 deletions(-)
diff --git a/LICENSE b/LICENSE
index 8dada3e..2ea38e5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,3 +199,33 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+=======================================================================
+Apache ShenYu Subcomponents:
+
+The Apache ShenYu project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+========================================================================
+Apache 2.0 licenses
+========================================================================
+
+The following components are provided under the Apache License. See project
link for details.
+The text of each license is the standard Apache 2.0 license.
+
+ Maven Wrapper(mvnw, mvnw.cmd files in root path),
https://github.com/apache/maven-wrapper Apache 2.0
+ jni-rs 0.16: https://github.com/jni-rs/jni-rs, Apache 2.0
+
+========================================================================
+MIT licenses
+========================================================================
+
+The following components are provided under the MIT License. See project link
for details.
+The text of each license is also included at licenses/LICENSE-[project].txt.
+
+ wasmer-java 0.3.0: https://github.com/wasmerio/wasmer-java, MIT
+ native-lib-loader 2.0.2: https://github.com/scijava/native-lib-loader, MIT
+ jni-rs 0.16: https://github.com/jni-rs/jni-rs, MIT
+ wasmer : https://github.com/wasmerio/wasmer, MIT
diff --git a/MIT-LICENSE b/licenses/LICENSE-jni-rs.txt
similarity index 90%
copy from MIT-LICENSE
copy to licenses/LICENSE-jni-rs.txt
index 62bb543..bb65a17 100644
--- a/MIT-LICENSE
+++ b/licenses/LICENSE-jni-rs.txt
@@ -1,6 +1,9 @@
-MIT License
+jni-rs License
+---------------
-Copyright (c) 2019-present Wasmer, Inc. and its affiliates.
+The MIT License (MIT)
+
+Copyright (c) 2016 Prevoty, Inc. and jni-rs contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/licenses/LICENSE-native-lib-loader.txt
b/licenses/LICENSE-native-lib-loader.txt
new file mode 100644
index 0000000..3a58cb8
--- /dev/null
+++ b/licenses/LICENSE-native-lib-loader.txt
@@ -0,0 +1,28 @@
+native-lib-loader License
+---------------
+
+Copyright (c) 2010 - 2023, Board of Regents of the University of
+Wisconsin-Madison and Glencoe Software, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/MIT-LICENSE b/licenses/LICENSE-wasmer-java.txt
similarity index 96%
copy from MIT-LICENSE
copy to licenses/LICENSE-wasmer-java.txt
index 62bb543..d22ba48 100644
--- a/MIT-LICENSE
+++ b/licenses/LICENSE-wasmer-java.txt
@@ -1,3 +1,6 @@
+wasmer-java License
+---------------
+
MIT License
Copyright (c) 2019-present Wasmer, Inc. and its affiliates.
diff --git a/MIT-LICENSE b/licenses/LICENSE-wasmer.txt
similarity index 97%
rename from MIT-LICENSE
rename to licenses/LICENSE-wasmer.txt
index 62bb543..a094494 100644
--- a/MIT-LICENSE
+++ b/licenses/LICENSE-wasmer.txt
@@ -1,3 +1,6 @@
+wasmer License
+---------------
+
MIT License
Copyright (c) 2019-present Wasmer, Inc. and its affiliates.
diff --git a/pom.xml b/pom.xml
index 19ba934..0a0f7ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,10 @@
<name>shenyu-wasm</name>
<packaging>pom</packaging>
<modules>
+ <!-- shenyu-wasm-build only used to generate dylibs by CI -->
+ <!-- <module>shenyu-wasm-build</module> -->
<module>shenyu-wasm-runtime</module>
+ <module>shenyu-wasm-dist</module>
</modules>
<licenses>
@@ -75,6 +78,7 @@
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
<apache-rat-plugin.version>0.13</apache-rat-plugin.version>
+ <maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>
</properties>
<dependencyManagement>
diff --git a/shenyu-wasm-dist/pom.xml b/shenyu-wasm-dist/pom.xml
new file mode 100644
index 0000000..666e376
--- /dev/null
+++ b/shenyu-wasm-dist/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <parent>
+ <groupId>org.apache.shenyu</groupId>
+ <artifactId>shenyu-wasm</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>shenyu-wasm-dist</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>shenyu-wasm-src-dist</module>
+ </modules>
+
+ <properties>
+ <checksum-maven-plugin.version>1.10</checksum-maven-plugin.version>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>${checksum-maven-plugin.version}</version>
+ <configuration>
+ <appendFilename>true</appendFilename>
+ <algorithms>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>*.tar.gz</include>
+ <include>*.zip</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>artifacts</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
\ No newline at end of file
diff --git a/shenyu-wasm-dist/shenyu-wasm-src-dist/pom.xml
b/shenyu-wasm-dist/shenyu-wasm-src-dist/pom.xml
new file mode 100644
index 0000000..1f0bae9
--- /dev/null
+++ b/shenyu-wasm-dist/shenyu-wasm-src-dist/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.shenyu</groupId>
+ <artifactId>shenyu-wasm-dist</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>shenyu-wasm-src-dist</artifactId>
+ <packaging>pom</packaging>
+ <name>${project.artifactId}</name>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <finalName>apache-shenyu-${project.version}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/source.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>posix</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
diff --git a/shenyu-wasm-dist/shenyu-wasm-src-dist/src/main/assembly/source.xml
b/shenyu-wasm-dist/shenyu-wasm-src-dist/src/main/assembly/source.xml
new file mode 100644
index 0000000..63eeb5e
--- /dev/null
+++ b/shenyu-wasm-dist/shenyu-wasm-src-dist/src/main/assembly/source.xml
@@ -0,0 +1,89 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<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";>
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${project.build.finalName}-src</baseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>../../</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <!-- github ignore -->
+ <exclude>**/.github/**</exclude>
+ <exclude>.travis.yml</exclude>
+
+ <!-- maven ignore -->
+ <exclude>**/target/**</exclude>
+ <exclude>**/*.class</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.war</exclude>
+ <exclude>**/*.zip</exclude>
+ <exclude>**/*.tar</exclude>
+ <exclude>**/*.tar.gz</exclude>
+
+ <!-- maven plugin ignore -->
+ <exclude>release.properties</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>**/pom.xml.releaseBackup</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <exclude>*.gpg</exclude>
+
+ <!-- eclipse ignore -->
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+
+ <!-- idea ignore -->
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.iws</exclude>
+
+ <!-- temp ignore -->
+ <exclude>**/logs/**</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.doc</exclude>
+ <exclude>**/*.cache</exclude>
+ <exclude>**/*.diff</exclude>
+ <exclude>**/*.patch</exclude>
+ <exclude>**/*.tmp</exclude>
+
+ <!-- system ignore -->
+ <exclude>**/.DS_Store</exclude>
+ <exclude>**/Thumbs.db</exclude>
+
+ <!-- modules ignore -->
+ <exclude>shenyu-integrated-test/**</exclude>
+ <exclude>shenyu-examples/**</exclude>
+ <exclude>shenyu-dashboard/**</exclude>
+ <exclude>shenyu-admin/src/main/resources/static/*.css</exclude>
+ <exclude>shenyu-admin/src/main/resources/static/*.js</exclude>
+ <exclude>shenyu-e2e</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/shenyu-wasm-runtime/src/test/resources/no_memory.wat
b/shenyu-wasm-runtime/src/test/resources/no_memory.wat
deleted file mode 100644
index c8dc695..0000000
--- a/shenyu-wasm-runtime/src/test/resources/no_memory.wat
+++ /dev/null
@@ -1,7 +0,0 @@
-(module
- (type $hello_wasm_type (func (result i32)))
-
- (func $hello (type $hello_wasm_type) (result i32)
- i32.const 42)
-
- (export "hello" (func $hello)))
\ No newline at end of file
