Skip to content

Commit 1d35ff5

Browse files
viniciusamviniciusam
authored
Merge pull request #36 from utPLSQL/feature/project-structure
Feature/project structure
2 parents 2a0db26 + 66f35c9 commit 1d35ff5

File tree

80 files changed

+572
-652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+572
-652
lines changed

Diff for: ‎.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ install:
4040
- bash .travis/install_demo_owner_project.sh
4141

4242
script:
43-
- echo "Run Unit tests"
43+
- echo "Run Unit Tests"
4444
- mvn org.jacoco:jacoco-maven-plugin:prepare-agent test
45-
- echo "Run Integration tests"
46-
- mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify -Dmaven.skip.test -DdbUser="${DB_UT3_USER}" -DdbPass="${DB_UT3_PASS}" -DdbUrl="jdbc:oracle:thin:@${DB_URL}"
45+
- echo "Run Integration Tests"
46+
- mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify -Pintegration -DdbUser="${DB_UT3_USER}" -DdbPass="${DB_UT3_PASS}" -DdbUrl="jdbc:oracle:thin:@${DB_URL}"
4747
- mvn sonar:sonar
4848

4949
before_deploy:

Diff for: ‎.travis/deploy_release.sh

-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ set -ev
44
VERSION=$(tr -d "/v/" <<<${TRAVIS_TAG})
55
mvn org.codehaus.mojo:versions-maven-plugin:2.7:set -DnewVersion=${VERSION}
66

7-
cd utplsql-maven-plugin
87
mvn deploy -DskipTests -U -Prelease

Diff for: ‎.travis/deploy_snapshot.sh

-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ set -ev
99
#echo "Changing snapshot version, OLD: ${OLD_VERSION} NEW: ${VERSION}"
1010
#mvn org.codehaus.mojo:versions-maven-plugin:2.7:set -DnewVersion=${VERSION}
1111

12-
cd utplsql-maven-plugin
1312
mvn deploy -DskipTests -U -Prelease

Diff for: ‎.travis/install_demo_owner_project.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -ev
33

4-
PROJECT_FILES_SRC="utplsql-maven-plugin-it/src/it/resources/owner-param-project"
4+
PROJECT_FILES_SRC="src/it/resources/owner-param-project"
55
PROJECT_FILES="resources-owner"
66
DB_CODE_USER=CODE_OWNER
77
DB_TESTS_USER=TESTS_OWNER

Diff for: ‎.travis/install_demo_project.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -ev
33

4-
PROJECT_FILES_SRC="utplsql-maven-plugin-it/src/it/resources/simple-project"
4+
PROJECT_FILES_SRC="src/it/resources/simple-project"
55
PROJECT_FILES="resources"
66
DB_USER=app
77
DB_PASS=app

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[![Build status](https://travis-ci.org/utPLSQL/utPLSQL-maven-plugin.svg?branch=develop)](https://travis-ci.org/utPLSQL/utPLSQL-maven-plugin)
2-
[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=org.utplsql%3Autplsql-maven-plugin-parent&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.utplsql%3Autplsql-maven-plugin-parent)
2+
[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=org.utplsql%3Autplsql-maven-plugin&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.utplsql%3Autplsql-maven-plugin)
33

44
# utPLSQL-maven-plugin
55
* A maven plugin for running Unit Tests with utPLSQL v3+.

Diff for: ‎nil

Whitespace-only changes.

Diff for: ‎pom.xml

+315-8
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,328 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>org.utplsql</groupId>
7-
<artifactId>utplsql-maven-plugin-parent</artifactId>
7+
<artifactId>utplsql-maven-plugin</artifactId>
88
<version>3.1.0-SNAPSHOT</version>
9-
<packaging>pom</packaging>
10-
11-
<name>utplsql-maven-plugin Parent</name>
9+
<packaging>maven-plugin</packaging>
1210

11+
<name>utPLSQL Maven Plugin</name>
12+
<description>A maven plugin for running Unit Tests with utPLSQL v3+.</description>
1313
<url>https://github.com/utPLSQL/utPLSQL-maven-plugin</url>
1414

15+
<licenses>
16+
<license>
17+
<name>Apache License, Version 2.0</name>
18+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
19+
<distribution>repo</distribution>
20+
</license>
21+
</licenses>
22+
23+
<developers>
24+
<developer>
25+
<name>Vinicius Avellar Moreira</name>
26+
<organization>utPLSQL.org</organization>
27+
<organizationUrl>http://utplsql.org</organizationUrl>
28+
</developer>
29+
</developers>
30+
31+
<scm>
32+
<connection>scm:git:https://github.com/utPLSQL/utPLSQL-maven-plugin.git</connection>
33+
<url>https://github.com/utPLSQL/utPLSQL-maven-plugin</url>
34+
</scm>
35+
36+
<distributionManagement>
37+
<snapshotRepository>
38+
<id>ossrh</id>
39+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
40+
</snapshotRepository>
41+
<repository>
42+
<id>ossrh</id>
43+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
44+
</repository>
45+
</distributionManagement>
46+
1547
<properties>
1648
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1749
<maven.version>3.5.0</maven.version>
50+
<java.version>1.8</java.version>
51+
<powermock.version>1.7.4</powermock.version>
1852
</properties>
1953

20-
<modules>
21-
<module>utplsql-maven-plugin</module>
22-
<module>utplsql-maven-plugin-it</module>
23-
</modules>
54+
<dependencies>
55+
<dependency>
56+
<groupId>org.utplsql</groupId>
57+
<artifactId>java-api</artifactId>
58+
<version>3.1.1</version>
59+
</dependency>
60+
61+
<dependency>
62+
<groupId>org.apache.maven</groupId>
63+
<artifactId>maven-core</artifactId>
64+
<version>3.5.2</version>
65+
</dependency>
66+
67+
<dependency>
68+
<groupId>org.apache.maven</groupId>
69+
<artifactId>maven-model</artifactId>
70+
<version>3.0.2</version>
71+
</dependency>
72+
73+
<dependency>
74+
<groupId>org.apache.maven</groupId>
75+
<artifactId>maven-plugin-api</artifactId>
76+
<version>3.5.2</version>
77+
</dependency>
78+
79+
<dependency>
80+
<groupId>org.codehaus.plexus</groupId>
81+
<artifactId>plexus-utils</artifactId>
82+
<version>3.0.8</version>
83+
</dependency>
84+
85+
<dependency>
86+
<groupId>org.apache.maven.plugin-tools</groupId>
87+
<artifactId>maven-plugin-annotations</artifactId>
88+
<version>3.5</version>
89+
<scope>provided</scope>
90+
</dependency>
91+
92+
<!-- Test Dependencies -->
93+
<dependency>
94+
<groupId>org.apache.maven</groupId>
95+
<artifactId>maven-compat</artifactId>
96+
<version>3.5.2</version>
97+
<scope>test</scope>
98+
</dependency>
99+
100+
<dependency>
101+
<groupId>org.powermock</groupId>
102+
<artifactId>powermock-module-junit4</artifactId>
103+
<version>${powermock.version}</version>
104+
<scope>test</scope>
105+
</dependency>
106+
107+
<dependency>
108+
<groupId>org.powermock</groupId>
109+
<artifactId>powermock-api-mockito2</artifactId>
110+
<version>${powermock.version}</version>
111+
<scope>test</scope>
112+
</dependency>
113+
114+
<dependency>
115+
<groupId>org.apache.maven.plugin-testing</groupId>
116+
<artifactId>maven-plugin-testing-harness</artifactId>
117+
<version>3.3.0</version>
118+
<scope>test</scope>
119+
</dependency>
120+
121+
<dependency>
122+
<groupId>org.assertj</groupId>
123+
<artifactId>assertj-core</artifactId>
124+
<version>3.8.0</version>
125+
<scope>test</scope>
126+
</dependency>
127+
128+
<dependency>
129+
<groupId>junit</groupId>
130+
<artifactId>junit</artifactId>
131+
<version>4.12</version>
132+
<scope>test</scope>
133+
</dependency>
134+
</dependencies>
135+
136+
<build>
137+
<plugins>
138+
<plugin>
139+
<groupId>org.apache.maven.plugins</groupId>
140+
<artifactId>maven-compiler-plugin</artifactId>
141+
<version>3.7.0</version>
142+
<configuration>
143+
<source>${java.version}</source>
144+
<target>${java.version}</target>
145+
<encoding>${project.build.sourceEncoding}</encoding>
146+
</configuration>
147+
</plugin>
148+
<plugin>
149+
<groupId>org.apache.maven.plugins</groupId>
150+
<artifactId>maven-plugin-plugin</artifactId>
151+
<version>3.5</version>
152+
<configuration>
153+
<goalPrefix>utplsql</goalPrefix>
154+
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
155+
</configuration>
156+
<executions>
157+
<execution>
158+
<id>mojo-descriptor</id>
159+
<goals>
160+
<goal>descriptor</goal>
161+
</goals>
162+
</execution>
163+
<execution>
164+
<id>help-goal</id>
165+
<goals>
166+
<goal>helpmojo</goal>
167+
</goals>
168+
</execution>
169+
</executions>
170+
</plugin>
171+
<plugin>
172+
<groupId>org.apache.maven.plugins</groupId>
173+
<artifactId>maven-surefire-plugin</artifactId>
174+
<version>2.21.0</version>
175+
<configuration>
176+
<skipTests>${skip.unit.tests}</skipTests>
177+
</configuration>
178+
</plugin>
179+
</plugins>
180+
</build>
181+
182+
<profiles>
183+
<profile>
184+
<id>release</id>
185+
186+
<activation>
187+
<property>
188+
<name>release</name>
189+
</property>
190+
</activation>
191+
192+
<build>
193+
<plugins>
194+
<plugin>
195+
<groupId>org.apache.maven.plugins</groupId>
196+
<artifactId>maven-javadoc-plugin</artifactId>
197+
<executions>
198+
<execution>
199+
<id>attach-javadocs</id>
200+
<goals>
201+
<goal>jar</goal>
202+
</goals>
203+
</execution>
204+
</executions>
205+
</plugin>
206+
<plugin>
207+
<groupId>org.apache.maven.plugins</groupId>
208+
<artifactId>maven-source-plugin</artifactId>
209+
<version>3.0.1</version>
210+
<executions>
211+
<execution>
212+
<id>attach-sources</id>
213+
<phase>verify</phase>
214+
<goals>
215+
<goal>jar-no-fork</goal>
216+
</goals>
217+
</execution>
218+
</executions>
219+
</plugin>
220+
<plugin>
221+
<groupId>org.apache.maven.plugins</groupId>
222+
<artifactId>maven-gpg-plugin</artifactId>
223+
<version>1.6</version>
224+
<executions>
225+
<execution>
226+
<id>sign-artifacts</id>
227+
<phase>verify</phase>
228+
<goals>
229+
<goal>sign</goal>
230+
</goals>
231+
</execution>
232+
</executions>
233+
</plugin>
234+
</plugins>
235+
</build>
236+
</profile>
237+
238+
<profile>
239+
<id>integration</id>
240+
241+
<activation>
242+
<property>
243+
<name>integration</name>
244+
</property>
245+
</activation>
246+
247+
<properties>
248+
<skip.unit.tests>true</skip.unit.tests>
249+
</properties>
250+
251+
<dependencies>
252+
<dependency>
253+
<groupId>org.apache.maven.shared</groupId>
254+
<artifactId>maven-verifier</artifactId>
255+
<version>1.6</version>
256+
<scope>test</scope>
257+
</dependency>
258+
<dependency>
259+
<groupId>commons-io</groupId>
260+
<artifactId>commons-io</artifactId>
261+
<version>2.5</version>
262+
<scope>test</scope>
263+
</dependency>
264+
</dependencies>
265+
266+
<build>
267+
<plugins>
268+
<plugin>
269+
<groupId>org.codehaus.mojo</groupId>
270+
<artifactId>build-helper-maven-plugin</artifactId>
271+
<version>3.0.0</version>
272+
<executions>
273+
<execution>
274+
<id>add-it-source</id>
275+
<phase>generate-test-sources</phase>
276+
<goals>
277+
<goal>add-test-source</goal>
278+
</goals>
279+
<configuration>
280+
<sources>
281+
<directory>src/it/java</directory>
282+
</sources>
283+
</configuration>
284+
</execution>
285+
<execution>
286+
<id>add-it-resource</id>
287+
<phase>generate-resources</phase>
288+
<goals>
289+
<goal>add-test-resource</goal>
290+
</goals>
291+
<configuration>
292+
<resources>
293+
<resource>
294+
<directory>src/it/resources</directory>
295+
</resource>
296+
</resources>
297+
</configuration>
298+
</execution>
299+
</executions>
300+
</plugin>
301+
<plugin>
302+
<groupId>org.apache.maven.plugins</groupId>
303+
<artifactId>maven-failsafe-plugin</artifactId>
304+
<version>2.22.1</version>
305+
<executions>
306+
<execution>
307+
<goals>
308+
<goal>integration-test</goal>
309+
<goal>verify</goal>
310+
</goals>
311+
</execution>
312+
</executions>
313+
</plugin>
314+
</plugins>
315+
</build>
316+
</profile>
317+
</profiles>
318+
319+
<repositories>
320+
<repository>
321+
<id>utplsql-java-api</id>
322+
<url>https://packagecloud.io/utplsql/utplsql-java-api/maven2</url>
323+
<releases>
324+
<enabled>true</enabled>
325+
</releases>
326+
<snapshots>
327+
<enabled>true</enabled>
328+
</snapshots>
329+
</repository>
330+
</repositories>
24331
</project>

0 commit comments

Comments
 (0)