Docker push realized

petclinic-application/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.springframework.samples</groupId>
+        <groupId>ru.cicd.samples</groupId>
         <artifactId>spring-petclinic</artifactId>
         <version>2.0</version>
     </parent>

petclinic-application/src/main/java/ru/cicd/samples/petclinic/PetClinicApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic;
+package ru.cicd.samples.petclinic;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/BaseEntity.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.model;
+package ru.cicd.samples.petclinic.model;
 
 import java.io.Serializable;
 

petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/NamedEntity.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.model;
+package ru.cicd.samples.petclinic.model;
 
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/Person.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.model;
+package ru.cicd.samples.petclinic.model;
 
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/model/package-info.java

@@ -17,5 +17,5 @@
 /**
  * The classes in this package represent utilities used by the domain.
  */
-package org.springframework.samples.petclinic.model;
+package ru.cicd.samples.petclinic.model;
 

petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/Owner.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,7 +32,7 @@ import javax.validation.constraints.NotEmpty;
 import org.springframework.beans.support.MutableSortDefinition;
 import org.springframework.beans.support.PropertyComparator;
 import org.springframework.core.style.ToStringCreator;
-import org.springframework.samples.petclinic.model.Person;
+import ru.cicd.samples.petclinic.model.Person;
 
 /**
  * Simple JavaBean domain object representing an owner.

petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/OwnerController.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/OwnerRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import java.util.Collection;
 

petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/Pet.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
@@ -35,8 +35,8 @@ import javax.persistence.Table;
 import org.springframework.beans.support.MutableSortDefinition;
 import org.springframework.beans.support.PropertyComparator;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.samples.petclinic.model.NamedEntity;
-import org.springframework.samples.petclinic.visit.Visit;
+import ru.cicd.samples.petclinic.model.NamedEntity;
+import ru.cicd.samples.petclinic.visit.Visit;
 
 /**
  * Simple business object representing a pet.

petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetController.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import java.util.List;
 

petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetType.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import org.springframework.samples.petclinic.model.NamedEntity;
+import ru.cicd.samples.petclinic.model.NamedEntity;
 
 /**
  * @author Juergen Hoeller

petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetTypeFormatter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import java.text.ParseException;
 import java.util.Collection;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/PetValidator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import org.springframework.util.StringUtils;
 import org.springframework.validation.Errors;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/owner/VisitController.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
-import org.springframework.samples.petclinic.visit.Visit;
-import org.springframework.samples.petclinic.visit.VisitRepository;
+import ru.cicd.samples.petclinic.visit.Visit;
+import ru.cicd.samples.petclinic.visit.VisitRepository;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.WebDataBinder;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/system/CacheConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.system;
+package ru.cicd.samples.petclinic.system;
 
 import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer;
 import org.springframework.cache.annotation.EnableCaching;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/system/CrashController.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.system;
+package ru.cicd.samples.petclinic.system;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/system/WelcomeController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.system;
+package ru.cicd.samples.petclinic.system;
 
 
 import org.springframework.stereotype.Controller;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/Specialty.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.vet;
+package ru.cicd.samples.petclinic.vet;
 
 import java.io.Serializable;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import org.springframework.samples.petclinic.model.NamedEntity;
+import ru.cicd.samples.petclinic.model.NamedEntity;
 
 /**
  * Models a {@link Vet Vet's} specialty (for example, dentistry).

petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/Vet.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.vet;
+package ru.cicd.samples.petclinic.vet;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlElement;
 
 import org.springframework.beans.support.MutableSortDefinition;
 import org.springframework.beans.support.PropertyComparator;
-import org.springframework.samples.petclinic.model.Person;
+import ru.cicd.samples.petclinic.model.Person;
 
 /**
  * Simple JavaBean domain object representing a veterinarian.

petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/VetController.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.vet;
+package ru.cicd.samples.petclinic.vet;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/VetRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.vet;
+package ru.cicd.samples.petclinic.vet;
 
 import java.util.Collection;
 

petclinic-application/src/main/java/ru/cicd/samples/petclinic/vet/Vets.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.vet;
+package ru.cicd.samples.petclinic.vet;
 
 import java.util.ArrayList;
 import java.util.List;

petclinic-application/src/main/java/ru/cicd/samples/petclinic/visit/Visit.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.visit;
+package ru.cicd.samples.petclinic.visit;
 
 import java.time.LocalDate;
 
@@ -23,7 +23,7 @@ import javax.persistence.Table;
 import javax.validation.constraints.NotEmpty;
 
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.samples.petclinic.model.BaseEntity;
+import ru.cicd.samples.petclinic.model.BaseEntity;
 
 /**
  * Simple JavaBean domain object representing a visit.

petclinic-application/src/main/java/ru/cicd/samples/petclinic/visit/VisitRepository.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.visit;
+package ru.cicd.samples.petclinic.visit;
 
 import java.util.List;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.repository.Repository;
-import org.springframework.samples.petclinic.model.BaseEntity;
+import ru.cicd.samples.petclinic.model.BaseEntity;
 
 /**
  * Repository class for <code>Visit</code> domain objects All method names are compliant with Spring Data naming

petclinic-application/src/test/java/ru/cicd/samples/petclinic/PetclinicIntegrationTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic;
+package ru.cicd.samples.petclinic;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.samples.petclinic.vet.VetRepository;
+import ru.cicd.samples.petclinic.vet.VetRepository;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)

petclinic-application/src/test/java/ru/cicd/samples/petclinic/model/ValidatorTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.model;
+package ru.cicd.samples.petclinic.model;
 
 import java.util.Locale;
 import java.util.Set;

petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/OwnerControllerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import static org.hamcrest.Matchers.hasProperty;
 import static org.hamcrest.Matchers.is;
@@ -32,9 +32,6 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.samples.petclinic.owner.Owner;
-import org.springframework.samples.petclinic.owner.OwnerController;
-import org.springframework.samples.petclinic.owner.OwnerRepository;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 

petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/PetControllerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import static org.mockito.BDDMockito.given;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -32,13 +32,6 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
-import org.springframework.samples.petclinic.owner.Owner;
-import org.springframework.samples.petclinic.owner.OwnerRepository;
-import org.springframework.samples.petclinic.owner.Pet;
-import org.springframework.samples.petclinic.owner.PetController;
-import org.springframework.samples.petclinic.owner.PetRepository;
-import org.springframework.samples.petclinic.owner.PetType;
-import org.springframework.samples.petclinic.owner.PetTypeFormatter;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 

petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/PetTypeFormatterTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import java.text.ParseException;
 import java.util.ArrayList;

petclinic-application/src/test/java/ru/cicd/samples/petclinic/owner/VisitControllerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.owner;
+package ru.cicd.samples.petclinic.owner;
 
 import static org.mockito.BDDMockito.given;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -29,10 +29,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.samples.petclinic.owner.Pet;
-import org.springframework.samples.petclinic.owner.PetRepository;
-import org.springframework.samples.petclinic.owner.VisitController;
-import org.springframework.samples.petclinic.visit.VisitRepository;
+import ru.cicd.samples.petclinic.visit.VisitRepository;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 

petclinic-application/src/test/java/ru/cicd/samples/petclinic/service/ClinicServiceTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.service;
+package ru.cicd.samples.petclinic.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,15 +26,15 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.samples.petclinic.owner.Owner;
-import org.springframework.samples.petclinic.owner.OwnerRepository;
-import org.springframework.samples.petclinic.owner.Pet;
-import org.springframework.samples.petclinic.owner.PetRepository;
-import org.springframework.samples.petclinic.owner.PetType;
-import org.springframework.samples.petclinic.vet.Vet;
-import org.springframework.samples.petclinic.vet.VetRepository;
-import org.springframework.samples.petclinic.visit.Visit;
-import org.springframework.samples.petclinic.visit.VisitRepository;
+import ru.cicd.samples.petclinic.owner.Owner;
+import ru.cicd.samples.petclinic.owner.OwnerRepository;
+import ru.cicd.samples.petclinic.owner.Pet;
+import ru.cicd.samples.petclinic.owner.PetRepository;
+import ru.cicd.samples.petclinic.owner.PetType;
+import ru.cicd.samples.petclinic.vet.Vet;
+import ru.cicd.samples.petclinic.vet.VetRepository;
+import ru.cicd.samples.petclinic.visit.Visit;
+import ru.cicd.samples.petclinic.visit.VisitRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;

petclinic-application/src/test/java/ru/cicd/samples/petclinic/service/EntityUtils.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.service;
+package ru.cicd.samples.petclinic.service;
 
 import java.util.Collection;
 
 import org.springframework.orm.ObjectRetrievalFailureException;
-import org.springframework.samples.petclinic.model.BaseEntity;
+import ru.cicd.samples.petclinic.model.BaseEntity;
 
 /**
  * Utility methods for handling entities. Separate from the BaseEntity class mainly because of dependency on the
@@ -27,7 +27,7 @@ import org.springframework.samples.petclinic.model.BaseEntity;
  *
  * @author Juergen Hoeller
  * @author Sam Brannen
- * @see org.springframework.samples.petclinic.model.BaseEntity
+ * @see BaseEntity
  * @since 29.10.2003
  */
 public abstract class EntityUtils {

petclinic-application/src/test/java/ru/cicd/samples/petclinic/system/CrashControllerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.system;
+package ru.cicd.samples.petclinic.system;
 
 import org.junit.Ignore;
 import org.junit.Test;

petclinic-application/src/test/java/ru/cicd/samples/petclinic/vet/VetControllerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.vet;
+package ru.cicd.samples.petclinic.vet;
 
 import static org.mockito.BDDMockito.given;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;

petclinic-application/src/test/java/ru/cicd/samples/petclinic/vet/VetTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.vet;
+package ru.cicd.samples.petclinic.vet;
 
 import org.junit.Test;
 

petclinic-container/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.springframework.samples</groupId>
+        <groupId>ru.cicd.samples</groupId>
         <artifactId>spring-petclinic</artifactId>
         <version>2.0</version>
     </parent>
@@ -16,7 +16,7 @@
     <name>petclinic-containers</name>
     <profiles>
         <profile>
-            <id>docker-build</id>
+            <id>docker</id>
             <build>
                 <resources>
                     <resource>
@@ -61,7 +61,7 @@
                                 <configuration>
                                     <artifactItems>
                                         <artifactItem>
-                                            <groupId>org.springframework.samples</groupId>
+                                            <groupId>ru.cicd.samples</groupId>
                                             <artifactId>petclinic-application</artifactId>
                                             <version>${project.version}</version>
                                             <type>jar</type>
@@ -80,7 +80,7 @@
                         <version>${mojo-exec.version}</version>
                         <executions>
                             <execution>
-                                <id>docker-package</id>
+                                <id>build</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>exec</goal>
@@ -92,7 +92,21 @@
                                         <argument>build</argument>
                                         <argument>.</argument>
                                         <argument>-t</argument>
-                                        <argument>${project.groupId}/${project.artifactId}:${project.version}</argument>
+                                        <argument>${docker-registry}/${project.groupId}/${project.artifactId}:${project.version}</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>push</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>push</argument>
+                                        <argument>${docker-registry}/${project.groupId}/${project.artifactId}:${project.version}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -104,6 +118,3 @@
     </profiles>
 </project>
 
-    <!--
-    /target/context/{Dockerfile, jars, resurces}
-    -->

pom.xml

@@ -17,7 +17,7 @@
         </repository>
     </distributionManagement>
 
-    <groupId>org.springframework.samples</groupId>
+    <groupId>ru.cicd.samples</groupId>
     <artifactId>spring-petclinic</artifactId>
     <version>2.0</version>
     <name>petclinic-modular-parent</name>
@@ -46,6 +46,7 @@
         <deploy-plugin.version>2.8.1</deploy-plugin.version>
         <mojo-exec.version>1.6.0</mojo-exec.version>
         <resources-plugin.version>3.1.0</resources-plugin.version>
+        <docker-registry>registry.ci-cd.ru:16000</docker-registry>
     </properties>
 
     <repositories>