Skip to content

Commit

Permalink
[RELEASE]merging 'release-1.2' into 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@drferreira
drferreira committed Oct 26, 2018
1 parent 64d82b0 commit 3b45399
Show file tree
Hide file tree
Showing 13 changed files with 560 additions and 303 deletions.
42 changes: 42 additions & 0 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
pipeline {
agent any
tools {
maven 'maven 3.5.0'
jdk 'Java8'
}

stages {
stage('Build Aplication') {
steps {
sh 'mvn -f otus-domain-root/pom.xml clean install'
}
post {
always {
junit '**/target/surefire-reports/*.xml'
archive '**/target/surefire-reports/*.xml'
}
}
}

stage('Publish artifact') {
steps {
sh 'mvn -f otus-domain-root/pom.xml deploy'
}
}

stage('Sonar Update') {
steps {
sh 'mvn -f otus-domain-root/pom.xml sonar:sonar -Dsonar.host.url=${URL_SONAR} -Dsonar.password=${PWD_SONAR} -Dsonar.login=${USER_SONAR}'
}
}

stage('Build - Development Server') {
steps {
echo "DEPLOY"
// sh 'mvn -f otus-domain-root/pom.xml clean install -Ddatabase.host=${DATABASE_DEV_HOST} -Ddatabase.username=${DATABASE_USER} -Ddatabase.password=${DATABASE_PWD}'
}
}

}

}
33 changes: 20 additions & 13 deletions otus-domain-business/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,49 @@
<parent>
<groupId>org.ccem.domain</groupId>
<artifactId>otus-domain-root</artifactId>
<version>1.1</version>
<version>1.2</version>
<relativePath>../otus-domain-root/pom.xml</relativePath>
</parent>

<dependencies>
<!-- Internal dependencies !-->
<dependency>
<groupId>org.ccem.domain</groupId>
<artifactId>otus-domain-persistence</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ccem.owail</groupId>
<artifactId>owail-sender</artifactId>
<version>${owail.sender.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ccem.rep-tool</groupId>
<artifactId>studio-repository-tool</artifactId>
<version>${studio.repository.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>br.org.tutty</groupId>
<artifactId>equalizer</artifactId>
<version>${equalize.version}</version>
<scope>provided</scope>
</dependency>

<!-- External dependencies !-->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.ccem.owail</groupId>
<artifactId>owail-sender</artifactId>
<version>${owail.sender.version}</version>
</dependency>
<dependency>
<groupId>org.ccem.rep-tool</groupId>
<artifactId>studio-repository-tool</artifactId>
<version>1.0-SNAPSHOT</version>
<version>${commons.io.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>4.18</version>
<version>${nimbusds.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
12 changes: 5 additions & 7 deletions otus-domain-business/src/main/resources/META-INF/beans.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
bean-discovery-mode="all">
</beans>
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
version="2.0" bean-discovery-mode="all">
</beans>
49 changes: 43 additions & 6 deletions otus-domain-ear/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.ccem.domain</groupId>
<artifactId>otus-domain-root</artifactId>
<version>1.1</version>
<version>1.2</version>
<relativePath>../otus-domain-root/pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -61,6 +61,7 @@
</build>

<dependencies>
<!-- Modules !-->
<dependency>
<groupId>org.ccem.domain</groupId>
<artifactId>otus-domain-business</artifactId>
Expand All @@ -79,20 +80,56 @@
<version>${project.parent.version}</version>
<type>war</type>
</dependency>

<!-- Internal dependencies !-->
<dependency>
<groupId>br.org.tutty</groupId>
<artifactId>equalizer</artifactId>
<version>${equalize.version}</version>
</dependency>
<dependency>
<groupId>org.ccem.owail</groupId>
<artifactId>owail-sender</artifactId>
<version>${owail.sender.version}</version>
</dependency>
<dependency>
<groupId>org.ccem.rep-tool</groupId>
<artifactId>studio-repository-tool</artifactId>
<version>${studio.repository.version}</version>
</dependency>

<!-- Hibernate !-->
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
<version>${hibernate.jpa.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-core</artifactId>
<version>5.0.0.Final</version>
<version>${hibernate.core.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-mongodb</artifactId>
<version>5.0.0.Final</version>
<version>${hibernate.mongodb.version}</version>
</dependency>

<!-- External dependencies !-->
<dependency>
<groupId>br.org.tutty</groupId>
<artifactId>equalizer</artifactId>
<version>${equalize.version}</version>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>${nimbusds.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
</dependencies>
</project>
33 changes: 22 additions & 11 deletions otus-domain-persistence/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.ccem.domain</groupId>
<artifactId>otus-domain-root</artifactId>
<version>1.1</version>
<version>1.2</version>
<relativePath>../otus-domain-root/pom.xml</relativePath>
</parent>

Expand All @@ -19,34 +19,45 @@
</properties>

<dependencies>
<!-- Internal dependencies !-->
<dependency>
<groupId>br.org.tutty</groupId>
<artifactId>equalizer</artifactId>
<version>${equalize.version}</version>
<scope>provided</scope>
</dependency>

<!-- Javax !-->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
<scope>provided</scope>
</dependency>

<!-- Hibernate !-->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.2.0.Final</version>
<version>${hibernate.core.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
<version>1.0.0.Final</version>
<version>${hibernate.jpa.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-mongodb</artifactId>
<version>5.0.0.Final</version>
<version>${hibernate.mongodb.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-core</artifactId>
<version>5.0.0.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>br.org.tutty</groupId>
<artifactId>equalizer</artifactId>
<version>${equalize.version}</version>
<version>${hibernate.core.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
12 changes: 5 additions & 7 deletions otus-domain-persistence/src/main/resources/META-INF/beans.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
bean-discovery-mode="all">
</beans>
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
version="2.0" bean-discovery-mode="all">
</beans>
32 changes: 7 additions & 25 deletions otus-domain-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,44 +6,26 @@
<parent>
<groupId>org.ccem.domain</groupId>
<artifactId>otus-domain-root</artifactId>
<version>1.1</version>
<version>1.2</version>
<relativePath>../otus-domain-root/pom.xml</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>3.0.13.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<version>3.0.12.Final</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency>
<!-- Internal dependencies !-->
<dependency>
<groupId>org.ccem.domain</groupId>
<artifactId>otus-domain-business</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-cdi</artifactId>
<version>3.0.13.Final</version>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
<scope>provided</scope>
</dependency>

<!-- Unit Tests !-->
<dependency>
<groupId>org.ccem.domain</groupId>
<artifactId>otus-domain-persistence</artifactId>
Expand Down
Loading

0 comments on commit 3b45399

Please sign in to comment.