Skip to content

Commit 76ec0cd

Browse files
simaschsimasch
committed
Merge branch 'feature/3.2.0' into develop
2 parents 70b3fab + c6f9616 commit 76ec0cd

File tree

43 files changed

+62
-139
lines changed

Some content is hidden

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

43 files changed

+62
-139
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ install:
3333
- bash .travis/install_demo_project.sh
3434

3535
script:
36-
- echo "Run Unit Tests"
37-
- mvn org.jacoco:jacoco-maven-plugin:prepare-agent test
38-
- echo "Run Integration Tests"
36+
- echo "Run Verify with Coverage"
3937
- mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify -Pintegration -DdbUser="${DB_UT3_USER}" -DdbPass="${DB_UT3_PASS}" -DdbUrl="jdbc:oracle:thin:@${DB_URL}"
4038

4139
before_deploy:
@@ -54,7 +52,7 @@ deploy:
5452
script: bash .travis/deploy_release.sh
5553
on:
5654
repo: utPLSQL/utPLSQL-maven-plugin
57-
tags: true
55+
branch: main
5856

5957
notifications:
6058
slack:

‎.travis/sql/create_app_objects.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
whenever sqlerror exit failure rollback
22
whenever oserror exit failure rollback
33

4-
@src/it/resources/simple-project/scripts/sources/TO_TEST_ME.tab
5-
@src/it/resources/simple-project/scripts/sources/APP.PKG_TEST_ME.spc
6-
@src/it/resources/simple-project/scripts/sources/APP.PKG_TEST_ME.bdy
4+
@src/test/resources/simple-project/scripts/sources/TO_TEST_ME.tab
5+
@src/test/resources/simple-project/scripts/sources/APP.PKG_TEST_ME.spc
6+
@src/test/resources/simple-project/scripts/sources/APP.PKG_TEST_ME.bdy
77

8-
@src/it/resources/simple-project/scripts/tests/APP.TEST_PKG_TEST_ME.spc
9-
@src/it/resources/simple-project/scripts/tests/APP.TEST_PKG_TEST_ME.bdy
8+
@src/test/resources/simple-project/scripts/tests/APP.TEST_PKG_TEST_ME.spc
9+
@src/test/resources/simple-project/scripts/tests/APP.TEST_PKG_TEST_ME.bdy

‎.travis/sql/create_source_owner_objects.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
whenever sqlerror exit failure rollback
22
whenever oserror exit failure rollback
33

4-
@src/it/resources/owner-param-project/scripts/sources/foo/tables/TO_TEST_ME.tab
5-
@src/it/resources/owner-param-project/scripts/sources/foo/packages/PKG_TEST_ME.sql
6-
@src/it/resources/owner-param-project/scripts/sources/foo/package_bodies/PKG_TEST_ME.sql
4+
@src/test/resources/owner-param-project/scripts/sources/foo/tables/TO_TEST_ME.tab
5+
@src/test/resources/owner-param-project/scripts/sources/foo/packages/PKG_TEST_ME.sql
6+
@src/test/resources/owner-param-project/scripts/sources/foo/package_bodies/PKG_TEST_ME.sql

‎.travis/sql/create_tests_owner_objects.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ whenever oserror exit failure rollback
33

44
create synonym TO_TEST_ME for CODE_OWNER.TO_TEST_ME;
55
create synonym PKG_TEST_ME for CODE_OWNER.PKG_TEST_ME;
6-
@src/it/resources/owner-param-project/scripts/test/bar/packages/TEST_PKG_TEST_ME.sql
7-
@src/it/resources/owner-param-project/scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.sql
6+
@src/test/resources/owner-param-project/scripts/test/bar/packages/TEST_PKG_TEST_ME.sql
7+
@src/test/resources/owner-param-project/scripts/test/bar/package_bodies/TEST_PKG_TEST_ME.sql

‎pom.xml‎

Lines changed: 40 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>org.utplsql</groupId>
77
<artifactId>utplsql-maven-plugin</artifactId>
8-
<version>3.1.3-SNAPSHOT</version>
8+
<version>3.2.0-SNAPSHOT</version>
99
<packaging>maven-plugin</packaging>
1010

1111
<name>utPLSQL Maven Plugin</name>
@@ -26,6 +26,11 @@
2626
<organization>utPLSQL.org</organization>
2727
<organizationUrl>http://utplsql.org</organizationUrl>
2828
</developer>
29+
<developer>
30+
<name>Simon Martinelli</name>
31+
<organization>utPLSQL.org</organization>
32+
<organizationUrl>http://utplsql.org</organizationUrl>
33+
</developer>
2934
</developers>
3035

3136
<scm>
@@ -45,19 +50,19 @@
4550
</distributionManagement>
4651

4752
<properties>
53+
<maven.compiler.target>1.8</maven.compiler.target>
54+
<maven.compiler.source>1.8</maven.compiler.source>
4855
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4956
<maven.version>3.5.2</maven.version>
50-
<java.version>1.8</java.version>
51-
<powermock.version>2.0.0-beta.5</powermock.version>
52-
<ojdbc.version>19.3.0.0</ojdbc.version>
57+
<powermock.version>2.0.9</powermock.version>
5358
<jaxb.version>2.3.1</jaxb.version>
5459
</properties>
5560

5661
<dependencies>
5762
<dependency>
5863
<groupId>com.sun.xml.bind</groupId>
5964
<artifactId>jaxb-core</artifactId>
60-
<version>2.3.0.1</version>
65+
<version>3.0.1</version>
6166
</dependency>
6267

6368
<dependency>
@@ -73,15 +78,9 @@
7378
</dependency>
7479

7580
<dependency>
76-
<groupId>com.oracle.ojdbc</groupId>
81+
<groupId>com.oracle.database.jdbc</groupId>
7782
<artifactId>ojdbc8</artifactId>
78-
<version>${ojdbc.version}</version>
79-
</dependency>
80-
81-
<dependency>
82-
<groupId>com.oracle.ojdbc</groupId>
83-
<artifactId>orai18n</artifactId>
84-
<version>${ojdbc.version}</version>
83+
<version>21.3.0.0</version>
8584
</dependency>
8685

8786
<dependency>
@@ -118,7 +117,7 @@
118117
<dependency>
119118
<groupId>org.codehaus.plexus</groupId>
120119
<artifactId>plexus-utils</artifactId>
121-
<version>3.3.0</version>
120+
<version>3.4.1</version>
122121
</dependency>
123122

124123
<!-- Test Dependencies -->
@@ -153,14 +152,27 @@
153152
<dependency>
154153
<groupId>org.assertj</groupId>
155154
<artifactId>assertj-core</artifactId>
156-
<version>3.15.0</version>
155+
<version>3.21.0</version>
157156
<scope>test</scope>
158157
</dependency>
159158

160159
<dependency>
161160
<groupId>junit</groupId>
162161
<artifactId>junit</artifactId>
163-
<version>4.13</version>
162+
<version>4.13.2</version>
163+
<scope>test</scope>
164+
</dependency>
165+
166+
<dependency>
167+
<groupId>org.apache.maven.shared</groupId>
168+
<artifactId>maven-verifier</artifactId>
169+
<version>1.6</version>
170+
<scope>test</scope>
171+
</dependency>
172+
<dependency>
173+
<groupId>commons-io</groupId>
174+
<artifactId>commons-io</artifactId>
175+
<version>2.6</version>
164176
<scope>test</scope>
165177
</dependency>
166178
</dependencies>
@@ -169,13 +181,16 @@
169181
<plugins>
170182
<plugin>
171183
<groupId>org.apache.maven.plugins</groupId>
172-
<artifactId>maven-compiler-plugin</artifactId>
173-
<version>3.8.1</version>
174-
<configuration>
175-
<source>${java.version}</source>
176-
<target>${java.version}</target>
177-
<encoding>${project.build.sourceEncoding}</encoding>
178-
</configuration>
184+
<artifactId>maven-failsafe-plugin</artifactId>
185+
<version>2.22.2</version>
186+
<executions>
187+
<execution>
188+
<goals>
189+
<goal>integration-test</goal>
190+
<goal>verify</goal>
191+
</goals>
192+
</execution>
193+
</executions>
179194
</plugin>
180195
<plugin>
181196
<groupId>org.apache.maven.plugins</groupId>
@@ -220,14 +235,6 @@
220235
</execution>
221236
</executions>
222237
</plugin>
223-
<plugin>
224-
<groupId>org.apache.maven.plugins</groupId>
225-
<artifactId>maven-surefire-plugin</artifactId>
226-
<version>2.21.0</version>
227-
<configuration>
228-
<skipTests>${skip.unit.tests}</skipTests>
229-
</configuration>
230-
</plugin>
231238
<plugin>
232239
<groupId>com.amashchenko.maven.plugin</groupId>
233240
<artifactId>gitflow-maven-plugin</artifactId>
@@ -239,13 +246,11 @@
239246
<profiles>
240247
<profile>
241248
<id>release</id>
242-
243249
<activation>
244250
<property>
245251
<name>release</name>
246252
</property>
247253
</activation>
248-
249254
<build>
250255
<plugins>
251256
<plugin>
@@ -292,86 +297,6 @@
292297
</plugins>
293298
</build>
294299
</profile>
295-
296-
<profile>
297-
<id>integration</id>
298-
299-
<activation>
300-
<property>
301-
<name>integration</name>
302-
</property>
303-
</activation>
304-
305-
<properties>
306-
<skip.unit.tests>true</skip.unit.tests>
307-
</properties>
308-
309-
<dependencies>
310-
<dependency>
311-
<groupId>org.apache.maven.shared</groupId>
312-
<artifactId>maven-verifier</artifactId>
313-
<version>1.6</version>
314-
<scope>test</scope>
315-
</dependency>
316-
<dependency>
317-
<groupId>commons-io</groupId>
318-
<artifactId>commons-io</artifactId>
319-
<version>2.6</version>
320-
<scope>test</scope>
321-
</dependency>
322-
</dependencies>
323-
324-
<build>
325-
<plugins>
326-
<plugin>
327-
<groupId>org.codehaus.mojo</groupId>
328-
<artifactId>build-helper-maven-plugin</artifactId>
329-
<version>3.0.0</version>
330-
<executions>
331-
<execution>
332-
<id>add-it-source</id>
333-
<phase>generate-test-sources</phase>
334-
<goals>
335-
<goal>add-test-source</goal>
336-
</goals>
337-
<configuration>
338-
<sources>
339-
<directory>src/it/java</directory>
340-
</sources>
341-
</configuration>
342-
</execution>
343-
<execution>
344-
<id>add-it-resource</id>
345-
<phase>generate-resources</phase>
346-
<goals>
347-
<goal>add-test-resource</goal>
348-
</goals>
349-
<configuration>
350-
<resources>
351-
<resource>
352-
<directory>src/it/resources</directory>
353-
</resource>
354-
</resources>
355-
</configuration>
356-
</execution>
357-
</executions>
358-
</plugin>
359-
<plugin>
360-
<groupId>org.apache.maven.plugins</groupId>
361-
<artifactId>maven-failsafe-plugin</artifactId>
362-
<version>2.22.2</version>
363-
<executions>
364-
<execution>
365-
<goals>
366-
<goal>integration-test</goal>
367-
<goal>verify</goal>
368-
</goals>
369-
</execution>
370-
</executions>
371-
</plugin>
372-
</plugins>
373-
</build>
374-
</profile>
375300
</profiles>
376301

377302
<repositories>

‎src/it/java/org/utpsql/maven/plugin/test/UtPLSQLMojoIT.java‎ renamed to ‎src/test/java/org/utplsql/maven/plugin/test/UtPLSQLMojoIT.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
package org.utpsql.maven.plugin.test;
2-
3-
import java.io.File;
4-
import java.io.FileReader;
5-
import java.io.IOException;
6-
import java.nio.file.Files;
7-
import java.nio.file.Paths;
8-
import java.util.stream.Collectors;
9-
import java.util.stream.Stream;
1+
package org.utplsql.maven.plugin.test;
102

113
import org.apache.commons.io.FileUtils;
124
import org.apache.maven.it.VerificationException;
@@ -19,6 +11,14 @@
1911
import org.junit.BeforeClass;
2012
import org.junit.Test;
2113

14+
import java.io.File;
15+
import java.io.FileReader;
16+
import java.io.IOException;
17+
import java.nio.file.Files;
18+
import java.nio.file.Paths;
19+
import java.util.stream.Collectors;
20+
import java.util.stream.Stream;
21+
2222
public class UtPLSQLMojoIT {
2323

2424
private static String pluginVersion = null;
@@ -32,7 +32,7 @@ public static void setUp() throws VerificationException, IOException, XmlPullPar
3232

3333
// Install Plugin
3434
verifier.setAutoclean(false);
35-
verifier.addCliOption("-Dmaven.test.skip=true");
35+
verifier.addCliOption("-DskipTests");
3636
verifier.executeGoal("install");
3737

3838
pluginVersion = model.getVersion();

‎src/it/resources/minimalist-project/pom.xml‎ renamed to ‎src/test/resources/minimalist-project/pom.xml‎

File renamed without changes.

‎src/it/resources/owner-param-project/expected-output/utplsql/coverage-sonar-reporter.xml‎ renamed to ‎src/test/resources/owner-param-project/expected-output/utplsql/coverage-sonar-reporter.xml‎

File renamed without changes.

‎src/it/resources/owner-param-project/expected-output/utplsql/sonar-test-reporter.xml‎ renamed to ‎src/test/resources/owner-param-project/expected-output/utplsql/sonar-test-reporter.xml‎

File renamed without changes.

‎src/it/resources/owner-param-project/pom.xml‎ renamed to ‎src/test/resources/owner-param-project/pom.xml‎

File renamed without changes.

0 commit comments

Comments
 (0)