Skip to content

Commit 9fb0a5b

Browse files
viniciusamviniciusam
authored
Merge pull request #34 from utPLSQL/feature/prepare-release
Code linting, README update and build tasks
2 parents 08065ba + 407c481 commit 9fb0a5b

File tree

27 files changed

+2330
-2227
lines changed

27 files changed

+2330
-2227
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@ log/
1919
target/
2020
.mvn
2121
log.txt
22-
**/pom.xml.versionsBackup
22+
**/pom.xml.versionsBackup
23+
24+
# Docs
25+
doc/

‎.travis/settings.xml‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<!--
4-
Licensed to the Apache Software Foundation (ASF) under one
5-
or more contributor license agreements. See the NOTICE file
6-
distributed with this work for additional information
7-
regarding copyright ownership. The ASF licenses this file
8-
to you under the Apache License, Version 2.0 (the
9-
"License"); you may not use this file except in compliance
10-
with the License. You may obtain a copy of the License at
11-
12-
http://www.apache.org/licenses/LICENSE-2.0
13-
14-
Unless required by applicable law or agreed to in writing,
15-
software distributed under the License is distributed on an
16-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17-
KIND, either express or implied. See the License for the
18-
specific language governing permissions and limitations
19-
under the License.
20-
-->
21-
222
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
23-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24-
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
5+
6+
<profiles>
7+
<profile>
8+
<id>ossrh</id>
9+
<activation>
10+
<activeByDefault>true</activeByDefault>
11+
</activation>
12+
<properties>
13+
<gpg.executable>${env.GPG_EXECUTABLE}</gpg.executable>
14+
<gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
15+
</properties>
16+
</profile>
17+
</profiles>
2518

2619
<servers>
20+
<server>
21+
<id>ossrh</id>
22+
<username>${env.SONATYPE_USERNAME}</username>
23+
<password>${env.SONATYPE_PASSWORD}</password>
24+
</server>
2725
<server>
2826
<id>maven.oracle.com</id>
2927
<username>${env.ORACLE_OTN_USER}</username>

‎README.md‎

Lines changed: 181 additions & 141 deletions
Large diffs are not rendered by default.

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<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">
34
<modelVersion>4.0.0</modelVersion>
45

56
<groupId>org.utplsql</groupId>
@@ -20,5 +21,4 @@
2021
<module>utplsql-maven-plugin</module>
2122
<module>utplsql-maven-plugin-it</module>
2223
</modules>
23-
2424
</project>

‎utplsql-maven-plugin-it/pom.xml‎

Lines changed: 128 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,135 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
1+
<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">
4+
<modelVersion>4.0.0</modelVersion>
45

5-
<parent>
6-
<groupId>org.utplsql</groupId>
7-
<artifactId>utplsql-maven-plugin-parent</artifactId>
8-
<version>3.1.0-SNAPSHOT</version>
9-
</parent>
10-
<name>utplsql-maven-plugin Integration tests</name>
11-
<artifactId>utplsql-maven-plugin-it</artifactId>
12-
<packaging>jar</packaging>
6+
<parent>
7+
<groupId>org.utplsql</groupId>
8+
<artifactId>utplsql-maven-plugin-parent</artifactId>
9+
<version>3.1.0-SNAPSHOT</version>
10+
</parent>
11+
<name>utplsql-maven-plugin Integration tests</name>
12+
<artifactId>utplsql-maven-plugin-it</artifactId>
13+
<packaging>jar</packaging>
1314

14-
<properties>
15-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<java.version>1.8</java.version>
17-
</properties>
15+
<properties>
16+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17+
<java.version>1.8</java.version>
18+
</properties>
1819

19-
<dependencies>
20-
<dependency>
21-
<groupId>org.apache.maven</groupId>
22-
<artifactId>maven-model</artifactId>
23-
<version>3.0.2</version>
24-
</dependency>
25-
<dependency>
26-
<groupId>commons-io</groupId>
27-
<artifactId>commons-io</artifactId>
28-
<version>2.5</version>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.apache.maven.shared</groupId>
32-
<artifactId>maven-verifier</artifactId>
33-
<version>1.6</version>
34-
</dependency>
35-
<dependency>
36-
<groupId>junit</groupId>
37-
<artifactId>junit</artifactId>
38-
<version>4.12</version>
39-
<scope>test</scope>
40-
</dependency>
41-
</dependencies>
20+
<dependencies>
21+
<dependency>
22+
<groupId>org.apache.maven</groupId>
23+
<artifactId>maven-model</artifactId>
24+
<version>3.0.2</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>commons-io</groupId>
28+
<artifactId>commons-io</artifactId>
29+
<version>2.5</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.apache.maven.shared</groupId>
33+
<artifactId>maven-verifier</artifactId>
34+
<version>1.6</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>junit</groupId>
38+
<artifactId>junit</artifactId>
39+
<version>4.12</version>
40+
<scope>test</scope>
41+
</dependency>
42+
</dependencies>
4243

43-
<build>
44-
<plugins>
45-
<plugin>
46-
<groupId>org.apache.maven.plugins</groupId>
47-
<artifactId>maven-install-plugin</artifactId>
48-
<version>2.5.2</version>
49-
<configuration>
50-
<skip>true</skip>
51-
</configuration>
52-
</plugin>
44+
<build>
45+
<plugins>
46+
<plugin>
47+
<groupId>org.apache.maven.plugins</groupId>
48+
<artifactId>maven-install-plugin</artifactId>
49+
<version>2.5.2</version>
50+
<configuration>
51+
<skip>true</skip>
52+
</configuration>
53+
</plugin>
5354

54-
<plugin>
55-
<groupId>org.apache.maven.plugins</groupId>
56-
<artifactId>maven-deploy-plugin</artifactId>
57-
<version>2.8.2</version>
58-
<configuration>
59-
<skip>true</skip>
60-
</configuration>
61-
</plugin>
62-
<plugin>
63-
<groupId>org.apache.maven.plugins</groupId>
64-
<artifactId>maven-compiler-plugin</artifactId>
65-
<version>3.7.0</version>
66-
<configuration>
67-
<source>${java.version}</source>
68-
<target>${java.version}</target>
69-
<encoding>${project.build.sourceEncoding}</encoding>
70-
</configuration>
71-
</plugin>
72-
<plugin>
73-
<groupId>org.codehaus.mojo</groupId>
74-
<artifactId>build-helper-maven-plugin</artifactId>
75-
<version>3.0.0</version>
76-
<executions>
77-
<execution>
78-
<id>add-it-resource</id>
79-
<phase>process-resources</phase>
80-
<goals>
81-
<goal>add-test-resource</goal>
82-
</goals>
83-
<configuration>
84-
<resources>
85-
<resource>
86-
<directory>src/it/resources</directory>
87-
</resource>
88-
</resources>
89-
</configuration>
90-
</execution>
91-
</executions>
92-
</plugin>
93-
<plugin>
94-
<groupId>org.codehaus.mojo</groupId>
95-
<artifactId>build-helper-maven-plugin</artifactId>
96-
<version>3.0.0</version>
97-
<executions>
98-
<execution>
99-
<id>add-it-source</id>
100-
<phase>process-resources</phase>
101-
<goals>
102-
<goal>add-test-source</goal>
103-
</goals>
104-
<configuration>
105-
<sources>
106-
<source>src/it/java</source>
107-
</sources>
108-
</configuration>
109-
</execution>
110-
</executions>
111-
</plugin>
112-
<plugin>
113-
<groupId>org.apache.maven.plugins</groupId>
114-
<artifactId>maven-failsafe-plugin</artifactId>
115-
<version>2.22.0</version>
116-
<executions>
117-
<execution>
118-
<id>integration-test</id>
119-
<goals>
120-
<goal>integration-test</goal>
121-
</goals>
122-
</execution>
123-
<execution>
124-
<id>verify</id>
125-
<goals>
126-
<goal>verify</goal>
127-
</goals>
128-
</execution>
129-
</executions>
130-
</plugin>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-deploy-plugin</artifactId>
58+
<version>2.8.2</version>
59+
<configuration>
60+
<skip>true</skip>
61+
</configuration>
62+
</plugin>
63+
<plugin>
64+
<groupId>org.apache.maven.plugins</groupId>
65+
<artifactId>maven-compiler-plugin</artifactId>
66+
<version>3.7.0</version>
67+
<configuration>
68+
<source>${java.version}</source>
69+
<target>${java.version}</target>
70+
<encoding>${project.build.sourceEncoding}</encoding>
71+
</configuration>
72+
</plugin>
73+
<plugin>
74+
<groupId>org.codehaus.mojo</groupId>
75+
<artifactId>build-helper-maven-plugin</artifactId>
76+
<version>3.0.0</version>
77+
<executions>
78+
<execution>
79+
<id>add-it-resource</id>
80+
<phase>process-resources</phase>
81+
<goals>
82+
<goal>add-test-resource</goal>
83+
</goals>
84+
<configuration>
85+
<resources>
86+
<resource>
87+
<directory>src/it/resources</directory>
88+
</resource>
89+
</resources>
90+
</configuration>
91+
</execution>
92+
</executions>
93+
</plugin>
94+
<plugin>
95+
<groupId>org.codehaus.mojo</groupId>
96+
<artifactId>build-helper-maven-plugin</artifactId>
97+
<version>3.0.0</version>
98+
<executions>
99+
<execution>
100+
<id>add-it-source</id>
101+
<phase>process-resources</phase>
102+
<goals>
103+
<goal>add-test-source</goal>
104+
</goals>
105+
<configuration>
106+
<sources>
107+
<source>src/it/java</source>
108+
</sources>
109+
</configuration>
110+
</execution>
111+
</executions>
112+
</plugin>
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-failsafe-plugin</artifactId>
116+
<version>2.22.0</version>
117+
<executions>
118+
<execution>
119+
<id>integration-test</id>
120+
<goals>
121+
<goal>integration-test</goal>
122+
</goals>
123+
</execution>
124+
<execution>
125+
<id>verify</id>
126+
<goals>
127+
<goal>verify</goal>
128+
</goals>
129+
</execution>
130+
</executions>
131+
</plugin>
131132

132-
</plugins>
133-
</build>
133+
</plugins>
134+
</build>
134135
</project>

0 commit comments

Comments
 (0)