diff --git a/.github/workflows/docker_snapshot.yml b/.github/workflows/docker_snapshot.yml index 0d852ac8a76a..e78eacdb753c 100644 --- a/.github/workflows/docker_snapshot.yml +++ b/.github/workflows/docker_snapshot.yml @@ -58,9 +58,9 @@ jobs: mvn -f hazelcast/pom.xml -B \ -Dmaven.site.skip=true -Dmaven.javadoc.skip=true \ -Dcheckstyle.skip -Dspotbugs.skip clean install -DskipTests - rm hazelcast/hazelcast-all/target/*-sources.jar \ - hazelcast/hazelcast-all/target/*-tests.jar || true - cp hazelcast/hazelcast-all/target/hazelcast-all-*.jar hazelcast-all.jar + rm hazelcast/hazelcast/target/*-sources.jar \ + hazelcast/hazelcast/target/*-tests.jar || true + cp hazelcast/hazelcast/target/hazelcast-*.jar hazelcast.jar - name: Docker Build and Push hazelcast-snapshot image run: | @@ -76,9 +76,9 @@ jobs: mvn -f hazelcast-enterprise/pom.xml -B -Dmaven.test.skip=true \ -Dmaven.site.skip=true -Dmaven.javadoc.skip=true \ -Dcheckstyle.skip -Dspotbugs.skip clean install -DskipTests - rm hazelcast-enterprise/hazelcast-enterprise-all/target/*-sources.jar \ - hazelcast-enterprise/hazelcast-enterprise-all/target/*-tests.jar || true - cp hazelcast-enterprise/hazelcast-enterprise-all/target/hazelcast-enterprise-all-*.jar hazelcast-enterprise-all.jar + rm hazelcast-enterprise/hazelcast-enterprise/target/*-sources.jar \ + hazelcast-enterprise/hazelcast-enterprise/target/*-tests.jar || true + cp hazelcast-enterprise/hazelcast-enterprise/target/hazelcast-enterprise-*.jar hazelcast-enterprise.jar - name: Docker Build and Push hazelcast-enterprise-snapshot image run: | diff --git a/hazelcast-all/pom.xml b/hazelcast-all/pom.xml deleted file mode 100755 index 03a3d346e260..000000000000 --- a/hazelcast-all/pom.xml +++ /dev/null @@ -1,186 +0,0 @@ - - - - 4.0.0 - - - com.hazelcast - hazelcast-root - 5.0-SNAPSHOT - ../pom.xml - - - hazelcast-all - hazelcast-all - jar - - - - ${project.parent.basedir} - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - true - true - - false - true - true - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - shade-artifacts - - shade - - - hazelcast-all - true - false - true - - - com.hazelcast:*:* - - - com.hazelcast:hazelcast-all:* - - - - - ${hazelcast.serverMainClass} - - - sun.misc;resolution:=optional, - org.hibernate.*;resolution:=optional, - org.springframework.*;resolution:=optional, - javax.servlet.*;resolution:=optional, - javax.security.*;resolution:=optional, - javax.crypto.*;resolution:=optional, - sun.misc;resolution:=optional - org.slf4j.*;resolution:=optional, - org.apache.log4j.*;resolution:=optional, - org.apache.logging.log4j;resolution:=optional, - org.apache.logging.log4j.*;resolution:=optional, - org.apache.commons.logging;resolution:=optional, - javax.script.*;resolution:=optional, - org.jclouds.*;resolution:=optional, - javax.naming.*;resolution:=optional - - - - Hazelcast(All) - - - - - - - - - *:* - - META-INF/MANIFEST.MF - - - - com.hazelcast:hazelcast-aws - - hazelcast-community-license.txt - - - - - - - - - com.hazelcast - hazelcast-build-utils - ${project.version} - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - - - - - - - - com.hazelcast - hazelcast - ${project.version} - - - com.hazelcast - hazelcast-hibernate53 - 2.1.1 - - - com.hazelcast - hazelcast-spring - ${project.version} - - - com.hazelcast - hazelcast-sql - ${project.version} - - - com.hazelcast - hazelcast-wm - 4.0 - - - com.hazelcast - hazelcast - test - ${project.parent.version} - tests - - - org.apache.felix - org.apache.felix.utils - ${felix.utils.version} - test - - - diff --git a/hazelcast-all/src/main/assemble/src.xml b/hazelcast-all/src/main/assemble/src.xml deleted file mode 100644 index 1dbf982a9df9..000000000000 --- a/hazelcast-all/src/main/assemble/src.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - sources - false - - jar - - - - ${project.build.directory}/sources - / - true - - - diff --git a/hazelcast-all/src/main/java/com/hazelcast/PlaceHolder.java b/hazelcast-all/src/main/java/com/hazelcast/PlaceHolder.java deleted file mode 100644 index b3b40aa25259..000000000000 --- a/hazelcast-all/src/main/java/com/hazelcast/PlaceHolder.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2008-2021, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -package com.hazelcast; - -/** - * @author mdogan 6/5/13 - */ -public class PlaceHolder { -} diff --git a/hazelcast-all/src/main/java/com/hazelcast/package-info.java b/hazelcast-all/src/main/java/com/hazelcast/package-info.java deleted file mode 100644 index 4f2325518d11..000000000000 --- a/hazelcast-all/src/main/java/com/hazelcast/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2008-2021, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/** - * This package contains PlaceHolder - */ -package com.hazelcast; diff --git a/hazelcast-all/src/test/java/com/hazelcast/it/CheckAllDependenciesIT.java b/hazelcast-all/src/test/java/com/hazelcast/it/CheckAllDependenciesIT.java deleted file mode 100644 index 66e7225f99fe..000000000000 --- a/hazelcast-all/src/test/java/com/hazelcast/it/CheckAllDependenciesIT.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2008-2021, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -package com.hazelcast.it; - -import com.hazelcast.osgi.CheckDependenciesIT; - -public class CheckAllDependenciesIT extends CheckDependenciesIT { - - @Override - protected boolean isMatching(String urlString) { - return urlString.contains("hazelcast-all-") && urlString.contains("target"); - } - - @Override - protected String getBundleName() { - return "Hazelcast(All)"; - } - -} diff --git a/hazelcast-all/src/test/java/com/hazelcast/it/CheckAllNoticeFileIT.java b/hazelcast-all/src/test/java/com/hazelcast/it/CheckAllNoticeFileIT.java deleted file mode 100644 index ad8301ec34da..000000000000 --- a/hazelcast-all/src/test/java/com/hazelcast/it/CheckAllNoticeFileIT.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2008-2021, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -package com.hazelcast.it; - -public class CheckAllNoticeFileIT extends CheckNoticeFileIT { -} diff --git a/hazelcast-all/src/test/java/com/hazelcast/it/DependencyReducedPomAllIT.java b/hazelcast-all/src/test/java/com/hazelcast/it/DependencyReducedPomAllIT.java deleted file mode 100644 index 17ffb27e49a3..000000000000 --- a/hazelcast-all/src/test/java/com/hazelcast/it/DependencyReducedPomAllIT.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2008-2021, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -package com.hazelcast.it; - -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; - -import com.hazelcast.test.HazelcastParallelClassRunner; -import com.hazelcast.test.annotation.QuickTest; - -@RunWith(HazelcastParallelClassRunner.class) -@Category(QuickTest.class) -public class DependencyReducedPomAllIT extends DependencyReducedPomIT { -} diff --git a/hazelcast-build-utils/src/main/java/com/hazelcast/buildutils/HazelcastManifestTransformer.java b/hazelcast-build-utils/src/main/java/com/hazelcast/buildutils/HazelcastManifestTransformer.java index b4d775efb39d..8ce1bce79be1 100644 --- a/hazelcast-build-utils/src/main/java/com/hazelcast/buildutils/HazelcastManifestTransformer.java +++ b/hazelcast-build-utils/src/main/java/com/hazelcast/buildutils/HazelcastManifestTransformer.java @@ -211,7 +211,7 @@ public void modifyOutputStream(JarOutputStream jarOutputStream) throws IOExcepti } } - // the Manifest in hazelcast-all uberjar won't have the Automatic-Module-Name + // the Manifest in hazelcast uberjar won't have the Automatic-Module-Name attributes.remove(AUTOMATIC_MODULE_NAME); jarOutputStream.putNextEntry(new JarEntry(JarFile.MANIFEST_NAME)); diff --git a/pom.xml b/pom.xml index c6f53752b3e5..9db8c6006e93 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,6 @@ hazelcast-spring-tests hazelcast-build-utils hazelcast-sql - hazelcast-all @@ -975,9 +974,6 @@ - - hazelcast-all - @@ -986,9 +982,6 @@ true - - hazelcast-all - @@ -1012,13 +1005,6 @@ - - zip - - hazelcast-all - - - nightly-build