Skip to content

Commit 7400c05

Browse files
chore(QTDI-1629): clean up (#1050)
* update maven plugins * tidy update of pom.xml * remove explicit version of plugins in sub modules * fix test according to the change * remove java9 api use
1 parent f12ae4a commit 7400c05

File tree

114 files changed

+334
-291
lines changed

Some content is hidden

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

114 files changed

+334
-291
lines changed

component-api/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1717
<modelVersion>4.0.0</modelVersion>
1818

1919
<parent>
@@ -59,7 +59,6 @@
5959
<plugin>
6060
<groupId>org.apache.maven.plugins</groupId>
6161
<artifactId>maven-javadoc-plugin</artifactId>
62-
<version>${javadoc-plugin.version}</version>
6362
<configuration>
6463
<splitindex>true</splitindex>
6564
<linksource>true</linksource>

component-form/component-form-core/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1717
<modelVersion>4.0.0</modelVersion>
1818

1919
<parent>
@@ -106,7 +106,6 @@
106106
<plugin>
107107
<groupId>org.codehaus.gmavenplus</groupId>
108108
<artifactId>gmavenplus-plugin</artifactId>
109-
<version>${gmavenplus.version}</version>
110109
<executions>
111110
<execution>
112111
<id>generate-proptypes</id>

component-form/component-form-model/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1717
<modelVersion>4.0.0</modelVersion>
1818

1919
<parent>

component-form/component-uispec-mapper/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1717
<modelVersion>4.0.0</modelVersion>
1818

1919
<parent>

component-form/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1717
<modelVersion>4.0.0</modelVersion>
1818

1919
<parent>

component-runtime-beam/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1717
<modelVersion>4.0.0</modelVersion>
1818

1919
<parent>
@@ -239,7 +239,6 @@
239239
<plugin>
240240
<groupId>org.codehaus.gmavenplus</groupId>
241241
<artifactId>gmavenplus-plugin</artifactId>
242-
<version>${gmavenplus.version}</version>
243242
<executions>
244243
<execution>
245244
<id>runner-dependencies</id>

component-runtime-beam/src/it/serialization-over-cluster/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<plugin>
8282
<groupId>org.apache.maven.plugins</groupId>
8383
<artifactId>maven-compiler-plugin</artifactId>
84-
<version>3.10.1</version>
84+
<version>3.14.0</version>
8585
<configuration>
8686
<source>1.8</source>
8787
<target>1.8</target>
@@ -98,15 +98,15 @@
9898
<plugin>
9999
<groupId>org.apache.maven.plugins</groupId>
100100
<artifactId>maven-deploy-plugin</artifactId>
101-
<version>@deploy-plugin.version@</version>
101+
<version>@maven-deploy-plugin.version@</version>
102102
<configuration>
103103
<skip>true</skip>
104104
</configuration>
105105
</plugin>
106106
<plugin>
107107
<groupId>org.apache.maven.plugins</groupId>
108108
<artifactId>maven-clean-plugin</artifactId>
109-
<version>@clean-plugin.version@</version>
109+
<version>@maven-clean-plugin.version@</version>
110110
<configuration>
111111
<filesets>
112112
<fileset>
@@ -121,7 +121,7 @@
121121
<plugin>
122122
<groupId>org.apache.maven.plugins</groupId>
123123
<artifactId>maven-shade-plugin</artifactId>
124-
<version>@shade-plugin.version@</version>
124+
<version>@maven-shade-plugin.version@</version>
125125
<executions>
126126
<execution>
127127
<phase>package</phase>

component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroRecordTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
import static java.util.Collections.singletonList;
2020
import static org.apache.avro.Schema.createFixed;
2121
import static org.apache.beam.sdk.util.SerializableUtils.ensureSerializableByCoder;
22-
import static org.junit.Assert.assertArrayEquals;
23-
import static org.junit.Assert.assertFalse;
24-
import static org.junit.Assert.assertTrue;
22+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
2523
import static org.junit.jupiter.api.Assertions.assertEquals;
24+
import static org.junit.jupiter.api.Assertions.assertFalse;
2625
import static org.junit.jupiter.api.Assertions.assertNotNull;
2726
import static org.junit.jupiter.api.Assertions.assertNull;
2827
import static org.junit.jupiter.api.Assertions.assertThrows;
28+
import static org.junit.jupiter.api.Assertions.assertTrue;
2929

3030
import java.io.ByteArrayInputStream;
3131
import java.io.ByteArrayOutputStream;
@@ -100,7 +100,7 @@ class AvroRecordTest {
100100
* Avro logical type must be an int and contains milliseconds from 00:00:00.
101101
*
102102
* Please have a look to Avro specification:
103-
* {@link https://avro.apache.org/docs/1.11.0/spec.html#Timestamp+%28millisecond+precision%29}.
103+
* {@link <a href="https://avro.apache.org/docs/1.11.0/spec.html#Timestamp+%28millisecond+precision%29">Timestamp</a>}.
104104
*
105105
* <pre>
106106
* Time (millisecond precision)
@@ -566,7 +566,7 @@ void stringGetObject() {
566566
avro.put(0, new Utf8("test"));
567567
final Record record = new AvroRecord(avro);
568568
final Object str = record.get(Object.class, "str");
569-
assertFalse(str.getClass().getName(), Utf8.class.isInstance(str));
569+
assertFalse(str instanceof Utf8, str.getClass().getName());
570570
assertEquals("test", str);
571571
}
572572

@@ -797,7 +797,7 @@ void arrayOfArrays() throws IOException {
797797
next = iterator.next();
798798
Assertions.assertEquals("XX", next.get(0));
799799
Assertions.assertEquals(null, next.get(1));
800-
Assertions.assertFalse(iterator.hasNext());
800+
assertFalse(iterator.hasNext());
801801
}
802802

803803
@Test

component-runtime-beam/src/test/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchemaTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import static java.util.Collections.singletonList;
1919
import static java.util.stream.Collectors.joining;
2020
import static java.util.stream.Collectors.toList;
21-
import static org.junit.Assert.assertEquals;
22-
import static org.junit.Assert.assertFalse;
23-
import static org.junit.Assert.assertTrue;
21+
import static org.junit.jupiter.api.Assertions.assertEquals;
22+
import static org.junit.jupiter.api.Assertions.assertFalse;
2423
import static org.junit.jupiter.api.Assertions.assertNotNull;
2524
import static org.junit.jupiter.api.Assertions.assertNull;
2625
import static org.junit.jupiter.api.Assertions.assertThrows;
26+
import static org.junit.jupiter.api.Assertions.assertTrue;
2727
import static org.talend.sdk.component.api.record.Schema.Type.DATETIME;
2828
import static org.talend.sdk.component.api.record.Schema.Type.DECIMAL;
2929
import static org.talend.sdk.component.api.record.Schema.Type.RECORD;

component-runtime-design-extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
1717
<modelVersion>4.0.0</modelVersion>
1818

1919
<parent>

0 commit comments

Comments
 (0)