Repository: ignite Updated Branches: refs/heads/master 29f13da6e -> 7989173b4
http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/assembly/dependencies-hadoop.xml ---------------------------------------------------------------------- diff --git a/assembly/dependencies-hadoop.xml b/assembly/dependencies-hadoop.xml deleted file mode 100644 index 076f09c..0000000 --- a/assembly/dependencies-hadoop.xml +++ /dev/null @@ -1,166 +0,0 @@ -<?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. ---> - -<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";> - <id>dependencies</id> - - <formats> - <format>dir</format> - </formats> - - <includeBaseDirectory>false</includeBaseDirectory> - - <moduleSets> - <moduleSet> - <includes> - <include>org.apache.ignite:ignite-spark</include> - <include>org.apache.ignite:ignite-spring</include> - <include>org.apache.ignite:ignite-log4j</include> - <include>org.apache.ignite:ignite-indexing</include> - </includes> - <sources> - <includeModuleDirectory>true</includeModuleDirectory> - <fileSets> - <fileSet> - <directory>${basedir}</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>README.txt</include> - <include>licenses/**</include> - </includes> - </fileSet> - <fileSet> - <directory>${basedir}/target/licenses</directory> - <outputDirectory>/licenses</outputDirectory> - </fileSet> - <fileSet> - <directory>target/libs</directory> - <outputDirectory>/</outputDirectory> - <excludes> - <exclude>hadoop*.jar</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>*-tests.jar</exclude> - <exclude>*-javadoc.jar</exclude> - <exclude>*-sources.jar</exclude> - </excludes> - </fileSet> - </fileSets> - </sources> - </moduleSet> - - <moduleSet> - <includes> - <include>org.apache.ignite:ignite-core</include> - </includes> - <sources> - <includeModuleDirectory>false</includeModuleDirectory> - <fileSets> - <fileSet> - <directory>${basedir}</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>licenses/**</include> - </includes> - </fileSet> - <fileSet> - <directory>${basedir}/target/licenses</directory> - <outputDirectory>/licenses</outputDirectory> - </fileSet> - <fileSet> - <directory>target/libs</directory> - <outputDirectory>/</outputDirectory> - </fileSet> - <fileSet> - <directory>target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>*-tests.jar</exclude> - <exclude>*-javadoc.jar</exclude> - <exclude>*-sources.jar</exclude> - </excludes> - </fileSet> - </fileSets> - </sources> - </moduleSet> - - <moduleSet> - <includes> - <include>org.apache.ignite:ignite-hadoop</include> - </includes> - <sources> - <includeModuleDirectory>true</includeModuleDirectory> - <fileSets> - <fileSet> - <directory>${basedir}</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>README.txt</include> - <include>licenses/**</include> - </includes> - </fileSet> - <fileSet> - <directory>${basedir}/target/licenses</directory> - <outputDirectory>/licenses</outputDirectory> - </fileSet> - <fileSet> - <directory>target/libs</directory> - <outputDirectory>/</outputDirectory> - <excludes> - <exclude>hadoop*.jar</exclude> - <exclude>log4j*.jar</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>*-tests.jar</exclude> - <exclude>*-javadoc.jar</exclude> - <exclude>*-sources.jar</exclude> - </excludes> - </fileSet> - </fileSets> - </sources> - </moduleSet> - </moduleSets> - - <fileSets> - <fileSet> - <directory>modules/core/licenses</directory> - <outputDirectory>/licenses</outputDirectory> - </fileSet> - </fileSets> -</assembly> http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/assembly/libs/README.txt ---------------------------------------------------------------------- diff --git a/assembly/libs/README.txt b/assembly/libs/README.txt index 8e5f519..1365cc1 100644 --- a/assembly/libs/README.txt +++ b/assembly/libs/README.txt @@ -22,10 +22,10 @@ Importing Ignite Dependencies In Maven Project If you are using Maven to manage dependencies of your project, there are two options: -1. Import fabric edition: - - ignite-fabric (all inclusive) +1. Import: + - apache-ignite (all inclusive) -Here is how 'ignite-fabric' can be added to your POM file (replace '${ignite.version}' +Here is how 'apache-ignite' can be added to your POM file (replace '${ignite.version}' with actual Ignite version you are interested in): <project xmlns="http://maven.apache.org/POM/4.0.0"; @@ -37,7 +37,7 @@ with actual Ignite version you are interested in): ... <dependency> <groupId>org.apache.ignite</groupId> - <artifactId>ignite-fabric</artifactId> + <artifactId>apache-ignite</artifactId> <version>${ignite.version}</version> </dependency> ... http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/assembly/release-apache-ignite-base.xml ---------------------------------------------------------------------- diff --git a/assembly/release-apache-ignite-base.xml b/assembly/release-apache-ignite-base.xml new file mode 100644 index 0000000..73c05be --- /dev/null +++ b/assembly/release-apache-ignite-base.xml @@ -0,0 +1,257 @@ +<?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. + --> + +<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 + http://maven.apache.org/xsd/component-1.1.2.xsd";> + <files> + <!-- Copy CPP files. --> + <file> + <source>modules/platforms/cpp/project/vs/ignite.slnrel</source> + <outputDirectory>/platforms/cpp/project/vs</outputDirectory> + <destName>ignite.sln</destName> + </file> + + <file> + <source>modules/platforms/cpp/project/vs/ignite_x86.slnrel</source> + <outputDirectory>/platforms/cpp/project/vs</outputDirectory> + <destName>ignite_x86.sln</destName> + </file> + + <file> + <source>modules/platforms/cpp/configure.acrel</source> + <outputDirectory>/platforms/cpp</outputDirectory> + <destName>configure.ac</destName> + </file> + + <file> + <source>modules/platforms/cpp/Makefile.amrel</source> + <outputDirectory>/platforms/cpp</outputDirectory> + <destName>Makefile.am</destName> + </file> + + <!-- Other files. --> + <file> + <source>assembly/LICENSE_IGNITE</source> + <destName>LICENSE</destName> + <outputDirectory>/</outputDirectory> + </file> + + <file> + <source>assembly/NOTICE_IGNITE</source> + <destName>NOTICE</destName> + <outputDirectory>/</outputDirectory> + </file> + </files> + + <fileSets> + <!-- Move platforms readme. --> + <fileSet> + <directory>modules/platforms</directory> + <outputDirectory>/platforms</outputDirectory> + <includes> + <include>README.txt</include> + </includes> + </fileSet> + + <!-- Move .Net readme. --> + <fileSet> + <directory>modules/platforms/dotnet</directory> + <outputDirectory>/platforms/dotnet</outputDirectory> + <includes> + <include>README.txt</include> + </includes> + </fileSet> + + <!-- Move .Net binaries. --> + <fileSet> + <directory>modules/platforms/dotnet/bin</directory> + <outputDirectory>/platforms/dotnet/bin</outputDirectory> + </fileSet> + + <!-- Move .Net docs. --> + <fileSet> + <directory>modules/clients/target/dotnetdoc</directory> + <outputDirectory>/platforms/dotnet/docs</outputDirectory> + </fileSet> + + <!-- Move .Net examples. --> + <fileSet> + <directory>modules/platforms/dotnet/examples</directory> + <outputDirectory>/platforms/dotnet/examples</outputDirectory> + </fileSet> + + <!-- Move .Net licenses. --> + <fileSet> + <directory>modules/platforms/licenses</directory> + <outputDirectory>/platforms/dotnet/licenses</outputDirectory> + </fileSet> + + <!-- Move CPP readme. --> + <fileSet> + <directory>modules/platforms/cpp</directory> + <outputDirectory>/platforms/cpp</outputDirectory> + <includes> + <include>README.txt</include> + <include>DEVNOTES.txt</include> + </includes> + </fileSet> + + <!-- Move CPP "common" module. --> + <fileSet> + <directory>modules/platforms/cpp/common</directory> + <outputDirectory>/platforms/cpp/common</outputDirectory> + </fileSet> + + <!-- Move CPP "jni" module. --> + <fileSet> + <directory>modules/platforms/cpp/jni</directory> + <outputDirectory>/platforms/cpp/jni</outputDirectory> + </fileSet> + + <!-- Move CPP "core" module. --> + <fileSet> + <directory>modules/platforms/cpp/core</directory> + <outputDirectory>/platforms/cpp/core</outputDirectory> + </fileSet> + + <!-- Move CPP "ignite" module. --> + <fileSet> + <directory>modules/platforms/cpp/ignite</directory> + <outputDirectory>/platforms/cpp/ignite</outputDirectory> + </fileSet> + + <!-- Move CPP examples. --> + <fileSet> + <directory>modules/platforms/cpp/examples</directory> + <outputDirectory>/platforms/cpp/examples</outputDirectory> + </fileSet> + + <!-- Move CPP "odbc" module. --> + <fileSet> + <directory>modules/platforms/cpp/odbc</directory> + <outputDirectory>/platforms/cpp/odbc</outputDirectory> + </fileSet> + + <!-- Move CPP "binary" module. --> + <fileSet> + <directory>modules/platforms/cpp/binary</directory> + <outputDirectory>/platforms/cpp/binary</outputDirectory> + </fileSet> + + <!-- Move CPP "thin-client" module. --> + <fileSet> + <directory>modules/platforms/cpp/thin-client</directory> + <outputDirectory>/platforms/cpp/thin-client</outputDirectory> + </fileSet> + + <!-- Move CPP licenses. --> + <fileSet> + <directory>modules/platforms/licenses</directory> + <outputDirectory>/platforms/cpp/licenses</outputDirectory> + </fileSet> + + <!-- Move CPP docs. --> + <fileSet> + <directory>modules/clients/target/cppdoc/html</directory> + <outputDirectory>/platforms/cpp/docs</outputDirectory> + </fileSet> + + <!-- Move CPP binaries. --> + <fileSet> + <directory>modules/platforms/cpp/bin</directory> + <outputDirectory>/platforms/cpp/bin</outputDirectory> + </fileSet> + + <!-- Move CPP binaries. --> + <fileSet> + <directory>modules/platforms/cpp/bin</directory> + <outputDirectory>/platforms/cpp/bin</outputDirectory> + </fileSet> + + <!-- Move CPP binaries. --> + <fileSet> + <directory>modules/platforms/cpp/bin</directory> + <outputDirectory>/platforms/cpp/bin</outputDirectory> + </fileSet> + + <!-- Other files. --> + <fileSet> + <directory>bin</directory> + <outputDirectory>/bin</outputDirectory> + <includes> + <include>igniterouter.bat</include> + </includes> + </fileSet> + + <fileSet> + <directory>bin</directory> + <outputDirectory>/bin</outputDirectory> + <fileMode>0755</fileMode> + <includes> + <include>igniterouter.sh</include> + </includes> + </fileSet> + + <fileSet> + <directory>config/router</directory> + <outputDirectory>/config/router</outputDirectory> + </fileSet> + + <fileSet> + <directory>examples</directory> + <outputDirectory>/examples</outputDirectory> + <includes> + <include>rest/**</include> + <include>memcached/**</include> + <include>redis/**</include> + <include>sql/**</include> + </includes> + </fileSet> + + <fileSet> + <directory>target/javadoc/core</directory> + <outputDirectory>/docs/javadoc</outputDirectory> + </fileSet> + + <fileSet> + <directory>modules/scalar/target/site/scaladocs</directory> + <outputDirectory>/docs/scaladoc/scalar</outputDirectory> + </fileSet> + + <fileSet> + <directory>examples</directory> + <outputDirectory>/examples</outputDirectory> + <includes> + <include>config/**</include> + <include>src/**</include> + </includes> + <excludes> + <exclude>**/package.html</exclude> + <exclude>src/test/**</exclude> + </excludes> + </fileSet> + + <fileSet> + <directory>assembly/libs</directory> + <outputDirectory>/libs</outputDirectory> + </fileSet> + </fileSets> +</component> http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/assembly/release-apache-ignite-hadoop.xml ---------------------------------------------------------------------- diff --git a/assembly/release-apache-ignite-hadoop.xml b/assembly/release-apache-ignite-hadoop.xml new file mode 100644 index 0000000..3f61ec9 --- /dev/null +++ b/assembly/release-apache-ignite-hadoop.xml @@ -0,0 +1,95 @@ +<?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. +--> + +<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";> + <id>hadoop</id> + + <includeBaseDirectory>false</includeBaseDirectory> + + <formats> + <format>dir</format> + </formats> + + <componentDescriptors> + <componentDescriptor>release-base.xml</componentDescriptor> + </componentDescriptors> + + <files> + <file> + <source>assembly/LICENSE_HADOOP</source> + <destName>LICENSE</destName> + <outputDirectory>/</outputDirectory> + </file> + + <file> + <source>assembly/NOTICE_HADOOP</source> + <destName>NOTICE</destName> + <outputDirectory>/</outputDirectory> + </file> + + <file> + <source>modules/hadoop/config/core-site.ignite.xml</source> + <outputDirectory>/config/hadoop</outputDirectory> + </file> + <file> + <source>modules/hadoop/config/mapred-site.ignite.xml</source> + <outputDirectory>/config/hadoop</outputDirectory> + </file> + <file> + <source>modules/hadoop/config/hive-site.ignite.xml</source> + <outputDirectory>/config/hadoop</outputDirectory> + </file> + + <file> + <source>modules/hadoop/docs/HADOOP_README.txt</source> + <outputDirectory>/</outputDirectory> + </file> + </files> + + <fileSets> + <fileSet> + <directory>libs</directory> + <outputDirectory>/libs</outputDirectory> + <excludes> + <exclude>optional/**</exclude> + </excludes> + </fileSet> + + <fileSet> + <directory>bin</directory> + <outputDirectory>/bin</outputDirectory> + <includes> + <include>**/*hadoop*.bat</include> + </includes> + </fileSet> + + <fileSet> + <directory>bin</directory> + <outputDirectory>/bin</outputDirectory> + <fileMode>0755</fileMode> + <includes> + <include>**/*hadoop*.sh</include> + <include>**/service.sh</include> + </includes> + </fileSet> + </fileSets> +</assembly> http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/assembly/release-apache-ignite-lgpl.xml ---------------------------------------------------------------------- diff --git a/assembly/release-apache-ignite-lgpl.xml b/assembly/release-apache-ignite-lgpl.xml new file mode 100644 index 0000000..8777ea3 --- /dev/null +++ b/assembly/release-apache-ignite-lgpl.xml @@ -0,0 +1,51 @@ +<?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. +--> + +<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";> + <id>apache-ignite-lgpl</id> + + <includeBaseDirectory>false</includeBaseDirectory> + + <formats> + <format>dir</format> + </formats> + + <componentDescriptors> + <componentDescriptor>release-base.xml</componentDescriptor> + <componentDescriptor>release-apache-ignite-base.xml</componentDescriptor> + <componentDescriptor>release-yardstick.xml</componentDescriptor> + </componentDescriptors> + + <files> + <file> + <source>examples/pom-standalone-lgpl.xml</source> + <outputDirectory>/examples</outputDirectory> + <destName>pom.xml</destName> + </file> + + <file> + <source>examples/README-LGPL.txt</source> + <outputDirectory>/examples</outputDirectory> + <destName>README.txt</destName> + </file> + </files> +</assembly> http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/assembly/release-apache-ignite.xml ---------------------------------------------------------------------- diff --git a/assembly/release-apache-ignite.xml b/assembly/release-apache-ignite.xml new file mode 100644 index 0000000..a815916 --- /dev/null +++ b/assembly/release-apache-ignite.xml @@ -0,0 +1,51 @@ +<?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. +--> + +<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";> + <id>apache-ignite</id> + + <includeBaseDirectory>false</includeBaseDirectory> + + <formats> + <format>dir</format> + </formats> + + <componentDescriptors> + <componentDescriptor>release-base.xml</componentDescriptor> + <componentDescriptor>release-apache-ignite-base.xml</componentDescriptor> + <componentDescriptor>release-yardstick.xml</componentDescriptor> + </componentDescriptors> + + <files> + <file> + <source>examples/pom-standalone.xml</source> + <outputDirectory>/examples</outputDirectory> + <destName>pom.xml</destName> + </file> + + <file> + <source>examples/README.txt</source> + <outputDirectory>/examples</outputDirectory> + <destName>README.txt</destName> + </file> + </files> +</assembly> http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/assembly/release-fabric-base.xml ---------------------------------------------------------------------- diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml deleted file mode 100644 index efc643e..0000000 --- a/assembly/release-fabric-base.xml +++ /dev/null @@ -1,257 +0,0 @@ -<?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. - --> - -<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 - http://maven.apache.org/xsd/component-1.1.2.xsd";> - <files> - <!-- Copy CPP files. --> - <file> - <source>modules/platforms/cpp/project/vs/ignite.slnrel</source> - <outputDirectory>/platforms/cpp/project/vs</outputDirectory> - <destName>ignite.sln</destName> - </file> - - <file> - <source>modules/platforms/cpp/project/vs/ignite_x86.slnrel</source> - <outputDirectory>/platforms/cpp/project/vs</outputDirectory> - <destName>ignite_x86.sln</destName> - </file> - - <file> - <source>modules/platforms/cpp/configure.acrel</source> - <outputDirectory>/platforms/cpp</outputDirectory> - <destName>configure.ac</destName> - </file> - - <file> - <source>modules/platforms/cpp/Makefile.amrel</source> - <outputDirectory>/platforms/cpp</outputDirectory> - <destName>Makefile.am</destName> - </file> - - <!-- Other files. --> - <file> - <source>assembly/LICENSE_FABRIC</source> - <destName>LICENSE</destName> - <outputDirectory>/</outputDirectory> - </file> - - <file> - <source>assembly/NOTICE_FABRIC</source> - <destName>NOTICE</destName> - <outputDirectory>/</outputDirectory> - </file> - </files> - - <fileSets> - <!-- Move platforms readme. --> - <fileSet> - <directory>modules/platforms</directory> - <outputDirectory>/platforms</outputDirectory> - <includes> - <include>README.txt</include> - </includes> - </fileSet> - - <!-- Move .Net readme. --> - <fileSet> - <directory>modules/platforms/dotnet</directory> - <outputDirectory>/platforms/dotnet</outputDirectory> - <includes> - <include>README.txt</include> - </includes> - </fileSet> - - <!-- Move .Net binaries. --> - <fileSet> - <directory>modules/platforms/dotnet/bin</directory> - <outputDirectory>/platforms/dotnet/bin</outputDirectory> - </fileSet> - - <!-- Move .Net docs. --> - <fileSet> - <directory>modules/clients/target/dotnetdoc</directory> - <outputDirectory>/platforms/dotnet/docs</outputDirectory> - </fileSet> - - <!-- Move .Net examples. --> - <fileSet> - <directory>modules/platforms/dotnet/examples</directory> - <outputDirectory>/platforms/dotnet/examples</outputDirectory> - </fileSet> - - <!-- Move .Net licenses. --> - <fileSet> - <directory>modules/platforms/licenses</directory> - <outputDirectory>/platforms/dotnet/licenses</outputDirectory> - </fileSet> - - <!-- Move CPP readme. --> - <fileSet> - <directory>modules/platforms/cpp</directory> - <outputDirectory>/platforms/cpp</outputDirectory> - <includes> - <include>README.txt</include> - <include>DEVNOTES.txt</include> - </includes> - </fileSet> - - <!-- Move CPP "common" module. --> - <fileSet> - <directory>modules/platforms/cpp/common</directory> - <outputDirectory>/platforms/cpp/common</outputDirectory> - </fileSet> - - <!-- Move CPP "jni" module. --> - <fileSet> - <directory>modules/platforms/cpp/jni</directory> - <outputDirectory>/platforms/cpp/jni</outputDirectory> - </fileSet> - - <!-- Move CPP "core" module. --> - <fileSet> - <directory>modules/platforms/cpp/core</directory> - <outputDirectory>/platforms/cpp/core</outputDirectory> - </fileSet> - - <!-- Move CPP "ignite" module. --> - <fileSet> - <directory>modules/platforms/cpp/ignite</directory> - <outputDirectory>/platforms/cpp/ignite</outputDirectory> - </fileSet> - - <!-- Move CPP examples. --> - <fileSet> - <directory>modules/platforms/cpp/examples</directory> - <outputDirectory>/platforms/cpp/examples</outputDirectory> - </fileSet> - - <!-- Move CPP "odbc" module. --> - <fileSet> - <directory>modules/platforms/cpp/odbc</directory> - <outputDirectory>/platforms/cpp/odbc</outputDirectory> - </fileSet> - - <!-- Move CPP "binary" module. --> - <fileSet> - <directory>modules/platforms/cpp/binary</directory> - <outputDirectory>/platforms/cpp/binary</outputDirectory> - </fileSet> - - <!-- Move CPP "thin-client" module. --> - <fileSet> - <directory>modules/platforms/cpp/thin-client</directory> - <outputDirectory>/platforms/cpp/thin-client</outputDirectory> - </fileSet> - - <!-- Move CPP licenses. --> - <fileSet> - <directory>modules/platforms/licenses</directory> - <outputDirectory>/platforms/cpp/licenses</outputDirectory> - </fileSet> - - <!-- Move CPP docs. --> - <fileSet> - <directory>modules/clients/target/cppdoc/html</directory> - <outputDirectory>/platforms/cpp/docs</outputDirectory> - </fileSet> - - <!-- Move CPP binaries. --> - <fileSet> - <directory>modules/platforms/cpp/bin</directory> - <outputDirectory>/platforms/cpp/bin</outputDirectory> - </fileSet> - - <!-- Move CPP binaries. --> - <fileSet> - <directory>modules/platforms/cpp/bin</directory> - <outputDirectory>/platforms/cpp/bin</outputDirectory> - </fileSet> - - <!-- Move CPP binaries. --> - <fileSet> - <directory>modules/platforms/cpp/bin</directory> - <outputDirectory>/platforms/cpp/bin</outputDirectory> - </fileSet> - - <!-- Other files. --> - <fileSet> - <directory>bin</directory> - <outputDirectory>/bin</outputDirectory> - <includes> - <include>igniterouter.bat</include> - </includes> - </fileSet> - - <fileSet> - <directory>bin</directory> - <outputDirectory>/bin</outputDirectory> - <fileMode>0755</fileMode> - <includes> - <include>igniterouter.sh</include> - </includes> - </fileSet> - - <fileSet> - <directory>config/router</directory> - <outputDirectory>/config/router</outputDirectory> - </fileSet> - - <fileSet> - <directory>examples</directory> - <outputDirectory>/examples</outputDirectory> - <includes> - <include>rest/**</include> - <include>memcached/**</include> - <include>redis/**</include> - <include>sql/**</include> - </includes> - </fileSet> - - <fileSet> - <directory>target/javadoc/core</directory> - <outputDirectory>/docs/javadoc</outputDirectory> - </fileSet> - - <fileSet> - <directory>modules/scalar/target/site/scaladocs</directory> - <outputDirectory>/docs/scaladoc/scalar</outputDirectory> - </fileSet> - - <fileSet> - <directory>examples</directory> - <outputDirectory>/examples</outputDirectory> - <includes> - <include>config/**</include> - <include>src/**</include> - </includes> - <excludes> - <exclude>**/package.html</exclude> - <exclude>src/test/**</exclude> - </excludes> - </fileSet> - - <fileSet> - <directory>assembly/libs</directory> - <outputDirectory>/libs</outputDirectory> - </fileSet> - </fileSets> -</component> http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/assembly/release-fabric-lgpl.xml ---------------------------------------------------------------------- diff --git a/assembly/release-fabric-lgpl.xml b/assembly/release-fabric-lgpl.xml deleted file mode 100644 index ff4d8c4..0000000 --- a/assembly/release-fabric-lgpl.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?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. ---> - -<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";> - <id>fabric-lgpl</id> - - <includeBaseDirectory>false</includeBaseDirectory> - - <formats> - <format>dir</format> - </formats> - - <componentDescriptors> - <componentDescriptor>release-base.xml</componentDescriptor> - <componentDescriptor>release-fabric-base.xml</componentDescriptor> - <componentDescriptor>release-yardstick.xml</componentDescriptor> - </componentDescriptors> - - <files> - <file> - <source>examples/pom-standalone-lgpl.xml</source> - <outputDirectory>/examples</outputDirectory> - <destName>pom.xml</destName> - </file> - - <file> - <source>examples/README-LGPL.txt</source> - <outputDirectory>/examples</outputDirectory> - <destName>README.txt</destName> - </file> - </files> -</assembly> http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/assembly/release-fabric.xml ---------------------------------------------------------------------- diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml deleted file mode 100644 index 7536d4e..0000000 --- a/assembly/release-fabric.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?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. ---> - -<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";> - <id>fabric</id> - - <includeBaseDirectory>false</includeBaseDirectory> - - <formats> - <format>dir</format> - </formats> - - <componentDescriptors> - <componentDescriptor>release-base.xml</componentDescriptor> - <componentDescriptor>release-fabric-base.xml</componentDescriptor> - <componentDescriptor>release-yardstick.xml</componentDescriptor> - </componentDescriptors> - - <files> - <file> - <source>examples/pom-standalone.xml</source> - <outputDirectory>/examples</outputDirectory> - <destName>pom.xml</destName> - </file> - - <file> - <source>examples/README.txt</source> - <outputDirectory>/examples</outputDirectory> - <destName>README.txt</destName> - </file> - </files> -</assembly> http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/assembly/release-hadoop.xml ---------------------------------------------------------------------- diff --git a/assembly/release-hadoop.xml b/assembly/release-hadoop.xml deleted file mode 100644 index 3f61ec9..0000000 --- a/assembly/release-hadoop.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?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. ---> - -<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";> - <id>hadoop</id> - - <includeBaseDirectory>false</includeBaseDirectory> - - <formats> - <format>dir</format> - </formats> - - <componentDescriptors> - <componentDescriptor>release-base.xml</componentDescriptor> - </componentDescriptors> - - <files> - <file> - <source>assembly/LICENSE_HADOOP</source> - <destName>LICENSE</destName> - <outputDirectory>/</outputDirectory> - </file> - - <file> - <source>assembly/NOTICE_HADOOP</source> - <destName>NOTICE</destName> - <outputDirectory>/</outputDirectory> - </file> - - <file> - <source>modules/hadoop/config/core-site.ignite.xml</source> - <outputDirectory>/config/hadoop</outputDirectory> - </file> - <file> - <source>modules/hadoop/config/mapred-site.ignite.xml</source> - <outputDirectory>/config/hadoop</outputDirectory> - </file> - <file> - <source>modules/hadoop/config/hive-site.ignite.xml</source> - <outputDirectory>/config/hadoop</outputDirectory> - </file> - - <file> - <source>modules/hadoop/docs/HADOOP_README.txt</source> - <outputDirectory>/</outputDirectory> - </file> - </files> - - <fileSets> - <fileSet> - <directory>libs</directory> - <outputDirectory>/libs</outputDirectory> - <excludes> - <exclude>optional/**</exclude> - </excludes> - </fileSet> - - <fileSet> - <directory>bin</directory> - <outputDirectory>/bin</outputDirectory> - <includes> - <include>**/*hadoop*.bat</include> - </includes> - </fileSet> - - <fileSet> - <directory>bin</directory> - <outputDirectory>/bin</outputDirectory> - <fileMode>0755</fileMode> - <includes> - <include>**/*hadoop*.sh</include> - <include>**/service.sh</include> - </includes> - </fileSet> - </fileSets> -</assembly> http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/assembly/release-sources.xml ---------------------------------------------------------------------- diff --git a/assembly/release-sources.xml b/assembly/release-sources.xml deleted file mode 100644 index cc33f3e..0000000 --- a/assembly/release-sources.xml +++ /dev/null @@ -1,80 +0,0 @@ -<?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. ---> - -<assembly> - <id>source-release</id> - <formats> - <format>zip</format> - </formats> - - <fileSets> - <!-- main project directory structure --> - <fileSet> - <directory>.</directory> - <outputDirectory>/</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - <excludes> - <!-- build output --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}/.*]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}]</exclude> - - <!-- NOTE: Most of the following excludes should not be required - if the standard release process is followed. This is because the - release plugin checks out project sources into a location like - target/checkout, then runs the build from there. The result is - a source-release archive that comes from a pretty clean directory - structure. - - HOWEVER, if the release plugin is configured to run extra goals - or generate a project website, it's definitely possible that some - of these files will be present. So, it's safer to exclude them. - --> - - <!-- IDEs --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude> - - <!-- misc --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude> - - <!-- release-plugin temp files --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude> - - <!-- dotnet assemblies --> - <exclude>modules/platforms/dotnet/bin/**</exclude> - </excludes> - </fileSet> - <!-- license, readme, etc. calculated at build time --> - <fileSet> - <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory> - <outputDirectory>/</outputDirectory> - </fileSet> - </fileSets> -</assembly> http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/docker/apache-ignite/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/apache-ignite/Dockerfile b/docker/apache-ignite/Dockerfile index 15b5c3e..148ce42 100644 --- a/docker/apache-ignite/Dockerfile +++ b/docker/apache-ignite/Dockerfile @@ -19,7 +19,7 @@ FROM openjdk:8-jre-alpine # Settings -ENV IGNITE_HOME /opt/ignite/apache-ignite-fabric +ENV IGNITE_HOME /opt/ignite/apache-ignite WORKDIR /opt/ignite # Add missing software @@ -27,7 +27,7 @@ RUN apk --no-cache \ add bash # Copy main binary archive -COPY apache-ignite-fabric* apache-ignite-fabric +COPY apache-ignite* apache-ignite # Copy sh files and set permission COPY run.sh $IGNITE_HOME/ http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/docker/apache-ignite/README.txt ---------------------------------------------------------------------- diff --git a/docker/apache-ignite/README.txt b/docker/apache-ignite/README.txt index 6912bc4..98d67b2 100644 --- a/docker/apache-ignite/README.txt +++ b/docker/apache-ignite/README.txt @@ -13,11 +13,11 @@ Build image 3) Copy Apache Ignite's binary archive to Docker module directory - cp -rfv ../../target/bin/apache-ignite-fabric-*.zip + cp -rfv ../../target/bin/apache-ignite-*.zip 4) Unpack Apache Ignite's binary archive - unzip apache-ignite-fabric-*.zip + unzip apache-ignite-*.zip 5) Build docker image http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/examples/README.txt ---------------------------------------------------------------------- diff --git a/examples/README.txt b/examples/README.txt index 9da74a8..abb5d23 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -36,6 +36,6 @@ There are some ways to gain required libs from sources: 1) Run "mvn clean install -DskipTests -P lgpl" at Apache Ignite sources. This case will install lgpl-based libs to local maven repository. -2) Run "mvn clean package -DskipTests -Prelease,lgpl -Dignite.edition=fabric-lgpl" at Apache Ignite sources. +2) Run "mvn clean package -DskipTests -Prelease,lgpl -Dignite.edition=apache-ignite-lgpl" at Apache Ignite sources. Required libs will appear at /target/release-package/libs/optional subfolders. Found libs should be copied to global or project's classpath. http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/modules/kubernetes/DEVNOTES.txt ---------------------------------------------------------------------- diff --git a/modules/kubernetes/DEVNOTES.txt b/modules/kubernetes/DEVNOTES.txt index b2a8173..2e3d84d 100644 --- a/modules/kubernetes/DEVNOTES.txt +++ b/modules/kubernetes/DEVNOTES.txt @@ -10,7 +10,7 @@ Building Apache Ignite ========================= Use the command below to assemble an Apache Ignite binary: - mvn clean package -Prelease -Dignite.edition=fabric-lgpl -DskipTests + mvn clean package -Prelease -Dignite.edition=apache-ignite-lgpl -DskipTests Note, if you alter the build instruction somehow make sure to update the files under 'config' folder if needed. http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/modules/kubernetes/config/Dockerfile ---------------------------------------------------------------------- diff --git a/modules/kubernetes/config/Dockerfile b/modules/kubernetes/config/Dockerfile index 2274535..634e181 100644 --- a/modules/kubernetes/config/Dockerfile +++ b/modules/kubernetes/config/Dockerfile @@ -22,7 +22,7 @@ FROM java:8 ENV IGNITE_VERSION 2.0.0-SNAPSHOT # Set IGNITE_HOME variable. -ENV IGNITE_HOME /opt/ignite/apache-ignite-fabric-lgpl-${IGNITE_VERSION}-bin +ENV IGNITE_HOME /opt/ignite/apache-ignite-lgpl-${IGNITE_VERSION}-bin # Setting a path to an Apache Ignite configuration file. Used by run.sh script below. ENV CONFIG_URI ${IGNITE_HOME}/config/example-kube.xml @@ -40,11 +40,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends unzip WORKDIR /opt/ignite # Copying local Apache Ignite build to the docker image. -COPY ./apache-ignite-fabric-lgpl-${IGNITE_VERSION}-bin.zip apache-ignite-fabric-lgpl-${IGNITE_VERSION}-bin.zip +COPY ./apache-ignite-lgpl-${IGNITE_VERSION}-bin.zip apache-ignite-lgpl-${IGNITE_VERSION}-bin.zip # Unpacking the build. -RUN unzip apache-ignite-fabric-lgpl-${IGNITE_VERSION}-bin.zip -RUN rm apache-ignite-fabric-lgpl-${IGNITE_VERSION}-bin.zip +RUN unzip apache-ignite-lgpl-${IGNITE_VERSION}-bin.zip +RUN rm apache-ignite-lgpl-${IGNITE_VERSION}-bin.zip # Copying the executable file and setting permissions. COPY ./run.sh $IGNITE_HOME/ http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/modules/mesos/pom.xml ---------------------------------------------------------------------- diff --git a/modules/mesos/pom.xml b/modules/mesos/pom.xml index a5c711a..1841650 100644 --- a/modules/mesos/pom.xml +++ b/modules/mesos/pom.xml @@ -37,7 +37,7 @@ <properties> <mesos.version>1.5.0</mesos.version> <ignite.version.url>https://ignite.apache.org/latest</ignite.version.url> - <ignite.path>/ignite/%s/apache-ignite-fabric-%s-bin.zip</ignite.path> + <ignite.path>/ignite/%s/apache-ignite-%s-bin.zip</ignite.path> <apache.mirror.url>https://www.apache.org/dyn/closer.cgi?as_json=1</apache.mirror.url> </properties> http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java ---------------------------------------------------------------------- diff --git a/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java b/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java index 4cd0c0a..652879e 100644 --- a/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java +++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/resource/IgniteProvider.java @@ -49,7 +49,7 @@ public class IgniteProvider { // This constants are set by maven-ant-plugin. /** */ - private static final String DOWNLOAD_URL_PATTERN = "https://archive.apache.org/dist/ignite/%s/apache-ignite-fabric-%s-bin.zip";; + private static final String DOWNLOAD_URL_PATTERN = "https://archive.apache.org/dist/ignite/%s/apache-ignite-%s-bin.zip";; /** URL for request Ignite latest version. */ private final static String IGNITE_LATEST_VERSION_URL = "https://ignite.apache.org/latest";; http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/packaging/package.sh ---------------------------------------------------------------------- diff --git a/packaging/package.sh b/packaging/package.sh index def4aeb..d409052 100755 --- a/packaging/package.sh +++ b/packaging/package.sh @@ -37,7 +37,7 @@ usage () { ####################################################################### Prerequisites: - - RPM: binary archive with name 'apache-ignite-fabric-<version>-bin.zip' + - RPM: binary archive with name 'apache-ignite-<version>-bin.zip' - DEB: previously built corresponding RPM package Usage: ./$(basename ${BASH_SOURCE[0]}) --rpm,--deb [--batch] @@ -95,7 +95,7 @@ prepEnv () { getBin () { set -x IGNITE_VERSION=$(cat rpm/apache-ignite.spec | grep Version: | head -1 | sed -r 's|.*:\s+(.*)|\1|') - BIN_NAME="apache-ignite-fabric-${IGNITE_VERSION}-bin.zip" + BIN_NAME="apache-ignite-${IGNITE_VERSION}-bin.zip" binPreparedFlag=false # Search binary in packaging root directory http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/packaging/rpm/apache-ignite.spec ---------------------------------------------------------------------- diff --git a/packaging/rpm/apache-ignite.spec b/packaging/rpm/apache-ignite.spec index 18ffea1..90fa870 100644 --- a/packaging/rpm/apache-ignite.spec +++ b/packaging/rpm/apache-ignite.spec @@ -17,7 +17,7 @@ Summary: Apache Ignite In-Memory Computing, Database and Caching Platfo Group: Development/System License: ASL 2.0 URL: https://ignite.apache.org/ -Source: %{name}-fabric-%{version}-bin.zip +Source: %{name}-%{version}-bin.zip Requires: java-1.8.0, chkconfig Requires(pre): shadow-utils Provides: %{name} @@ -36,7 +36,7 @@ in-memory speeds at petabyte scale # Prepare step: unpack sources # -%setup -q -n %{name}-fabric-%{version}-bin +%setup -q -n %{name}-%{version}-bin #%pre http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index cc04175..412e81e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -36,7 +36,7 @@ <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> - <ignite.edition>fabric</ignite.edition> + <ignite.edition>apache-ignite</ignite.edition> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.build.timestamp.format>MMMM d yyyy</maven.build.timestamp.format> <doxygen.exec>doxygen</doxygen.exec> http://git-wip-us.apache.org/repos/asf/ignite/blob/7989173b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ffedd71..ace8e8a 100644 --- a/pom.xml +++ b/pom.xml @@ -30,16 +30,10 @@ <relativePath>parent</relativePath> </parent> - <groupId>org.apache.ignite</groupId> <artifactId>apache-ignite</artifactId> <version>2.7.0-SNAPSHOT</version> <packaging>pom</packaging> - <properties> - <!--fix <attachartifact>...< /> at apache-release profile if changed--> - <ignite.zip.pattern>${project.artifactId}-${ignite.edition}-${project.version}-bin</ignite.zip.pattern> - </properties> - <scm> <url>https://git-wip-us.apache.org/repos/asf/ignite</url> <connection>scm:git:https://git-wip-us.apache.org/repos/asf/ignite</connection> @@ -396,15 +390,15 @@ <include name="**/*.sh" /> </fixcrlf> - <zip destfile="${basedir}/target/bin/${ignite.zip.pattern}.zip" encoding="UTF-8"> - <zipfileset dir="${basedir}/target/release-package-${ignite.edition}" prefix="${ignite.zip.pattern}" filemode="755"> + <zip destfile="${basedir}/target/bin/${ignite.edition}-${project.version}-bin.zip" encoding="UTF-8"> + <zipfileset dir="${basedir}/target/release-package-${ignite.edition}" prefix="${ignite.edition}-${project.version}-bin" filemode="755"> <include name="**/*.sh" /> <include name="**/configure" /> <include name="**/install-sh" /> <include name="**/compile" /> <include name="**/missing" /> </zipfileset> - <zipfileset dir="${basedir}/target/release-package-${ignite.edition}" prefix="${ignite.zip.pattern}"> + <zipfileset dir="${basedir}/target/release-package-${ignite.edition}" prefix="${ignite.edition}-${project.version}-bin"> <exclude name="**/*.sh" /> <exclude name="**/configure" /> <exclude name="**/install-sh" /> @@ -574,35 +568,6 @@ </profile> <profile> - <id>release-sources</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>source-release-assembly-ignite</id> - <phase>validate</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - <descriptors> - <descriptor>assembly/release-sources.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - <finalName>${project.artifactId}-${project.version}-src</finalName> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> <id>web-console</id> <modules> <module>modules/web-console</module>
