Skip to content

Commit f45ad59

Browse files
undxundx
authored
Revert "feat(QTDI-113): Support Java 17 compilation (#936)" (#982)
This reverts commit b0cc8e8. Co-authored-by: undx <ouf@qlik.com>
1 parent 9317bdd commit f45ad59

File tree

36 files changed

+228
-207
lines changed

36 files changed

+228
-207
lines changed

‎.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
java adoptopenjdk-17.0.5+8
2-
maven 3.9.9
2+
maven 3.8.8
33
trivy 0.54.1

‎Jenkinsfile

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ pipeline {
131131
description: 'Force documentation stage for development branches. No effect on master and maintenance.')
132132

133133
string(name: 'JAVA_VERSION',
134-
defaultValue: 'from .tool-versions',
134+
defaultValue: 'adoptopenjdk-17.0.5+8',
135135
description: """Provided java version will be installed with asdf
136136
Examples: adoptopenjdk-11.0.22+7, adoptopenjdk-17.0.11+9
137137
""")
138138

139139
string(name: 'MAVEN_VERSION',
140-
defaultValue: 'from .tool-versions',
140+
defaultValue: '3.8.8',
141141
description: """Provided maven version will be installed with asdf
142-
Examples: 3.8.8, 3.9.9, 4.0.0-beta-4
142+
Examples: 3.8.8, 4.0.0-beta-4
143143
""")
144144

145145
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -250,19 +250,14 @@ pipeline {
250250
}
251251

252252
///////////////////////////////////////////
253-
// edit mvn and java version
253+
// edit java version
254254
///////////////////////////////////////////
255255
script {
256256
echo "edit asdf tool version with version from jenkins param"
257257

258-
if (params.JAVA_VERSION != 'from .tool-versions') {
259-
asdfTools.edit_version_in_file("$env.WORKSPACE/.tool-versions", 'java', params.JAVA_VERSION)
260-
}
258+
asdfTools.edit_version_in_file("$env.WORKSPACE/.tool-versions", 'java', params.JAVA_VERSION)
261259
jenkinsJobTools.job_description_append("Use java version: $params.JAVA_VERSION ")
262-
263-
if (params.MAVEN_VERSION != 'from .tool-versions') {
264-
asdfTools.edit_version_in_file("$env.WORKSPACE/.tool-versions", 'maven', params.MAVEN_VERSION)
265-
}
260+
asdfTools.edit_version_in_file("$env.WORKSPACE/.tool-versions", 'maven', params.MAVEN_VERSION)
266261
jenkinsJobTools.job_description_append("Use maven version: $params.MAVEN_VERSION ")
267262

268263
}

‎component-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<plugin>
6060
<groupId>org.apache.maven.plugins</groupId>
6161
<artifactId>maven-javadoc-plugin</artifactId>
62-
<version>${maven-javadoc-plugin.version}</version>
62+
<version>${javadoc-plugin.version}</version>
6363
<configuration>
6464
<splitindex>true</splitindex>
6565
<linksource>true</linksource>

‎component-api/src/main/java/org/talend/sdk/component/api/exception/DiscoverSchemaException.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import javax.json.bind.annotation.JsonbPropertyOrder;
2020

2121
import lombok.Data;
22-
import lombok.EqualsAndHashCode;
2322

2423
/**
2524
* This class is dedicated to Studio's guess schema feature.
@@ -30,7 +29,6 @@
3029
* See me TCOMP-2342 for more details.
3130
*/
3231
@Data
33-
@EqualsAndHashCode(callSuper = true)
3432
@JsonbPropertyOrder({ "localizedMessage", "message", "stackTrace", "suppressed", "possibleHandleErrorWith" })
3533
public class DiscoverSchemaException extends RuntimeException {
3634

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@
9090
<plugin>
9191
<groupId>org.apache.maven.plugins</groupId>
9292
<artifactId>maven-install-plugin</artifactId>
93-
<version>@maven-install-plugin.version@</version>
93+
<version>2.5.2</version>
9494
<configuration>
9595
<skip>true</skip>
9696
</configuration>
9797
</plugin>
9898
<plugin>
9999
<groupId>org.apache.maven.plugins</groupId>
100100
<artifactId>maven-deploy-plugin</artifactId>
101-
<version>@maven-deploy-plugin.version@</version>
101+
<version>@deploy-plugin.version@</version>
102102
<configuration>
103103
<skip>true</skip>
104104
</configuration>
@@ -121,7 +121,7 @@
121121
<plugin>
122122
<groupId>org.apache.maven.plugins</groupId>
123123
<artifactId>maven-shade-plugin</artifactId>
124-
<version>@maven-shade-plugin.version@</version>
124+
<version>@shade-plugin.version@</version>
125125
<executions>
126126
<execution>
127127
<phase>package</phase>

‎component-runtime-beam/src/test/java/org/talend/test/wrapped/ASource.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.talend.sdk.component.runtime.beam.coder.JsonpJsonObjectCoder;
3838

3939
import lombok.Data;
40-
import lombok.EqualsAndHashCode;
4140

4241
public class ASource extends BoundedSource<JsonObject> {
4342

@@ -79,7 +78,6 @@ private static void assertClassLoader() {
7978
}
8079

8180
@Data
82-
@EqualsAndHashCode(callSuper = true)
8381
private static class AReader extends BoundedReader<JsonObject> {
8482

8583
private final ASource source;

‎component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/MappingUtilsTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,29 +47,29 @@ void coerce() {
4747
assertEquals(new Date(1000l), MappingUtils.coerce(Date.class, 1000l, name));
4848
// === non-matching types ===
4949
// number classes mapping
50-
assertEquals(shorty, MappingUtils.coerce(short.class, shorty, name));
50+
assertEquals(shorty, MappingUtils.coerce(short.class, new Short(shorty), name));
5151
assertEquals(shorty, MappingUtils.coerce(Short.class, shorty.shortValue(), name));
5252
assertEquals(Byte.valueOf("123"), MappingUtils.coerce(Byte.class, 123l, name));
5353
assertEquals(Byte.valueOf("123"), MappingUtils.coerce(byte.class, 123l, name));
5454
assertEquals(BigDecimal.valueOf(12345.67891), MappingUtils.coerce(BigDecimal.class, 12345.67891, name));
5555
assertEquals(shorty.intValue(), MappingUtils.coerce(Integer.class, shorty, name));
5656
// ==== mapping primitive <-> Class ====
5757
assertEquals(Boolean.TRUE, MappingUtils.coerce(Boolean.class, true, name));
58-
assertEquals('c', MappingUtils.coerce(char.class, 'c', name));
59-
assertEquals('c', MappingUtils.coerce(Character.class, 'c', name));
60-
assertEquals(123, MappingUtils.coerce(int.class, 123, name));
61-
assertEquals(123, MappingUtils.coerce(Integer.class, 123, name));
62-
assertEquals(123l, MappingUtils.coerce(long.class, 123l, name));
63-
assertEquals(123l, MappingUtils.coerce(Long.class, 123l, name));
64-
assertEquals(123.456f, MappingUtils.coerce(float.class, 123.456, name));
65-
assertEquals(123.456f, MappingUtils.coerce(Float.class, 123.456f, name));
66-
assertEquals(123.456, MappingUtils.coerce(double.class, 123.456, name));
67-
assertEquals(123.456, MappingUtils.coerce(Double.class, 123.456, name));
58+
assertEquals('c', MappingUtils.coerce(char.class, new Character('c'), name));
59+
assertEquals(new Character('c'), MappingUtils.coerce(Character.class, 'c', name));
60+
assertEquals(123, MappingUtils.coerce(int.class, new Integer(123), name));
61+
assertEquals(new Integer(123), MappingUtils.coerce(Integer.class, 123, name));
62+
assertEquals(123l, MappingUtils.coerce(long.class, new Long(123), name));
63+
assertEquals(new Long(123), MappingUtils.coerce(Long.class, 123, name));
64+
assertEquals(123.456f, MappingUtils.coerce(float.class, new Float(123.456), name));
65+
assertEquals(new Float(123.456), MappingUtils.coerce(Float.class, 123.456f, name));
66+
assertEquals(123.456, MappingUtils.coerce(double.class, new Double(123.456), name));
67+
assertEquals(new Double(123.456), MappingUtils.coerce(Double.class, 123.456, name));
6868

6969
assertEquals("1000", MappingUtils.coerce(String.class, 1000l, name));
7070
// string mapping
7171
assertEquals('c', MappingUtils.coerce(char.class, "c", name));
72-
assertEquals('c', MappingUtils.coerce(Character.class, "c", name));
72+
assertEquals(new Character('c'), MappingUtils.coerce(Character.class, "c", name));
7373
assertEquals(Character.MIN_VALUE, MappingUtils.coerce(Character.class, "", name));
7474
assertEquals(true, MappingUtils.coerce(Boolean.class, "true", name));
7575
assertEquals(true, MappingUtils.coerce(boolean.class, "true", name));

‎component-runtime-manager/src/main/java/org/talend/sdk/component/runtime/manager/asm/Unsafes.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import lombok.NoArgsConstructor;
3434

3535
@NoArgsConstructor(access = PRIVATE)
36-
// as deprecation was introduced since = "17", can ignore it for now...
37-
@SuppressWarnings({ "deprecation", "removal" })
3836
public final class Unsafes {
3937

4038
private static final Object UNSAFE;

‎component-runtime-testing/component-runtime-beam-junit/pom.xml

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,6 @@
3636
<groupId>org.talend.sdk.component</groupId>
3737
<artifactId>component-runtime-beam</artifactId>
3838
<version>${project.version}</version>
39-
<exclusions>
40-
<exclusion>
41-
<groupId>org.sonatype.sisu</groupId>
42-
<artifactId>sisu-inject-plexus</artifactId>
43-
</exclusion>
44-
<exclusion>
45-
<groupId>org.codehaus.plexus</groupId>
46-
<artifactId>plexus-component-annotations</artifactId>
47-
</exclusion>
48-
<exclusion>
49-
<groupId>org.eclipse.sisu</groupId>
50-
<artifactId>org.eclipse.sisu.plexus</artifactId>
51-
</exclusion>
52-
<exclusion>
53-
<groupId>org.eclipse.sisu</groupId>
54-
<artifactId>org.eclipse.sisu.inject</artifactId>
55-
</exclusion>
56-
</exclusions>
5739
</dependency>
5840
<dependency>
5941
<groupId>org.talend.sdk.component</groupId>
@@ -77,43 +59,11 @@
7759
<groupId>org.jboss.shrinkwrap.resolver</groupId>
7860
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
7961
<scope>test</scope>
80-
<exclusions>
81-
<exclusion>
82-
<groupId>org.apache.maven.resolver</groupId>
83-
<artifactId>maven-resolver-impl</artifactId>
84-
</exclusion>
85-
<exclusion>
86-
<groupId>org.apache.maven.resolver</groupId>
87-
<artifactId>maven-resolver-util</artifactId>
88-
</exclusion>
89-
<exclusion>
90-
<groupId>org.apache.maven</groupId>
91-
<artifactId>maven-model-builder</artifactId>
92-
</exclusion>
93-
<exclusion>
94-
<groupId>org.apache.maven.resolver</groupId>
95-
<artifactId>maven-resolver-api</artifactId>
96-
</exclusion>
97-
<exclusion>
98-
<groupId>org.apache.maven.resolver</groupId>
99-
<artifactId>maven-resolver-named-locks</artifactId>
100-
</exclusion>
101-
<exclusion>
102-
<groupId>org.apache.maven.resolver</groupId>
103-
<artifactId>maven-resolver-spi</artifactId>
104-
</exclusion>
105-
</exclusions>
10662
</dependency>
10763
<dependency>
10864
<groupId>org.apache.beam</groupId>
10965
<artifactId>beam-sdks-java-core</artifactId>
11066
<scope>provided</scope>
111-
<exclusions>
112-
<exclusion>
113-
<groupId>com.google.errorprone</groupId>
114-
<artifactId>error_prone_annotations</artifactId>
115-
</exclusion>
116-
</exclusions>
11767
</dependency>
11868
<dependency>
11969
<groupId>junit</groupId>
@@ -164,7 +114,7 @@
164114
<plugin>
165115
<groupId>org.apache.maven.plugins</groupId>
166116
<artifactId>maven-javadoc-plugin</artifactId>
167-
<version>${maven-javadoc-plugin.version}</version>
117+
<version>${javadoc-plugin.version}</version>
168118
<executions>
169119
<execution>
170120
<id>attach-javadocs</id>

‎component-runtime-testing/component-runtime-http-junit/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
<plugin>
150150
<groupId>org.apache.maven.plugins</groupId>
151151
<artifactId>maven-javadoc-plugin</artifactId>
152-
<version>${maven-javadoc-plugin.version}</version>
152+
<version>${javadoc-plugin.version}</version>
153153
<executions>
154154
<execution>
155155
<id>attach-javadocs</id>

0 commit comments

Comments
 (0)