From 2e1c4b1012d49338b68b4524f725f5b492fe9072 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Wed, 6 Sep 2023 14:57:48 +0200 Subject: [PATCH 01/18] feat(TCOMP-2375): optimizations for Schema (#784) --- .../sdk/component/api/record/Schema.java | 9 +-- .../sdk/component/api/record/SchemaTest.java | 9 +++ .../runtime/beam/spi/record/AvroSchema.java | 14 +++++ .../component/runtime/record/RecordImpl.java | 38 +++++++++--- .../component/runtime/record/SchemaImpl.java | 6 ++ .../runtime/record/SchemaImplTest.java | 2 +- .../runtime/di/record/DiRecordVisitor.java | 59 +++++++++++-------- 7 files changed, 98 insertions(+), 39 deletions(-) diff --git a/component-api/src/main/java/org/talend/sdk/component/api/record/Schema.java b/component-api/src/main/java/org/talend/sdk/component/api/record/Schema.java index 3aaa18710b890..380c055b0d81f 100644 --- a/component-api/src/main/java/org/talend/sdk/component/api/record/Schema.java +++ b/component-api/src/main/java/org/talend/sdk/component/api/record/Schema.java @@ -74,6 +74,10 @@ public interface Schema { */ Stream getAllEntries(); + default Map getEntryMap() { + throw new UnsupportedOperationException("#getEntryMap is not implemented"); + } + /** * Get a Builder from the current schema. * @@ -115,10 +119,7 @@ default EntriesOrder naturalOrder() { } default Entry getEntry(final String name) { - return getAllEntries() // - .filter((Entry e) -> Objects.equals(e.getName(), name)) // - .findFirst() // - .orElse(null); + return getEntryMap().get(name); } /** diff --git a/component-api/src/test/java/org/talend/sdk/component/api/record/SchemaTest.java b/component-api/src/test/java/org/talend/sdk/component/api/record/SchemaTest.java index 14a1d2568ae92..48a5c3583fc19 100644 --- a/component-api/src/test/java/org/talend/sdk/component/api/record/SchemaTest.java +++ b/component-api/src/test/java/org/talend/sdk/component/api/record/SchemaTest.java @@ -202,6 +202,15 @@ class SchemaExample implements Schema { private final Map props; + @Override + public Map getEntryMap() { + Map m = new HashMap<>(); + if (entries != null) { + entries.stream().forEach(e -> m.put(e.getName(), e)); + } + return m; + } + @Override public Type getType() { return Type.RECORD; diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchema.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchema.java index 4663034131685..a72eaf5d5764b 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchema.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchema.java @@ -23,6 +23,7 @@ import static org.talend.sdk.component.runtime.beam.avro.AvroSchemas.unwrapUnion; import static org.talend.sdk.component.runtime.record.SchemaImpl.ENTRIES_ORDER_PROP; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -63,6 +64,9 @@ static AvroSchema toAvroSchema(final org.talend.sdk.component.api.record.Schema private List entries; + @JsonbTransient + private Map entryMap; + @JsonbTransient private List metadataEntries; @@ -162,6 +166,16 @@ public Stream getAllEntries() { return Stream.concat(this.getEntries().stream(), this.getMetadata().stream()); } + @Override + @JsonbTransient + public Map getEntryMap() { + if (entryMap == null) { + entryMap = new HashMap<>(); + getAllEntries().forEach(e -> entryMap.put(e.getName(), e)); + } + return entryMap; + } + @Override @JsonbTransient public EntriesOrder naturalOrder() { diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java index feff96e0a38ce..5a1ff37f59e74 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/RecordImpl.java @@ -127,7 +127,7 @@ public static class BuilderImpl implements Builder { private final Schema providedSchema; - private final OrderState orderState; + private OrderState orderState; public BuilderImpl() { this(null); @@ -140,11 +140,20 @@ public BuilderImpl(final Schema providedSchema) { this.orderState = new OrderState(Collections.emptyList()); } else { this.entries = null; - final List fields = providedSchema.naturalOrder() - .getFieldsOrder() - .map(providedSchema::getEntry) - .collect(Collectors.toList()); - this.orderState = new OrderState(fields); + } + } + + private void initOrderState() { + if (orderState == null) { + if (this.providedSchema == null) { + this.orderState = new OrderState(Collections.emptyList()); + } else { + final List fields = this.providedSchema.naturalOrder() + .getFieldsOrder() + .map(this.providedSchema::getEntry) + .collect(Collectors.toList()); + this.orderState = new OrderState(fields); + } } } @@ -261,12 +270,14 @@ public Builder updateEntryByName(final String name, final Entry schemaEntry, @Override public Builder before(final String entryName) { + initOrderState(); orderState.before(entryName); return this; } @Override public Builder after(final String entryName) { + initOrderState(); orderState.after(entryName); return this; } @@ -323,7 +334,7 @@ public Record build() { if (!missing.isEmpty()) { throw new IllegalArgumentException("Missing entries: " + missing); } - if (orderState.isOverride()) { + if (orderState != null && orderState.isOverride()) { currentSchema = this.providedSchema.toBuilder().build(this.orderState.buildComparator()); } else { currentSchema = this.providedSchema; @@ -331,6 +342,7 @@ public Record build() { } else { final Schema.Builder builder = new SchemaImpl.BuilderImpl().withType(RECORD); this.entries.forEachValue(builder::withEntry); + initOrderState(); currentSchema = builder.build(orderState.buildComparator()); } return new RecordImpl(unmodifiableMap(values), currentSchema); @@ -528,7 +540,17 @@ private Builder append(final Schema.Entry entry, final T value) { if (this.entries != null) { this.entries.addValue(realEntry); } - orderState.update(realEntry); + if (orderState == null) { + if (this.providedSchema != null && this.providedSchema.getEntryMap().containsKey(realEntry.getName())) { + // no need orderState, delay init it for performance, this is 99% cases for + // RecordBuilderFactoryImpl.newRecordBuilder(schema) usage + } else { + initOrderState(); + orderState.update(realEntry); + } + } else { + orderState.update(realEntry); + } return this; } diff --git a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java index fe76b121c3f6a..7e4127f2c45f2 100644 --- a/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java +++ b/component-runtime-impl/src/main/java/org/talend/sdk/component/runtime/record/SchemaImpl.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -59,6 +60,10 @@ public class SchemaImpl implements Schema { @JsonbTransient private final EntriesOrder entriesOrder; + @Getter + @JsonbTransient + private Map entryMap = new HashMap<>(); + public static final String ENTRIES_ORDER_PROP = "talend.fields.order"; SchemaImpl(final SchemaImpl.BuilderImpl builder) { @@ -68,6 +73,7 @@ public class SchemaImpl implements Schema { this.metadataEntries = unmodifiableList(builder.metadataEntries.streams().collect(toList())); this.props = builder.props; entriesOrder = EntriesOrder.of(getFieldsOrder()); + getAllEntries().forEach(e -> entryMap.put(e.getName(), e)); } /** diff --git a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/SchemaImplTest.java b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/SchemaImplTest.java index 24af569995172..be1ecb0dc96aa 100644 --- a/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/SchemaImplTest.java +++ b/component-runtime-impl/src/test/java/org/talend/sdk/component/runtime/record/SchemaImplTest.java @@ -85,7 +85,7 @@ void checkEquals() { .suppress(Warning.STRICT_HASHCODE) // Supress test hashcode use all fields used by equals (for legacy) .forClass(SchemaImpl.class) .withPrefabValues(Schema.Entry.class, first, second) - .withIgnoredFields("entriesOrder") + .withIgnoredFields("entriesOrder", "entryMap") .withPrefabValues(EntriesOrder.class, EntriesOrder.of("First"), EntriesOrder.of("Second")) .verify(); } diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitor.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitor.java index 5101bf5c3e36a..6f9db20f22115 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitor.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitor.java @@ -144,32 +144,39 @@ public Object visit(final Record record) { dynamic.getDynamic().metadatas.clear(); dynamic.getDynamic().clearColumnValues(); } - recordFields = record.getSchema().getAllEntries().filter(t -> t.getType().equals(Type.RECORD)).map(rcdEntry -> { - final String root = rcdEntry.getName() + "."; - final List names = new ArrayList<>(); - rcdEntry.getElementSchema().getAllEntries().filter(e -> e.getType().equals(Type.RECORD)).map(sr -> { - final String sub = root + sr.getName() + "."; - return sr - .getElementSchema() - .getAllEntries() - .map(entry -> sub + entry.getName()) - .collect(Collectors.toList()); - }).forEach(l -> l.stream().forEach(m -> names.add(m))); - rcdEntry - .getElementSchema() - .getAllEntries() - .filter(e -> !e.getType().equals(Type.RECORD)) - .map(entry -> root + entry.getName()) - .forEach(sre -> names.add(sre)); - return names; - }).flatMap(liststream -> liststream.stream()).collect(Collectors.toSet()); - recordFields - .addAll(record - .getSchema() - .getAllEntries() - .filter(t -> !t.getType().equals(Type.RECORD)) - .map(entry -> entry.getName()) - .collect(Collectors.toSet())); + if (hasDynamic && (recordFields == null)) { + recordFields = + record.getSchema().getAllEntries().filter(t -> t.getType().equals(Type.RECORD)).map(rcdEntry -> { + final String root = rcdEntry.getName() + "."; + final List names = new ArrayList<>(); + rcdEntry.getElementSchema() + .getAllEntries() + .filter(e -> e.getType().equals(Type.RECORD)) + .map(sr -> { + final String sub = root + sr.getName() + "."; + return sr + .getElementSchema() + .getAllEntries() + .map(entry -> sub + entry.getName()) + .collect(Collectors.toList()); + }) + .forEach(l -> l.stream().forEach(m -> names.add(m))); + rcdEntry + .getElementSchema() + .getAllEntries() + .filter(e -> !e.getType().equals(Type.RECORD)) + .map(entry -> root + entry.getName()) + .forEach(sre -> names.add(sre)); + return names; + }).flatMap(liststream -> liststream.stream()).collect(Collectors.toSet()); + recordFields + .addAll(record + .getSchema() + .getAllEntries() + .filter(t -> !t.getType().equals(Type.RECORD)) + .map(entry -> entry.getName()) + .collect(Collectors.toSet())); + } if (hasDynamic) { prefillDynamic(record.getSchema()); } From e56c4bfab59e3aaf8aef2e1d62c9e5708a1aa409 Mon Sep 17 00:00:00 2001 From: Dmytro Sylaiev Date: Wed, 6 Sep 2023 15:58:02 +0300 Subject: [PATCH 02/18] fix(TCOMP-2520): Pass datepattern for Strings (#779) --- .../runtime/di/record/DiRowStructVisitor.java | 2 +- .../runtime/di/record/DiRowStructVisitorTest.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRowStructVisitor.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRowStructVisitor.java index 389279cf2cff7..e4b5312c03374 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRowStructVisitor.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRowStructVisitor.java @@ -345,7 +345,7 @@ private Schema inferSchema(final Object data, final RecordBuilderFactory factory case StudioTypes.STRING: case StudioTypes.CHARACTER: schema.withEntry(toEntry(metaName, STRING, metaOriginalName, metaIsNullable, comment, - metaIsKey, null, null, defaultValue, null, metaStudioType)); + metaIsKey, null, null, defaultValue, metaPattern, metaStudioType)); break; case StudioTypes.BIGDECIMAL: schema.withEntry(toEntry(metaName, DECIMAL, metaOriginalName, metaIsNullable, comment, diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRowStructVisitorTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRowStructVisitorTest.java index 41e58812b1e71..62a37da605ce9 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRowStructVisitorTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRowStructVisitorTest.java @@ -53,10 +53,16 @@ private void createMetadata(final Dynamic dynamic, final String name, final Stri private void createMetadata(final Dynamic dynamic, final String name, final String type, final Object value, boolean isKey) { + createMetadata(dynamic, name, type, value, null, isKey); + } + + private void createMetadata(final Dynamic dynamic, final String name, final String type, final Object value, + final String datePattern, boolean isKey) { final DynamicMetadata meta = new DynamicMetadata(); meta.setName(name); meta.setType(type); meta.setKey(isKey); + meta.setFormat(datePattern); dynamic.metadatas.add(meta); dynamic.addColumnValue(value); } @@ -109,13 +115,15 @@ void visit() { createMetadata(dynamic, "RECORDS", StudioTypes.LIST, RECORDS); createMetadata(dynamic, "BIG_DECIMALS", StudioTypes.LIST, BIG_DECIMALS); createMetadata(dynamic, "dynDate", StudioTypes.DATE, DATE); + createMetadata(dynamic, "dynStringDate", StudioTypes.STRING, + "2010-01-31", "yyyy-MM-dd", false); rowStruct.dynamic = dynamic; // final DiRowStructVisitor visitor = new DiRowStructVisitor(); final Record record = visitor.get(rowStruct, factory); final Schema schema = record.getSchema(); // should have 3 excluded fields - assertEquals(48, schema.getEntries().size()); + assertEquals(49, schema.getEntries().size()); // schema metadata assertFalse(schema.getEntry("id").isNullable()); assertEquals("true", schema.getEntry("id").getProp(IS_KEY)); @@ -149,6 +157,8 @@ void visit() { assertEquals("10", schema.getEntry("dynBigDecimal").getProp(SCALE)); assertEquals(StudioTypes.DATE, schema.getEntry("dynDate").getProp(STUDIO_TYPE)); assertEquals("YYYY-mm-ddTHH:MM", schema.getEntry("dynDate").getProp(PATTERN)); + assertEquals(StudioTypes.STRING, schema.getEntry("dynStringDate").getProp(STUDIO_TYPE)); + assertEquals("yyyy-MM-dd", schema.getEntry("dynStringDate").getProp(PATTERN)); // asserts Record assertEquals(":testing:", record.getString("id")); assertEquals(NAME, record.getString("name")); From ae672f7bedc61831af270ca93d5c9146f7545410 Mon Sep 17 00:00:00 2001 From: undx Date: Wed, 6 Sep 2023 16:23:48 +0200 Subject: [PATCH 03/18] chore(documentation): add changelog for 1.38.10 --- .../pages/_partials/generated_changelog.adoc | 39 ++++++++----------- .../_partials/generated_contributors.adoc | 2 +- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_changelog.adoc b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_changelog.adoc index 090d40cd7f854..3796770e519d0 100644 --- a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_changelog.adoc +++ b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_changelog.adoc @@ -164,29 +164,13 @@ - link:https://jira.talendforge.org/browse/TCOMP-2405[TCOMP-2405^]: Upgrade snakeyaml to 2.0 link:search.html?query=build[build^,role='dockey'] -== Version 1.55.0 - -=== Bug - -- link:https://jira.talendforge.org/browse/TCOMP-2372[TCOMP-2372^]: rename QueryParam language to lang link:search.html?query=component-server[component-server^,role='dockey'] +== Version 1.55.0 === Work Item -- link:https://jira.talendforge.org/browse/TCOMP-2369[TCOMP-2369^]: Make DateTime option configurable link:search.html?query=api[api^,role='dockey'] -- link:https://jira.talendforge.org/browse/TCOMP-2392[TCOMP-2392^]: Upgrade maven plugins to 3.8.7 link:search.html?query=build[build^,role='dockey'] -- link:https://jira.talendforge.org/browse/TCOMP-2393[TCOMP-2393^]: Upgrade bndlib to 5.3.0 link:search.html?query=build[build^,role='dockey'] -- link:https://jira.talendforge.org/browse/TCOMP-2394[TCOMP-2394^]: Upgrade log4j2 to 2.20.0 link:search.html?query=component-manager[component-manager^,role='dockey'] - link:https://jira.talendforge.org/browse/TCOMP-2395[TCOMP-2395^]: Upgrade meecrowave to 1.2.15 link:search.html?query=component-server[component-server^,role='dockey'] -- link:https://jira.talendforge.org/browse/TCOMP-2396[TCOMP-2396^]: Upgrade lombok to 1.18.26 link:search.html?query=build[build^,role='dockey'] -- link:https://jira.talendforge.org/browse/TCOMP-2397[TCOMP-2397^]: Upgrade junit5 to 5.9.2 link:search.html?query=testing[testing^,role='dockey'] -- link:https://jira.talendforge.org/browse/TCOMP-2398[TCOMP-2398^]: Upgrade httpclient to 4.5.14 link:search.html?query=bom[bom^,role='dockey'] -- link:https://jira.talendforge.org/browse/TCOMP-2399[TCOMP-2399^]: Upgrade woodstox to 6.5.0 link:search.html?query=component-manager[component-manager^,role='dockey'] -- link:https://jira.talendforge.org/browse/TCOMP-2400[TCOMP-2400^]: Upgrade ziplock to 8.0.14 link:search.html?query=testing[testing^,role='dockey'] -- link:https://jira.talendforge.org/browse/TCOMP-2401[TCOMP-2401^]: Upgrade tomcat to 9.0.73 link:search.html?query=component-server[component-server^,role='dockey'] - - == Version 1.54.1 @@ -868,6 +852,15 @@ + + + +== Version 1.38.10 + +=== Work Item + +- link:https://jira.talendforge.org/browse/TCOMP-2395[TCOMP-2395^]: Upgrade meecrowave to 1.2.15 link:search.html?query=component-server[component-server^,role='dockey'] +- link:https://jira.talendforge.org/browse/TCOMP-2527[TCOMP-2527^]: Upgrade tomcat to 9.0.80 link:search.html?query=component-server[component-server^,role='dockey'] == Version 1.38.9 @@ -1653,12 +1646,6 @@ - -== Version 1.1.15.2 - -=== Work Item - -- link:https://jira.talendforge.org/browse/TCOMP-1752[TCOMP-1752^]: Make component-runtime class loader find classes in RemoteEngine JobServer == Version 1.1.15 @@ -1693,6 +1680,12 @@ - link:https://jira.talendforge.org/browse/TCOMP-1578[TCOMP-1578^]: Upgrade asciidoctor-pdf to v1.5.0-beta.7 - link:https://jira.talendforge.org/browse/TCOMP-1581[TCOMP-1581^]: Support JUnit5 meta annotations for our extensions +== Version 1.1.15.2 + +=== Work Item + +- link:https://jira.talendforge.org/browse/TCOMP-1752[TCOMP-1752^]: Make component-runtime class loader find classes in RemoteEngine JobServer + == Version 1.1.15.1 === New Feature diff --git a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc index 6d63328b33f25..e4b6acbe5adca 100644 --- a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc +++ b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc @@ -8,7 +8,7 @@ "name":"Romain Manni-Bucau" }, { - "commits":722, + "commits":724, "description":"Software engineer @Talend.\r\n\r\nComponents team member.\n\nBlog: undx.github.io", "gravatar":"https://avatars.githubusercontent.com/u/265575?v=4", "id":"undx", From 1a10e2dd3a9ee1f74b4ff21b53ef5cf90d228cba Mon Sep 17 00:00:00 2001 From: wang wei Date: Thu, 14 Sep 2023 10:12:50 +0800 Subject: [PATCH 04/18] fix(TCOMP-2374): DIRecordVisitor to fill Studio Dynamic object's column name by tck Schema.Entry.getName which must follow tck name rule (#787) --- .../component/api/record/SchemaProperty.java | 2 + .../runtime/di/record/DiRecordVisitor.java | 39 ++++++++++----- .../di/record/DiRecordVisitorTest.java | 47 +++++++++++++++++++ 3 files changed, 77 insertions(+), 11 deletions(-) diff --git a/component-api/src/main/java/org/talend/sdk/component/api/record/SchemaProperty.java b/component-api/src/main/java/org/talend/sdk/component/api/record/SchemaProperty.java index 5411e928683db..3fba8403e4a8f 100644 --- a/component-api/src/main/java/org/talend/sdk/component/api/record/SchemaProperty.java +++ b/component-api/src/main/java/org/talend/sdk/component/api/record/SchemaProperty.java @@ -33,4 +33,6 @@ public interface SchemaProperty { String IS_UNIQUE = "field.unique"; + String ALLOW_SPECIAL_NAME = "field.special.name"; + } diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitor.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitor.java index 6f9db20f22115..fc7b4f3c3f0ff 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitor.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitor.java @@ -20,6 +20,7 @@ import static java.util.Optional.ofNullable; import static java.util.function.UnaryOperator.identity; import static java.util.stream.Collectors.toMap; +import static org.talend.sdk.component.api.record.SchemaProperty.ALLOW_SPECIAL_NAME; import static org.talend.sdk.component.api.record.SchemaProperty.IS_KEY; import static org.talend.sdk.component.api.record.SchemaProperty.PATTERN; import static org.talend.sdk.component.api.record.SchemaProperty.SCALE; @@ -131,6 +132,8 @@ public class DiRecordVisitor implements RecordVisitor { } } + private boolean allowSpecialName; + public Object visit(final Record record) { arrayOfRecordPrefix = ""; recordPrefix = ""; @@ -145,6 +148,8 @@ public Object visit(final Record record) { dynamic.getDynamic().clearColumnValues(); } if (hasDynamic && (recordFields == null)) { + allowSpecialName = Boolean.parseBoolean(record.getSchema().getProp(ALLOW_SPECIAL_NAME)); + recordFields = record.getSchema().getAllEntries().filter(t -> t.getType().equals(Type.RECORD)).map(rcdEntry -> { final String root = rcdEntry.getName() + "."; @@ -213,12 +218,19 @@ private void prefillDynamic(final Schema schema) { private DynamicMetadataWrapper generateMetadata(final Entry entry) { final DynamicMetadataWrapper metadata = new DynamicMetadataWrapper(); - metadata.getDynamicMetadata() - .setName(recordFields - .stream() - .filter(f -> f.endsWith("." + entry.getName())) - .findFirst() - .orElse(entry.getName())); + // now ALLOW_SPECIAL_NAME not conflict with the supported nested record as only jdbc connector use it and jdbc + // connector never support nested record + if (allowSpecialName) { + metadata.getDynamicMetadata() + .setName(entry.getOriginalFieldName()); + } else { + metadata.getDynamicMetadata() + .setName(recordFields + .stream() + .filter(f -> f.endsWith("." + entry.getName())) + .findFirst() + .orElse(entry.getName())); + } metadata.getDynamicMetadata().setDbName(entry.getOriginalFieldName()); metadata.getDynamicMetadata().setNullable(entry.isNullable()); metadata.getDynamicMetadata().setDescription(entry.getComment()); @@ -267,11 +279,16 @@ private DynamicMetadataWrapper generateMetadata(final Entry entry) { private void setField(final Entry entry, final Object value) { final Field field = fields.get(entry.getName()); if (hasDynamic && (field == null || dynamicColumn.equals(entry.getName()))) { - final String name = recordFields - .stream() - .filter(f -> f.endsWith("." + entry.getName())) - .findFirst() - .orElse(entry.getName()); + final String name; + if (allowSpecialName) { + name = entry.getOriginalFieldName(); + } else { + name = recordFields + .stream() + .filter(f -> f.endsWith("." + entry.getName())) + .findFirst() + .orElse(entry.getName()); + } int index = dynamic.getDynamic().getIndex(name); final DynamicMetadataWrapper metadata; if (index < 0) { diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitorTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitorTest.java index 422ae3ada41a3..49014479090ef 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitorTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitorTest.java @@ -39,6 +39,7 @@ import org.talend.sdk.component.api.record.Schema.Type; import org.talend.sdk.component.api.record.SchemaProperty; import org.talend.sdk.component.runtime.di.schema.StudioTypes; +import routines.system.Dynamic; class DiRecordVisitorTest extends VisitorsTest { @@ -358,6 +359,38 @@ void visitWithMeta() { Assertions.assertEquals("valueMeta", row.meta1); } + @Test + void testSpecialNameForDynamic() { + final Schema.Entry entry = factory.newEntryBuilder().withName("the$name").withType(Type.STRING).build(); + final Schema schemaAllSpecialName = factory.newSchemaBuilder(Type.RECORD) + .withEntry(entry) + .withProp(SchemaProperty.ALLOW_SPECIAL_NAME, "true") + .build(); + final Record record1 = factory + .newRecordBuilder(schemaAllSpecialName) + .with(entry, "") + .build(); + final DiRecordVisitor visitor1 = new DiRecordVisitor(RowStruct3.class, Collections.emptyMap()); + final RowStruct3 rowStruct1 = RowStruct3.class.cast(visitor1.visit(record1)); + assertNotNull(rowStruct1); + assertEquals("the$name", rowStruct1.dyn.getColumnMetadata(0).getName()); + assertEquals("the$name", rowStruct1.dyn.getColumnMetadata(0).getDbName()); + + final Schema schemaNotAllSpecialName = factory.newSchemaBuilder(Type.RECORD) + .withEntry(entry) + .build(); + final Record record2 = factory + .newRecordBuilder(schemaNotAllSpecialName) + .with(entry, "") + .build(); + final DiRecordVisitor visitor2 = new DiRecordVisitor(RowStruct3.class, Collections.emptyMap()); + final RowStruct3 rowStruct2 = RowStruct3.class.cast(visitor2.visit(record2)); + assertNotNull(rowStruct2); + assertEquals("the_name", rowStruct2.dyn.getColumnMetadata(0).getName()); + assertEquals("the$name", rowStruct2.dyn.getColumnMetadata(0).getDbName()); + + } + public static class RowStruct2 implements routines.system.IPersistableRow { public String field1; @@ -374,4 +407,18 @@ public void writeData(ObjectOutputStream objectOutputStream) { public void readData(ObjectInputStream objectInputStream) { } } + + public static class RowStruct3 implements routines.system.IPersistableRow { + + public Dynamic dyn; + + @Override + public void writeData(ObjectOutputStream objectOutputStream) { + } + + @Override + public void readData(ObjectInputStream objectInputStream) { + } + } + } \ No newline at end of file From d74460ef5b46b0c1d104ca379efdf68b182ce731 Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Thu, 14 Sep 2023 12:05:34 +0200 Subject: [PATCH 05/18] Revert "fix(TCOMP-2374): DIRecordVisitor to fill Studio Dynamic object's column name by tck Schema.Entry.getName which must follow tck name rule (#787)" (#790) This reverts commit 1a10e2dd3a9ee1f74b4ff21b53ef5cf90d228cba. --- .../component/api/record/SchemaProperty.java | 2 - .../runtime/di/record/DiRecordVisitor.java | 39 +++++---------- .../di/record/DiRecordVisitorTest.java | 47 ------------------- 3 files changed, 11 insertions(+), 77 deletions(-) diff --git a/component-api/src/main/java/org/talend/sdk/component/api/record/SchemaProperty.java b/component-api/src/main/java/org/talend/sdk/component/api/record/SchemaProperty.java index 3fba8403e4a8f..5411e928683db 100644 --- a/component-api/src/main/java/org/talend/sdk/component/api/record/SchemaProperty.java +++ b/component-api/src/main/java/org/talend/sdk/component/api/record/SchemaProperty.java @@ -33,6 +33,4 @@ public interface SchemaProperty { String IS_UNIQUE = "field.unique"; - String ALLOW_SPECIAL_NAME = "field.special.name"; - } diff --git a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitor.java b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitor.java index fc7b4f3c3f0ff..6f9db20f22115 100644 --- a/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitor.java +++ b/component-studio/component-runtime-di/src/main/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitor.java @@ -20,7 +20,6 @@ import static java.util.Optional.ofNullable; import static java.util.function.UnaryOperator.identity; import static java.util.stream.Collectors.toMap; -import static org.talend.sdk.component.api.record.SchemaProperty.ALLOW_SPECIAL_NAME; import static org.talend.sdk.component.api.record.SchemaProperty.IS_KEY; import static org.talend.sdk.component.api.record.SchemaProperty.PATTERN; import static org.talend.sdk.component.api.record.SchemaProperty.SCALE; @@ -132,8 +131,6 @@ public class DiRecordVisitor implements RecordVisitor { } } - private boolean allowSpecialName; - public Object visit(final Record record) { arrayOfRecordPrefix = ""; recordPrefix = ""; @@ -148,8 +145,6 @@ public Object visit(final Record record) { dynamic.getDynamic().clearColumnValues(); } if (hasDynamic && (recordFields == null)) { - allowSpecialName = Boolean.parseBoolean(record.getSchema().getProp(ALLOW_SPECIAL_NAME)); - recordFields = record.getSchema().getAllEntries().filter(t -> t.getType().equals(Type.RECORD)).map(rcdEntry -> { final String root = rcdEntry.getName() + "."; @@ -218,19 +213,12 @@ private void prefillDynamic(final Schema schema) { private DynamicMetadataWrapper generateMetadata(final Entry entry) { final DynamicMetadataWrapper metadata = new DynamicMetadataWrapper(); - // now ALLOW_SPECIAL_NAME not conflict with the supported nested record as only jdbc connector use it and jdbc - // connector never support nested record - if (allowSpecialName) { - metadata.getDynamicMetadata() - .setName(entry.getOriginalFieldName()); - } else { - metadata.getDynamicMetadata() - .setName(recordFields - .stream() - .filter(f -> f.endsWith("." + entry.getName())) - .findFirst() - .orElse(entry.getName())); - } + metadata.getDynamicMetadata() + .setName(recordFields + .stream() + .filter(f -> f.endsWith("." + entry.getName())) + .findFirst() + .orElse(entry.getName())); metadata.getDynamicMetadata().setDbName(entry.getOriginalFieldName()); metadata.getDynamicMetadata().setNullable(entry.isNullable()); metadata.getDynamicMetadata().setDescription(entry.getComment()); @@ -279,16 +267,11 @@ private DynamicMetadataWrapper generateMetadata(final Entry entry) { private void setField(final Entry entry, final Object value) { final Field field = fields.get(entry.getName()); if (hasDynamic && (field == null || dynamicColumn.equals(entry.getName()))) { - final String name; - if (allowSpecialName) { - name = entry.getOriginalFieldName(); - } else { - name = recordFields - .stream() - .filter(f -> f.endsWith("." + entry.getName())) - .findFirst() - .orElse(entry.getName()); - } + final String name = recordFields + .stream() + .filter(f -> f.endsWith("." + entry.getName())) + .findFirst() + .orElse(entry.getName()); int index = dynamic.getDynamic().getIndex(name); final DynamicMetadataWrapper metadata; if (index < 0) { diff --git a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitorTest.java b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitorTest.java index 49014479090ef..422ae3ada41a3 100644 --- a/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitorTest.java +++ b/component-studio/component-runtime-di/src/test/java/org/talend/sdk/component/runtime/di/record/DiRecordVisitorTest.java @@ -39,7 +39,6 @@ import org.talend.sdk.component.api.record.Schema.Type; import org.talend.sdk.component.api.record.SchemaProperty; import org.talend.sdk.component.runtime.di.schema.StudioTypes; -import routines.system.Dynamic; class DiRecordVisitorTest extends VisitorsTest { @@ -359,38 +358,6 @@ void visitWithMeta() { Assertions.assertEquals("valueMeta", row.meta1); } - @Test - void testSpecialNameForDynamic() { - final Schema.Entry entry = factory.newEntryBuilder().withName("the$name").withType(Type.STRING).build(); - final Schema schemaAllSpecialName = factory.newSchemaBuilder(Type.RECORD) - .withEntry(entry) - .withProp(SchemaProperty.ALLOW_SPECIAL_NAME, "true") - .build(); - final Record record1 = factory - .newRecordBuilder(schemaAllSpecialName) - .with(entry, "") - .build(); - final DiRecordVisitor visitor1 = new DiRecordVisitor(RowStruct3.class, Collections.emptyMap()); - final RowStruct3 rowStruct1 = RowStruct3.class.cast(visitor1.visit(record1)); - assertNotNull(rowStruct1); - assertEquals("the$name", rowStruct1.dyn.getColumnMetadata(0).getName()); - assertEquals("the$name", rowStruct1.dyn.getColumnMetadata(0).getDbName()); - - final Schema schemaNotAllSpecialName = factory.newSchemaBuilder(Type.RECORD) - .withEntry(entry) - .build(); - final Record record2 = factory - .newRecordBuilder(schemaNotAllSpecialName) - .with(entry, "") - .build(); - final DiRecordVisitor visitor2 = new DiRecordVisitor(RowStruct3.class, Collections.emptyMap()); - final RowStruct3 rowStruct2 = RowStruct3.class.cast(visitor2.visit(record2)); - assertNotNull(rowStruct2); - assertEquals("the_name", rowStruct2.dyn.getColumnMetadata(0).getName()); - assertEquals("the$name", rowStruct2.dyn.getColumnMetadata(0).getDbName()); - - } - public static class RowStruct2 implements routines.system.IPersistableRow { public String field1; @@ -407,18 +374,4 @@ public void writeData(ObjectOutputStream objectOutputStream) { public void readData(ObjectInputStream objectInputStream) { } } - - public static class RowStruct3 implements routines.system.IPersistableRow { - - public Dynamic dyn; - - @Override - public void writeData(ObjectOutputStream objectOutputStream) { - } - - @Override - public void readData(ObjectInputStream objectInputStream) { - } - } - } \ No newline at end of file From 79b1417f71babf1ab559944ad3758bb7c7584588 Mon Sep 17 00:00:00 2001 From: undx Date: Thu, 14 Sep 2023 12:06:46 +0200 Subject: [PATCH 06/18] chore(documentation): add changelog for 1.61.0 --- .../ROOT/pages/_partials/generated_changelog.adoc | 4 ++++ .../ROOT/pages/_partials/generated_contributors.adoc | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_changelog.adoc b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_changelog.adoc index 3796770e519d0..d584d51793b2e 100644 --- a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_changelog.adoc +++ b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_changelog.adoc @@ -5,11 +5,13 @@ === Bug - link:https://jira.talendforge.org/browse/TCOMP-2203[TCOMP-2203^]: API documentation correction and improvements link:search.html?query=documentation[documentation^,role='dockey'] +- link:https://jira.talendforge.org/browse/TCOMP-2520[TCOMP-2520^]: Date column read as Dynamic from File goes as Record:Schema.Type.STRING and no field.pattern passed to connector runtime class link:search.html?query=schema-record[schema-record^,role='dockey'] link:search.html?query=studio-integration[studio-integration^,role='dockey'] === Work Item +- link:https://jira.talendforge.org/browse/TCOMP-2375[TCOMP-2375^]: Improve performance on Schema/Record link:search.html?query=schema-record[schema-record^,role='dockey'] - link:https://jira.talendforge.org/browse/TCOMP-2525[TCOMP-2525^]: Upgrade netty to 4.1.97.Final - link:https://jira.talendforge.org/browse/TCOMP-2526[TCOMP-2526^]: Upgrade guava to 32.1.2-jre - link:https://jira.talendforge.org/browse/TCOMP-2527[TCOMP-2527^]: Upgrade tomcat to 9.0.80 link:search.html?query=component-server[component-server^,role='dockey'] @@ -852,6 +854,8 @@ + + diff --git a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc index e4b6acbe5adca..92c99a7d52d9c 100644 --- a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc +++ b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_contributors.adoc @@ -8,7 +8,7 @@ "name":"Romain Manni-Bucau" }, { - "commits":724, + "commits":726, "description":"Software engineer @Talend.\r\n\r\nComponents team member.\n\nBlog: undx.github.io", "gravatar":"https://avatars.githubusercontent.com/u/265575?v=4", "id":"undx", @@ -71,7 +71,7 @@ "name":"Chao MENG" }, { - "commits":19, + "commits":20, "description":"", "gravatar":"https://avatars.githubusercontent.com/u/7802267?v=4", "id":"wwang-talend", @@ -259,6 +259,13 @@ "id":"skermabon", "name":"Stéphane Kermabon" }, + { + "commits":1, + "description":"Drums, Java, Rock'n'Roll", + "gravatar":"https://avatars.githubusercontent.com/u/25642427?v=4", + "id":"dmytro-sylaiev", + "name":"Dmytro Sylaiev" + }, { "commits":1, "description":"", From a4eebf43ca4db2f6e8a89ed4ae1d52f6048fa1fc Mon Sep 17 00:00:00 2001 From: jenkins-git Date: Thu, 14 Sep 2023 12:11:31 +0000 Subject: [PATCH 07/18] [maven-release-plugin] prepare release component-runtime-1.61.0 --- bom/pom.xml | 4 ++-- component-api/pom.xml | 2 +- component-form/component-form-core/pom.xml | 2 +- component-form/component-form-model/pom.xml | 2 +- component-form/component-uispec-mapper/pom.xml | 2 +- component-form/pom.xml | 2 +- component-runtime-beam/pom.xml | 2 +- component-runtime-design-extension/pom.xml | 2 +- component-runtime-impl/pom.xml | 2 +- component-runtime-manager/pom.xml | 2 +- .../component-runtime-beam-junit/pom.xml | 2 +- .../component-runtime-http-junit/pom.xml | 2 +- .../component-runtime-junit-base/pom.xml | 2 +- component-runtime-testing/component-runtime-junit/pom.xml | 2 +- .../component-runtime-testing-spark/pom.xml | 2 +- component-runtime-testing/pom.xml | 2 +- component-server-parent/component-server-api/pom.xml | 2 +- component-server-parent/component-server-model/pom.xml | 2 +- component-server-parent/component-server/pom.xml | 2 +- .../extensions/component-server-extension-api/pom.xml | 2 +- component-server-parent/extensions/pom.xml | 2 +- component-server-parent/pom.xml | 2 +- component-spi/pom.xml | 2 +- component-starter-server/pom.xml | 2 +- component-studio/component-runtime-di/pom.xml | 2 +- component-studio/pom.xml | 2 +- component-tools-webapp/pom.xml | 2 +- component-tools/pom.xml | 2 +- container/container-core/pom.xml | 2 +- container/nested-maven-repository/pom.xml | 2 +- container/pom.xml | 2 +- documentation/pom.xml | 2 +- gradle-talend-component/pom.xml | 2 +- images/component-server-image/pom.xml | 2 +- images/component-starter-server-image/pom.xml | 2 +- images/pom.xml | 2 +- images/remote-engine-customizer-image/pom.xml | 2 +- pom.xml | 4 ++-- remote-engine-customizer/pom.xml | 2 +- reporting/pom.xml | 2 +- sample-parent/documentation-sample/activeif-component/pom.xml | 2 +- sample-parent/documentation-sample/checkbox-component/pom.xml | 2 +- sample-parent/documentation-sample/code-component/pom.xml | 2 +- .../documentation-sample/credentials-component/pom.xml | 2 +- .../datastorevalidation-component/pom.xml | 2 +- .../documentation-sample/dropdownlist-component/pom.xml | 2 +- sample-parent/documentation-sample/integer-component/pom.xml | 2 +- .../documentation-sample/minmaxvalidation-component/pom.xml | 2 +- .../documentation-sample/multiselect-component/pom.xml | 2 +- .../documentation-sample/patternvalidation-component/pom.xml | 2 +- sample-parent/documentation-sample/pom.xml | 2 +- .../documentation-sample/requiredvalidation-component/pom.xml | 2 +- .../documentation-sample/suggestions-component/pom.xml | 2 +- sample-parent/documentation-sample/table-component/pom.xml | 2 +- sample-parent/documentation-sample/textarea-component/pom.xml | 2 +- .../documentation-sample/textinput-component/pom.xml | 2 +- .../documentation-sample/updatable-component/pom.xml | 2 +- .../documentation-sample/urlvalidation-component/pom.xml | 2 +- sample-parent/pom.xml | 2 +- sample-parent/sample-beam/pom.xml | 2 +- sample-parent/sample-connector/pom.xml | 2 +- sample-parent/sample/pom.xml | 2 +- singer-parent/component-kitap/pom.xml | 2 +- singer-parent/pom.xml | 2 +- singer-parent/singer-java/pom.xml | 2 +- slf4j-standard/pom.xml | 2 +- talend-component-kit-intellij-plugin/pom.xml | 2 +- talend-component-maven-plugin/pom.xml | 2 +- vault-client/pom.xml | 2 +- 69 files changed, 71 insertions(+), 71 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 3e48110480fa6..379a113c2e1ad 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -18,7 +18,7 @@ org.talend.sdk.component component-bom - 1.61.0-SNAPSHOT + 1.61.0 pom Component BOM Talend Component Kit @@ -57,7 +57,7 @@ scm:git:git://github.com/talend/component-runtime.git scm:git:git@github.com:talend/component-runtime.git - HEAD + component-runtime-1.61.0 https://github.com/talend/component-runtime diff --git a/component-api/pom.xml b/component-api/pom.xml index 7ca42b428ea78..b8e533a25a88c 100644 --- a/component-api/pom.xml +++ b/component-api/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-api diff --git a/component-form/component-form-core/pom.xml b/component-form/component-form-core/pom.xml index 20741459ff06c..8f305b115d40e 100644 --- a/component-form/component-form-core/pom.xml +++ b/component-form/component-form-core/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-form - 1.61.0-SNAPSHOT + 1.61.0 component-form-core diff --git a/component-form/component-form-model/pom.xml b/component-form/component-form-model/pom.xml index cef9d41ad9167..578d587d97304 100644 --- a/component-form/component-form-model/pom.xml +++ b/component-form/component-form-model/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-form - 1.61.0-SNAPSHOT + 1.61.0 component-form-model diff --git a/component-form/component-uispec-mapper/pom.xml b/component-form/component-uispec-mapper/pom.xml index 821d8bf49bcd9..9adfb46dceb8b 100644 --- a/component-form/component-uispec-mapper/pom.xml +++ b/component-form/component-uispec-mapper/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-form - 1.61.0-SNAPSHOT + 1.61.0 component-uispec-mapper diff --git a/component-form/pom.xml b/component-form/pom.xml index 7fa7e0fde7902..41add5a7d630a 100644 --- a/component-form/pom.xml +++ b/component-form/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-form diff --git a/component-runtime-beam/pom.xml b/component-runtime-beam/pom.xml index c43d07f2cc14e..2959d9188e04d 100644 --- a/component-runtime-beam/pom.xml +++ b/component-runtime-beam/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-runtime-beam diff --git a/component-runtime-design-extension/pom.xml b/component-runtime-design-extension/pom.xml index 10ae3af4aee6c..2e613838a9b03 100644 --- a/component-runtime-design-extension/pom.xml +++ b/component-runtime-design-extension/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-runtime-design-extension diff --git a/component-runtime-impl/pom.xml b/component-runtime-impl/pom.xml index 106cf7cc69b37..a41f22cb456f1 100644 --- a/component-runtime-impl/pom.xml +++ b/component-runtime-impl/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-runtime-impl diff --git a/component-runtime-manager/pom.xml b/component-runtime-manager/pom.xml index 6a5274264f5c3..5c94075e54234 100644 --- a/component-runtime-manager/pom.xml +++ b/component-runtime-manager/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-runtime-manager diff --git a/component-runtime-testing/component-runtime-beam-junit/pom.xml b/component-runtime-testing/component-runtime-beam-junit/pom.xml index 764d9bd9ca17b..5833bef3f727f 100644 --- a/component-runtime-testing/component-runtime-beam-junit/pom.xml +++ b/component-runtime-testing/component-runtime-beam-junit/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime-testing - 1.61.0-SNAPSHOT + 1.61.0 component-runtime-beam-junit diff --git a/component-runtime-testing/component-runtime-http-junit/pom.xml b/component-runtime-testing/component-runtime-http-junit/pom.xml index b7990055cd0fa..136bcf8f29ab0 100644 --- a/component-runtime-testing/component-runtime-http-junit/pom.xml +++ b/component-runtime-testing/component-runtime-http-junit/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime-testing - 1.61.0-SNAPSHOT + 1.61.0 component-runtime-http-junit diff --git a/component-runtime-testing/component-runtime-junit-base/pom.xml b/component-runtime-testing/component-runtime-junit-base/pom.xml index 0b37019a92d2b..1bfe32facc62f 100644 --- a/component-runtime-testing/component-runtime-junit-base/pom.xml +++ b/component-runtime-testing/component-runtime-junit-base/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime-testing - 1.61.0-SNAPSHOT + 1.61.0 component-runtime-junit-base diff --git a/component-runtime-testing/component-runtime-junit/pom.xml b/component-runtime-testing/component-runtime-junit/pom.xml index 0df984a70d800..a4bff22b993a5 100644 --- a/component-runtime-testing/component-runtime-junit/pom.xml +++ b/component-runtime-testing/component-runtime-junit/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime-testing - 1.61.0-SNAPSHOT + 1.61.0 component-runtime-junit diff --git a/component-runtime-testing/component-runtime-testing-spark/pom.xml b/component-runtime-testing/component-runtime-testing-spark/pom.xml index c437a39e547f4..2b07545fcc68d 100644 --- a/component-runtime-testing/component-runtime-testing-spark/pom.xml +++ b/component-runtime-testing/component-runtime-testing-spark/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime-testing - 1.61.0-SNAPSHOT + 1.61.0 component-runtime-testing-spark diff --git a/component-runtime-testing/pom.xml b/component-runtime-testing/pom.xml index a69a2eb035cf6..6b903a52ababa 100644 --- a/component-runtime-testing/pom.xml +++ b/component-runtime-testing/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-runtime-testing diff --git a/component-server-parent/component-server-api/pom.xml b/component-server-parent/component-server-api/pom.xml index 30e620ed65021..3d729d24900d0 100644 --- a/component-server-parent/component-server-api/pom.xml +++ b/component-server-parent/component-server-api/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-server-parent - 1.61.0-SNAPSHOT + 1.61.0 component-server-api diff --git a/component-server-parent/component-server-model/pom.xml b/component-server-parent/component-server-model/pom.xml index 9117632b5f15e..be60d76a61eed 100644 --- a/component-server-parent/component-server-model/pom.xml +++ b/component-server-parent/component-server-model/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-server-parent - 1.61.0-SNAPSHOT + 1.61.0 component-server-model diff --git a/component-server-parent/component-server/pom.xml b/component-server-parent/component-server/pom.xml index f3ab3923cf247..c91b85f33d1dc 100644 --- a/component-server-parent/component-server/pom.xml +++ b/component-server-parent/component-server/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-server-parent - 1.61.0-SNAPSHOT + 1.61.0 component-server diff --git a/component-server-parent/extensions/component-server-extension-api/pom.xml b/component-server-parent/extensions/component-server-extension-api/pom.xml index a8fbdebc20d9b..e53e611cc1271 100644 --- a/component-server-parent/extensions/component-server-extension-api/pom.xml +++ b/component-server-parent/extensions/component-server-extension-api/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component extensions - 1.61.0-SNAPSHOT + 1.61.0 component-server-extension-api diff --git a/component-server-parent/extensions/pom.xml b/component-server-parent/extensions/pom.xml index e7f58a083f31d..7a7cb311058ca 100644 --- a/component-server-parent/extensions/pom.xml +++ b/component-server-parent/extensions/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-server-parent - 1.61.0-SNAPSHOT + 1.61.0 extensions diff --git a/component-server-parent/pom.xml b/component-server-parent/pom.xml index 289afb8724cf7..4536bf13c27a0 100644 --- a/component-server-parent/pom.xml +++ b/component-server-parent/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-server-parent diff --git a/component-spi/pom.xml b/component-spi/pom.xml index 2fa345a6e93bc..e3ba6c91d1a2c 100644 --- a/component-spi/pom.xml +++ b/component-spi/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-spi diff --git a/component-starter-server/pom.xml b/component-starter-server/pom.xml index 8797dcfd0609e..d362fe7848ef1 100644 --- a/component-starter-server/pom.xml +++ b/component-starter-server/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-starter-server diff --git a/component-studio/component-runtime-di/pom.xml b/component-studio/component-runtime-di/pom.xml index d4fc869b7eddf..d14ad23ed25c6 100644 --- a/component-studio/component-runtime-di/pom.xml +++ b/component-studio/component-runtime-di/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-studio - 1.61.0-SNAPSHOT + 1.61.0 component-runtime-di diff --git a/component-studio/pom.xml b/component-studio/pom.xml index 2b86d64fec659..de427ed8a2c77 100644 --- a/component-studio/pom.xml +++ b/component-studio/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-studio diff --git a/component-tools-webapp/pom.xml b/component-tools-webapp/pom.xml index 9a3501b9d1cd7..735ad96e23408 100644 --- a/component-tools-webapp/pom.xml +++ b/component-tools-webapp/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-tools-webapp diff --git a/component-tools/pom.xml b/component-tools/pom.xml index 1334152b29af3..d5383376efe3b 100644 --- a/component-tools/pom.xml +++ b/component-tools/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 component-tools diff --git a/container/container-core/pom.xml b/container/container-core/pom.xml index 56ed23cd1f479..3f1139b85492f 100644 --- a/container/container-core/pom.xml +++ b/container/container-core/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component container - 1.61.0-SNAPSHOT + 1.61.0 container-core diff --git a/container/nested-maven-repository/pom.xml b/container/nested-maven-repository/pom.xml index ec169320f1376..f1229f1d1497d 100644 --- a/container/nested-maven-repository/pom.xml +++ b/container/nested-maven-repository/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component container - 1.61.0-SNAPSHOT + 1.61.0 nested-maven-repository diff --git a/container/pom.xml b/container/pom.xml index 4495451abe888..ff41b1a04b007 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 container diff --git a/documentation/pom.xml b/documentation/pom.xml index 7d6ca0a409727..4d077b68897d2 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 documentation diff --git a/gradle-talend-component/pom.xml b/gradle-talend-component/pom.xml index dad1aa4954873..c669ae1dc0d10 100644 --- a/gradle-talend-component/pom.xml +++ b/gradle-talend-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 gradle-talend-component diff --git a/images/component-server-image/pom.xml b/images/component-server-image/pom.xml index 6809dbe7f0e9e..e3295dfb11e12 100644 --- a/images/component-server-image/pom.xml +++ b/images/component-server-image/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component images - 1.61.0-SNAPSHOT + 1.61.0 component-server-image diff --git a/images/component-starter-server-image/pom.xml b/images/component-starter-server-image/pom.xml index 1a4353c5092ec..576626535f2da 100644 --- a/images/component-starter-server-image/pom.xml +++ b/images/component-starter-server-image/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component images - 1.61.0-SNAPSHOT + 1.61.0 component-starter-server-image diff --git a/images/pom.xml b/images/pom.xml index c9d70f37042de..ecd6c8696c6c9 100644 --- a/images/pom.xml +++ b/images/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 images diff --git a/images/remote-engine-customizer-image/pom.xml b/images/remote-engine-customizer-image/pom.xml index b0bfafce109b7..ee67d757d6c62 100644 --- a/images/remote-engine-customizer-image/pom.xml +++ b/images/remote-engine-customizer-image/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component images - 1.61.0-SNAPSHOT + 1.61.0 remote-engine-customizer-image diff --git a/pom.xml b/pom.xml index 52e72c2401ce0..dddbfe8af6202 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 pom Component Runtime @@ -133,7 +133,7 @@ scm:git:git://github.com/talend/component-runtime.git scm:git:git@github.com:talend/component-runtime.git - HEAD + component-runtime-1.61.0 https://github.com/talend/component-runtime diff --git a/remote-engine-customizer/pom.xml b/remote-engine-customizer/pom.xml index 2e10006509070..beadd0447d0a7 100644 --- a/remote-engine-customizer/pom.xml +++ b/remote-engine-customizer/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 remote-engine-customizer diff --git a/reporting/pom.xml b/reporting/pom.xml index 7fd592bc1b64a..3152ad92d5cdd 100644 --- a/reporting/pom.xml +++ b/reporting/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 reporting diff --git a/sample-parent/documentation-sample/activeif-component/pom.xml b/sample-parent/documentation-sample/activeif-component/pom.xml index d5894df02c3ec..31bccf00d677f 100644 --- a/sample-parent/documentation-sample/activeif-component/pom.xml +++ b/sample-parent/documentation-sample/activeif-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 activeif-component diff --git a/sample-parent/documentation-sample/checkbox-component/pom.xml b/sample-parent/documentation-sample/checkbox-component/pom.xml index 461802f0ad638..7d7b0f898cdee 100644 --- a/sample-parent/documentation-sample/checkbox-component/pom.xml +++ b/sample-parent/documentation-sample/checkbox-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 checkbox-component diff --git a/sample-parent/documentation-sample/code-component/pom.xml b/sample-parent/documentation-sample/code-component/pom.xml index 0d08debba5048..f04346345cc1c 100644 --- a/sample-parent/documentation-sample/code-component/pom.xml +++ b/sample-parent/documentation-sample/code-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 code-component diff --git a/sample-parent/documentation-sample/credentials-component/pom.xml b/sample-parent/documentation-sample/credentials-component/pom.xml index cd3e4c4032947..2885a139a8fbd 100644 --- a/sample-parent/documentation-sample/credentials-component/pom.xml +++ b/sample-parent/documentation-sample/credentials-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 credentials-component diff --git a/sample-parent/documentation-sample/datastorevalidation-component/pom.xml b/sample-parent/documentation-sample/datastorevalidation-component/pom.xml index db66fc5c442c7..ebfa1d595f1bb 100644 --- a/sample-parent/documentation-sample/datastorevalidation-component/pom.xml +++ b/sample-parent/documentation-sample/datastorevalidation-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 datastorevalidation-component diff --git a/sample-parent/documentation-sample/dropdownlist-component/pom.xml b/sample-parent/documentation-sample/dropdownlist-component/pom.xml index 6240c57864bb7..99a0a0eaa289e 100644 --- a/sample-parent/documentation-sample/dropdownlist-component/pom.xml +++ b/sample-parent/documentation-sample/dropdownlist-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 dropdownlist-component diff --git a/sample-parent/documentation-sample/integer-component/pom.xml b/sample-parent/documentation-sample/integer-component/pom.xml index 7807ba29e5121..b98184b605894 100644 --- a/sample-parent/documentation-sample/integer-component/pom.xml +++ b/sample-parent/documentation-sample/integer-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 integer-component diff --git a/sample-parent/documentation-sample/minmaxvalidation-component/pom.xml b/sample-parent/documentation-sample/minmaxvalidation-component/pom.xml index ac6c5347afa35..816e3c3cdab1b 100644 --- a/sample-parent/documentation-sample/minmaxvalidation-component/pom.xml +++ b/sample-parent/documentation-sample/minmaxvalidation-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 minmaxvalidation-component diff --git a/sample-parent/documentation-sample/multiselect-component/pom.xml b/sample-parent/documentation-sample/multiselect-component/pom.xml index 01b0f22d31530..ea3a9587865eb 100644 --- a/sample-parent/documentation-sample/multiselect-component/pom.xml +++ b/sample-parent/documentation-sample/multiselect-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 multiselect-component diff --git a/sample-parent/documentation-sample/patternvalidation-component/pom.xml b/sample-parent/documentation-sample/patternvalidation-component/pom.xml index 86cc8e49f95bd..f9dd775177102 100644 --- a/sample-parent/documentation-sample/patternvalidation-component/pom.xml +++ b/sample-parent/documentation-sample/patternvalidation-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 patternvalidation-component diff --git a/sample-parent/documentation-sample/pom.xml b/sample-parent/documentation-sample/pom.xml index fa1cc8fbdfd8b..a1a7b91b16215 100644 --- a/sample-parent/documentation-sample/pom.xml +++ b/sample-parent/documentation-sample/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component sample-parent - 1.61.0-SNAPSHOT + 1.61.0 documentation-sample diff --git a/sample-parent/documentation-sample/requiredvalidation-component/pom.xml b/sample-parent/documentation-sample/requiredvalidation-component/pom.xml index d13e16d48a970..488f91949ac2c 100644 --- a/sample-parent/documentation-sample/requiredvalidation-component/pom.xml +++ b/sample-parent/documentation-sample/requiredvalidation-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 requiredvalidation-component diff --git a/sample-parent/documentation-sample/suggestions-component/pom.xml b/sample-parent/documentation-sample/suggestions-component/pom.xml index e2a12b6b59523..4818aa7a3d39b 100644 --- a/sample-parent/documentation-sample/suggestions-component/pom.xml +++ b/sample-parent/documentation-sample/suggestions-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 suggestions-component diff --git a/sample-parent/documentation-sample/table-component/pom.xml b/sample-parent/documentation-sample/table-component/pom.xml index 009fa0160cfbe..cfe4d51cac045 100644 --- a/sample-parent/documentation-sample/table-component/pom.xml +++ b/sample-parent/documentation-sample/table-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 table-component diff --git a/sample-parent/documentation-sample/textarea-component/pom.xml b/sample-parent/documentation-sample/textarea-component/pom.xml index eeeb224b04f6f..8ea49adfd134b 100644 --- a/sample-parent/documentation-sample/textarea-component/pom.xml +++ b/sample-parent/documentation-sample/textarea-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 textarea-component diff --git a/sample-parent/documentation-sample/textinput-component/pom.xml b/sample-parent/documentation-sample/textinput-component/pom.xml index d8e549f3e5fc6..df4c4bfccf457 100644 --- a/sample-parent/documentation-sample/textinput-component/pom.xml +++ b/sample-parent/documentation-sample/textinput-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 textinput-component diff --git a/sample-parent/documentation-sample/updatable-component/pom.xml b/sample-parent/documentation-sample/updatable-component/pom.xml index 05da3fcc8ad5f..8c9392ec42561 100644 --- a/sample-parent/documentation-sample/updatable-component/pom.xml +++ b/sample-parent/documentation-sample/updatable-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 updatable-component diff --git a/sample-parent/documentation-sample/urlvalidation-component/pom.xml b/sample-parent/documentation-sample/urlvalidation-component/pom.xml index c95462914c7f7..88067024f4150 100644 --- a/sample-parent/documentation-sample/urlvalidation-component/pom.xml +++ b/sample-parent/documentation-sample/urlvalidation-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0-SNAPSHOT + 1.61.0 urlvalidation-component diff --git a/sample-parent/pom.xml b/sample-parent/pom.xml index 1edf766fabf38..74685e68d8bbc 100644 --- a/sample-parent/pom.xml +++ b/sample-parent/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 sample-parent diff --git a/sample-parent/sample-beam/pom.xml b/sample-parent/sample-beam/pom.xml index ce4374cab9f86..d23e5c24a8928 100644 --- a/sample-parent/sample-beam/pom.xml +++ b/sample-parent/sample-beam/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component sample-parent - 1.61.0-SNAPSHOT + 1.61.0 sample-beam diff --git a/sample-parent/sample-connector/pom.xml b/sample-parent/sample-connector/pom.xml index ed116ef47c9db..f382a53a765bf 100644 --- a/sample-parent/sample-connector/pom.xml +++ b/sample-parent/sample-connector/pom.xml @@ -20,7 +20,7 @@ org.talend.sdk.component sample-parent - 1.61.0-SNAPSHOT + 1.61.0 sample-connector diff --git a/sample-parent/sample/pom.xml b/sample-parent/sample/pom.xml index de6a14f8d7045..ccf0834621b0b 100644 --- a/sample-parent/sample/pom.xml +++ b/sample-parent/sample/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component sample-parent - 1.61.0-SNAPSHOT + 1.61.0 sample diff --git a/singer-parent/component-kitap/pom.xml b/singer-parent/component-kitap/pom.xml index 497e57c9ff1b4..e69a668ca9ebe 100644 --- a/singer-parent/component-kitap/pom.xml +++ b/singer-parent/component-kitap/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component singer-parent - 1.61.0-SNAPSHOT + 1.61.0 component-kitap diff --git a/singer-parent/pom.xml b/singer-parent/pom.xml index f49696f4db204..ae34248d92650 100644 --- a/singer-parent/pom.xml +++ b/singer-parent/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 singer-parent diff --git a/singer-parent/singer-java/pom.xml b/singer-parent/singer-java/pom.xml index fa9d3399631d9..92e7d02d13881 100644 --- a/singer-parent/singer-java/pom.xml +++ b/singer-parent/singer-java/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component singer-parent - 1.61.0-SNAPSHOT + 1.61.0 singer-java diff --git a/slf4j-standard/pom.xml b/slf4j-standard/pom.xml index a9b6c4050f8d7..9381f7615c0ba 100644 --- a/slf4j-standard/pom.xml +++ b/slf4j-standard/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 slf4j-standard diff --git a/talend-component-kit-intellij-plugin/pom.xml b/talend-component-kit-intellij-plugin/pom.xml index 80a69833e1dee..a5592155c9dcc 100644 --- a/talend-component-kit-intellij-plugin/pom.xml +++ b/talend-component-kit-intellij-plugin/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 talend-component-kit-intellij-plugin diff --git a/talend-component-maven-plugin/pom.xml b/talend-component-maven-plugin/pom.xml index 14218dcbae393..214ec38ac4f68 100644 --- a/talend-component-maven-plugin/pom.xml +++ b/talend-component-maven-plugin/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 talend-component-maven-plugin diff --git a/vault-client/pom.xml b/vault-client/pom.xml index 6762173e8a874..9a64c5953baf3 100644 --- a/vault-client/pom.xml +++ b/vault-client/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0-SNAPSHOT + 1.61.0 vault-client From 43ecb053bde7c4846ca7e7c3e6cd54163dc65a17 Mon Sep 17 00:00:00 2001 From: jenkins-git Date: Thu, 14 Sep 2023 12:11:31 +0000 Subject: [PATCH 08/18] [maven-release-plugin] prepare for next development iteration --- bom/pom.xml | 4 +- component-api/pom.xml | 2 +- component-form/component-form-core/pom.xml | 2 +- component-form/component-form-model/pom.xml | 2 +- .../component-uispec-mapper/pom.xml | 2 +- component-form/pom.xml | 2 +- component-runtime-beam/pom.xml | 4 +- component-runtime-design-extension/pom.xml | 2 +- component-runtime-impl/pom.xml | 2 +- component-runtime-manager/pom.xml | 4 +- .../component-runtime-beam-junit/pom.xml | 2 +- .../component-runtime-http-junit/pom.xml | 4 +- .../component-runtime-junit-base/pom.xml | 2 +- .../component-runtime-junit/pom.xml | 2 +- .../component-runtime-testing-spark/pom.xml | 2 +- component-runtime-testing/pom.xml | 2 +- .../component-server-api/pom.xml | 2 +- .../component-server-model/pom.xml | 2 +- .../component-server/pom.xml | 4 +- .../component-server-extension-api/pom.xml | 2 +- component-server-parent/extensions/pom.xml | 2 +- component-server-parent/pom.xml | 2 +- component-spi/pom.xml | 2 +- component-starter-server/pom.xml | 4 +- component-studio/component-runtime-di/pom.xml | 2 +- component-studio/pom.xml | 2 +- component-tools-webapp/pom.xml | 4 +- component-tools/pom.xml | 2 +- container/container-core/pom.xml | 2 +- container/nested-maven-repository/pom.xml | 2 +- container/pom.xml | 2 +- documentation/pom.xml | 14 +-- gradle-talend-component/pom.xml | 2 +- images/component-server-image/pom.xml | 2 +- images/component-starter-server-image/pom.xml | 2 +- images/pom.xml | 2 +- images/remote-engine-customizer-image/pom.xml | 2 +- pom.xml | 98 +++++++++---------- remote-engine-customizer/pom.xml | 2 +- reporting/pom.xml | 2 +- .../activeif-component/pom.xml | 2 +- .../checkbox-component/pom.xml | 2 +- .../code-component/pom.xml | 2 +- .../credentials-component/pom.xml | 2 +- .../datastorevalidation-component/pom.xml | 2 +- .../dropdownlist-component/pom.xml | 2 +- .../integer-component/pom.xml | 2 +- .../minmaxvalidation-component/pom.xml | 2 +- .../multiselect-component/pom.xml | 2 +- .../patternvalidation-component/pom.xml | 2 +- sample-parent/documentation-sample/pom.xml | 2 +- .../requiredvalidation-component/pom.xml | 2 +- .../suggestions-component/pom.xml | 2 +- .../table-component/pom.xml | 2 +- .../textarea-component/pom.xml | 2 +- .../textinput-component/pom.xml | 2 +- .../updatable-component/pom.xml | 2 +- .../urlvalidation-component/pom.xml | 2 +- sample-parent/pom.xml | 4 +- sample-parent/sample-beam/pom.xml | 4 +- sample-parent/sample-connector/pom.xml | 2 +- sample-parent/sample/pom.xml | 4 +- singer-parent/component-kitap/pom.xml | 4 +- singer-parent/pom.xml | 2 +- singer-parent/singer-java/pom.xml | 2 +- slf4j-standard/pom.xml | 2 +- talend-component-kit-intellij-plugin/pom.xml | 2 +- talend-component-maven-plugin/pom.xml | 2 +- vault-client/pom.xml | 2 +- 69 files changed, 134 insertions(+), 134 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 379a113c2e1ad..1e932dc0f0d0b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -18,7 +18,7 @@ org.talend.sdk.component component-bom - 1.61.0 + 1.62.0-SNAPSHOT pom Component BOM Talend Component Kit @@ -57,7 +57,7 @@ scm:git:git://github.com/talend/component-runtime.git scm:git:git@github.com:talend/component-runtime.git - component-runtime-1.61.0 + HEAD https://github.com/talend/component-runtime diff --git a/component-api/pom.xml b/component-api/pom.xml index b8e533a25a88c..33afe99dd216f 100644 --- a/component-api/pom.xml +++ b/component-api/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-api diff --git a/component-form/component-form-core/pom.xml b/component-form/component-form-core/pom.xml index 8f305b115d40e..328992fb2128c 100644 --- a/component-form/component-form-core/pom.xml +++ b/component-form/component-form-core/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-form - 1.61.0 + 1.62.0-SNAPSHOT component-form-core diff --git a/component-form/component-form-model/pom.xml b/component-form/component-form-model/pom.xml index 578d587d97304..d1a7b4f5acccc 100644 --- a/component-form/component-form-model/pom.xml +++ b/component-form/component-form-model/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-form - 1.61.0 + 1.62.0-SNAPSHOT component-form-model diff --git a/component-form/component-uispec-mapper/pom.xml b/component-form/component-uispec-mapper/pom.xml index 9adfb46dceb8b..a6bdbe1b0e8c9 100644 --- a/component-form/component-uispec-mapper/pom.xml +++ b/component-form/component-uispec-mapper/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-form - 1.61.0 + 1.62.0-SNAPSHOT component-uispec-mapper diff --git a/component-form/pom.xml b/component-form/pom.xml index 41add5a7d630a..6bf3d258a96d2 100644 --- a/component-form/pom.xml +++ b/component-form/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-form diff --git a/component-runtime-beam/pom.xml b/component-runtime-beam/pom.xml index 2959d9188e04d..82180046071f3 100644 --- a/component-runtime-beam/pom.xml +++ b/component-runtime-beam/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-runtime-beam @@ -206,7 +206,7 @@ - + diff --git a/component-runtime-design-extension/pom.xml b/component-runtime-design-extension/pom.xml index 2e613838a9b03..453da7158b7ce 100644 --- a/component-runtime-design-extension/pom.xml +++ b/component-runtime-design-extension/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-runtime-design-extension diff --git a/component-runtime-impl/pom.xml b/component-runtime-impl/pom.xml index a41f22cb456f1..af84c4842c1b5 100644 --- a/component-runtime-impl/pom.xml +++ b/component-runtime-impl/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-runtime-impl diff --git a/component-runtime-manager/pom.xml b/component-runtime-manager/pom.xml index 5c94075e54234..953ee9137d1e6 100644 --- a/component-runtime-manager/pom.xml +++ b/component-runtime-manager/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-runtime-manager @@ -179,7 +179,7 @@ - + diff --git a/component-runtime-testing/component-runtime-beam-junit/pom.xml b/component-runtime-testing/component-runtime-beam-junit/pom.xml index 5833bef3f727f..feefc02f7eee7 100644 --- a/component-runtime-testing/component-runtime-beam-junit/pom.xml +++ b/component-runtime-testing/component-runtime-beam-junit/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime-testing - 1.61.0 + 1.62.0-SNAPSHOT component-runtime-beam-junit diff --git a/component-runtime-testing/component-runtime-http-junit/pom.xml b/component-runtime-testing/component-runtime-http-junit/pom.xml index 136bcf8f29ab0..86dc6f2e89a9f 100644 --- a/component-runtime-testing/component-runtime-http-junit/pom.xml +++ b/component-runtime-testing/component-runtime-http-junit/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime-testing - 1.61.0 + 1.62.0-SNAPSHOT component-runtime-http-junit @@ -171,7 +171,7 @@ false - + diff --git a/component-runtime-testing/component-runtime-junit-base/pom.xml b/component-runtime-testing/component-runtime-junit-base/pom.xml index 1bfe32facc62f..c9e6a1e9b69f6 100644 --- a/component-runtime-testing/component-runtime-junit-base/pom.xml +++ b/component-runtime-testing/component-runtime-junit-base/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime-testing - 1.61.0 + 1.62.0-SNAPSHOT component-runtime-junit-base diff --git a/component-runtime-testing/component-runtime-junit/pom.xml b/component-runtime-testing/component-runtime-junit/pom.xml index a4bff22b993a5..c806a51dda266 100644 --- a/component-runtime-testing/component-runtime-junit/pom.xml +++ b/component-runtime-testing/component-runtime-junit/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime-testing - 1.61.0 + 1.62.0-SNAPSHOT component-runtime-junit diff --git a/component-runtime-testing/component-runtime-testing-spark/pom.xml b/component-runtime-testing/component-runtime-testing-spark/pom.xml index 2b07545fcc68d..a6aace10fc260 100644 --- a/component-runtime-testing/component-runtime-testing-spark/pom.xml +++ b/component-runtime-testing/component-runtime-testing-spark/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime-testing - 1.61.0 + 1.62.0-SNAPSHOT component-runtime-testing-spark diff --git a/component-runtime-testing/pom.xml b/component-runtime-testing/pom.xml index 6b903a52ababa..b422e3617ef54 100644 --- a/component-runtime-testing/pom.xml +++ b/component-runtime-testing/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-runtime-testing diff --git a/component-server-parent/component-server-api/pom.xml b/component-server-parent/component-server-api/pom.xml index 3d729d24900d0..51a8a0cd032fc 100644 --- a/component-server-parent/component-server-api/pom.xml +++ b/component-server-parent/component-server-api/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-server-parent - 1.61.0 + 1.62.0-SNAPSHOT component-server-api diff --git a/component-server-parent/component-server-model/pom.xml b/component-server-parent/component-server-model/pom.xml index be60d76a61eed..01a0e0977259f 100644 --- a/component-server-parent/component-server-model/pom.xml +++ b/component-server-parent/component-server-model/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-server-parent - 1.61.0 + 1.62.0-SNAPSHOT component-server-model diff --git a/component-server-parent/component-server/pom.xml b/component-server-parent/component-server/pom.xml index c91b85f33d1dc..4b74a4ff0c411 100644 --- a/component-server-parent/component-server/pom.xml +++ b/component-server-parent/component-server/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-server-parent - 1.61.0 + 1.62.0-SNAPSHOT component-server @@ -376,7 +376,7 @@ - + diff --git a/component-server-parent/extensions/component-server-extension-api/pom.xml b/component-server-parent/extensions/component-server-extension-api/pom.xml index e53e611cc1271..199b62343c058 100644 --- a/component-server-parent/extensions/component-server-extension-api/pom.xml +++ b/component-server-parent/extensions/component-server-extension-api/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component extensions - 1.61.0 + 1.62.0-SNAPSHOT component-server-extension-api diff --git a/component-server-parent/extensions/pom.xml b/component-server-parent/extensions/pom.xml index 7a7cb311058ca..02a2d72227d36 100644 --- a/component-server-parent/extensions/pom.xml +++ b/component-server-parent/extensions/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-server-parent - 1.61.0 + 1.62.0-SNAPSHOT extensions diff --git a/component-server-parent/pom.xml b/component-server-parent/pom.xml index 4536bf13c27a0..e1b30400d3826 100644 --- a/component-server-parent/pom.xml +++ b/component-server-parent/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-server-parent diff --git a/component-spi/pom.xml b/component-spi/pom.xml index e3ba6c91d1a2c..69a17a673093a 100644 --- a/component-spi/pom.xml +++ b/component-spi/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-spi diff --git a/component-starter-server/pom.xml b/component-starter-server/pom.xml index d362fe7848ef1..364545388defd 100644 --- a/component-starter-server/pom.xml +++ b/component-starter-server/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-starter-server @@ -335,7 +335,7 @@ npm - + start diff --git a/component-studio/component-runtime-di/pom.xml b/component-studio/component-runtime-di/pom.xml index d14ad23ed25c6..c79df2be1150d 100644 --- a/component-studio/component-runtime-di/pom.xml +++ b/component-studio/component-runtime-di/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-studio - 1.61.0 + 1.62.0-SNAPSHOT component-runtime-di diff --git a/component-studio/pom.xml b/component-studio/pom.xml index de427ed8a2c77..96de6a3624bf6 100644 --- a/component-studio/pom.xml +++ b/component-studio/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-studio diff --git a/component-tools-webapp/pom.xml b/component-tools-webapp/pom.xml index 735ad96e23408..597e0063904a2 100644 --- a/component-tools-webapp/pom.xml +++ b/component-tools-webapp/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-tools-webapp @@ -169,7 +169,7 @@ npm - + run watch diff --git a/component-tools/pom.xml b/component-tools/pom.xml index d5383376efe3b..b2261282f6d8f 100644 --- a/component-tools/pom.xml +++ b/component-tools/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT component-tools diff --git a/container/container-core/pom.xml b/container/container-core/pom.xml index 3f1139b85492f..e700a7ebdfb4b 100644 --- a/container/container-core/pom.xml +++ b/container/container-core/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component container - 1.61.0 + 1.62.0-SNAPSHOT container-core diff --git a/container/nested-maven-repository/pom.xml b/container/nested-maven-repository/pom.xml index f1229f1d1497d..d768d61f5b304 100644 --- a/container/nested-maven-repository/pom.xml +++ b/container/nested-maven-repository/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component container - 1.61.0 + 1.62.0-SNAPSHOT nested-maven-repository diff --git a/container/pom.xml b/container/pom.xml index ff41b1a04b007..3a7996472c048 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT container diff --git a/documentation/pom.xml b/documentation/pom.xml index 4d077b68897d2..8493c9a4fa08e 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT documentation @@ -586,7 +586,7 @@ npm - + ${component.front.build.skip} run antora:${antora.dev.site.mode} @@ -758,11 +758,11 @@ talend ${project.basedir}/src/main/asciidoctor/pdf/theme ${project.build.directory}/build-dependencies/asciidoctorj-pdf/gems/asciidoctor-pdf-${asciidoctor-pdf-gem.version}/data/fonts - - - - - + + + + + font fa - diff --git a/gradle-talend-component/pom.xml b/gradle-talend-component/pom.xml index c669ae1dc0d10..9b0bc4435b476 100644 --- a/gradle-talend-component/pom.xml +++ b/gradle-talend-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT gradle-talend-component diff --git a/images/component-server-image/pom.xml b/images/component-server-image/pom.xml index e3295dfb11e12..8130aef079d55 100644 --- a/images/component-server-image/pom.xml +++ b/images/component-server-image/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component images - 1.61.0 + 1.62.0-SNAPSHOT component-server-image diff --git a/images/component-starter-server-image/pom.xml b/images/component-starter-server-image/pom.xml index 576626535f2da..9e41760695039 100644 --- a/images/component-starter-server-image/pom.xml +++ b/images/component-starter-server-image/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component images - 1.61.0 + 1.62.0-SNAPSHOT component-starter-server-image diff --git a/images/pom.xml b/images/pom.xml index ecd6c8696c6c9..0c2850d23a77f 100644 --- a/images/pom.xml +++ b/images/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT images diff --git a/images/remote-engine-customizer-image/pom.xml b/images/remote-engine-customizer-image/pom.xml index ee67d757d6c62..dd33142a16f96 100644 --- a/images/remote-engine-customizer-image/pom.xml +++ b/images/remote-engine-customizer-image/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component images - 1.61.0 + 1.62.0-SNAPSHOT remote-engine-customizer-image diff --git a/pom.xml b/pom.xml index dddbfe8af6202..37a7711b5233e 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT pom Component Runtime @@ -133,7 +133,7 @@ scm:git:git://github.com/talend/component-runtime.git scm:git:git@github.com:talend/component-runtime.git - component-runtime-1.61.0 + HEAD https://github.com/talend/component-runtime @@ -1259,7 +1259,7 @@ audit - + @@ -1447,78 +1447,78 @@ - - + + - + - - + + - - + + - + - + - + - - - - + + + + - + - + - - - + + + - + - + - + - + - + - + - - - - - - + + + + + + - + - - - - + + + + - + - - - - - + + + + + @@ -1712,8 +1712,8 @@ - - + + true @@ -1725,7 +1725,7 @@ - + false @@ -1864,7 +1864,7 @@ 1.8 - + diff --git a/remote-engine-customizer/pom.xml b/remote-engine-customizer/pom.xml index beadd0447d0a7..2598bf5415548 100644 --- a/remote-engine-customizer/pom.xml +++ b/remote-engine-customizer/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT remote-engine-customizer diff --git a/reporting/pom.xml b/reporting/pom.xml index 3152ad92d5cdd..3c83d0d6a16de 100644 --- a/reporting/pom.xml +++ b/reporting/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT reporting diff --git a/sample-parent/documentation-sample/activeif-component/pom.xml b/sample-parent/documentation-sample/activeif-component/pom.xml index 31bccf00d677f..8d05f67e433ac 100644 --- a/sample-parent/documentation-sample/activeif-component/pom.xml +++ b/sample-parent/documentation-sample/activeif-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT activeif-component diff --git a/sample-parent/documentation-sample/checkbox-component/pom.xml b/sample-parent/documentation-sample/checkbox-component/pom.xml index 7d7b0f898cdee..7633019565698 100644 --- a/sample-parent/documentation-sample/checkbox-component/pom.xml +++ b/sample-parent/documentation-sample/checkbox-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT checkbox-component diff --git a/sample-parent/documentation-sample/code-component/pom.xml b/sample-parent/documentation-sample/code-component/pom.xml index f04346345cc1c..79c3a154579d0 100644 --- a/sample-parent/documentation-sample/code-component/pom.xml +++ b/sample-parent/documentation-sample/code-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT code-component diff --git a/sample-parent/documentation-sample/credentials-component/pom.xml b/sample-parent/documentation-sample/credentials-component/pom.xml index 2885a139a8fbd..384a0ff7ca409 100644 --- a/sample-parent/documentation-sample/credentials-component/pom.xml +++ b/sample-parent/documentation-sample/credentials-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT credentials-component diff --git a/sample-parent/documentation-sample/datastorevalidation-component/pom.xml b/sample-parent/documentation-sample/datastorevalidation-component/pom.xml index ebfa1d595f1bb..b07b46a86b40e 100644 --- a/sample-parent/documentation-sample/datastorevalidation-component/pom.xml +++ b/sample-parent/documentation-sample/datastorevalidation-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT datastorevalidation-component diff --git a/sample-parent/documentation-sample/dropdownlist-component/pom.xml b/sample-parent/documentation-sample/dropdownlist-component/pom.xml index 99a0a0eaa289e..3a5be86cbd784 100644 --- a/sample-parent/documentation-sample/dropdownlist-component/pom.xml +++ b/sample-parent/documentation-sample/dropdownlist-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT dropdownlist-component diff --git a/sample-parent/documentation-sample/integer-component/pom.xml b/sample-parent/documentation-sample/integer-component/pom.xml index b98184b605894..1065504f2040d 100644 --- a/sample-parent/documentation-sample/integer-component/pom.xml +++ b/sample-parent/documentation-sample/integer-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT integer-component diff --git a/sample-parent/documentation-sample/minmaxvalidation-component/pom.xml b/sample-parent/documentation-sample/minmaxvalidation-component/pom.xml index 816e3c3cdab1b..a52368ec90f89 100644 --- a/sample-parent/documentation-sample/minmaxvalidation-component/pom.xml +++ b/sample-parent/documentation-sample/minmaxvalidation-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT minmaxvalidation-component diff --git a/sample-parent/documentation-sample/multiselect-component/pom.xml b/sample-parent/documentation-sample/multiselect-component/pom.xml index ea3a9587865eb..ccb30c44aed23 100644 --- a/sample-parent/documentation-sample/multiselect-component/pom.xml +++ b/sample-parent/documentation-sample/multiselect-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT multiselect-component diff --git a/sample-parent/documentation-sample/patternvalidation-component/pom.xml b/sample-parent/documentation-sample/patternvalidation-component/pom.xml index f9dd775177102..1837abc41007a 100644 --- a/sample-parent/documentation-sample/patternvalidation-component/pom.xml +++ b/sample-parent/documentation-sample/patternvalidation-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT patternvalidation-component diff --git a/sample-parent/documentation-sample/pom.xml b/sample-parent/documentation-sample/pom.xml index a1a7b91b16215..08b63067339f0 100644 --- a/sample-parent/documentation-sample/pom.xml +++ b/sample-parent/documentation-sample/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component sample-parent - 1.61.0 + 1.62.0-SNAPSHOT documentation-sample diff --git a/sample-parent/documentation-sample/requiredvalidation-component/pom.xml b/sample-parent/documentation-sample/requiredvalidation-component/pom.xml index 488f91949ac2c..262f2fd239cab 100644 --- a/sample-parent/documentation-sample/requiredvalidation-component/pom.xml +++ b/sample-parent/documentation-sample/requiredvalidation-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT requiredvalidation-component diff --git a/sample-parent/documentation-sample/suggestions-component/pom.xml b/sample-parent/documentation-sample/suggestions-component/pom.xml index 4818aa7a3d39b..756cd3f93ae23 100644 --- a/sample-parent/documentation-sample/suggestions-component/pom.xml +++ b/sample-parent/documentation-sample/suggestions-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT suggestions-component diff --git a/sample-parent/documentation-sample/table-component/pom.xml b/sample-parent/documentation-sample/table-component/pom.xml index cfe4d51cac045..416a8038a788a 100644 --- a/sample-parent/documentation-sample/table-component/pom.xml +++ b/sample-parent/documentation-sample/table-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT table-component diff --git a/sample-parent/documentation-sample/textarea-component/pom.xml b/sample-parent/documentation-sample/textarea-component/pom.xml index 8ea49adfd134b..480cc08c74100 100644 --- a/sample-parent/documentation-sample/textarea-component/pom.xml +++ b/sample-parent/documentation-sample/textarea-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT textarea-component diff --git a/sample-parent/documentation-sample/textinput-component/pom.xml b/sample-parent/documentation-sample/textinput-component/pom.xml index df4c4bfccf457..28b44481f42e1 100644 --- a/sample-parent/documentation-sample/textinput-component/pom.xml +++ b/sample-parent/documentation-sample/textinput-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT textinput-component diff --git a/sample-parent/documentation-sample/updatable-component/pom.xml b/sample-parent/documentation-sample/updatable-component/pom.xml index 8c9392ec42561..6e9c185a9d0ba 100644 --- a/sample-parent/documentation-sample/updatable-component/pom.xml +++ b/sample-parent/documentation-sample/updatable-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT updatable-component diff --git a/sample-parent/documentation-sample/urlvalidation-component/pom.xml b/sample-parent/documentation-sample/urlvalidation-component/pom.xml index 88067024f4150..3d6a936f1e665 100644 --- a/sample-parent/documentation-sample/urlvalidation-component/pom.xml +++ b/sample-parent/documentation-sample/urlvalidation-component/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component documentation-sample - 1.61.0 + 1.62.0-SNAPSHOT urlvalidation-component diff --git a/sample-parent/pom.xml b/sample-parent/pom.xml index 74685e68d8bbc..2dda0f863020c 100644 --- a/sample-parent/pom.xml +++ b/sample-parent/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT sample-parent @@ -89,7 +89,7 @@ - + diff --git a/sample-parent/sample-beam/pom.xml b/sample-parent/sample-beam/pom.xml index d23e5c24a8928..5a879a4436e67 100644 --- a/sample-parent/sample-beam/pom.xml +++ b/sample-parent/sample-beam/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component sample-parent - 1.61.0 + 1.62.0-SNAPSHOT sample-beam @@ -80,7 +80,7 @@ - + diff --git a/sample-parent/sample-connector/pom.xml b/sample-parent/sample-connector/pom.xml index f382a53a765bf..290ead59f5c97 100644 --- a/sample-parent/sample-connector/pom.xml +++ b/sample-parent/sample-connector/pom.xml @@ -20,7 +20,7 @@ org.talend.sdk.component sample-parent - 1.61.0 + 1.62.0-SNAPSHOT sample-connector diff --git a/sample-parent/sample/pom.xml b/sample-parent/sample/pom.xml index ccf0834621b0b..9c8ce169b134c 100644 --- a/sample-parent/sample/pom.xml +++ b/sample-parent/sample/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component sample-parent - 1.61.0 + 1.62.0-SNAPSHOT sample @@ -88,7 +88,7 @@ - + diff --git a/singer-parent/component-kitap/pom.xml b/singer-parent/component-kitap/pom.xml index e69a668ca9ebe..8301d7d88c1c8 100644 --- a/singer-parent/component-kitap/pom.xml +++ b/singer-parent/component-kitap/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component singer-parent - 1.61.0 + 1.62.0-SNAPSHOT component-kitap @@ -149,7 +149,7 @@ fatjar ${project.build.directory}/reduced-pom.xml - + org.talend.sdk.component.singer.kitap.Carpates diff --git a/singer-parent/pom.xml b/singer-parent/pom.xml index ae34248d92650..f846df4577167 100644 --- a/singer-parent/pom.xml +++ b/singer-parent/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT singer-parent diff --git a/singer-parent/singer-java/pom.xml b/singer-parent/singer-java/pom.xml index 92e7d02d13881..d492574a0d0ce 100644 --- a/singer-parent/singer-java/pom.xml +++ b/singer-parent/singer-java/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component singer-parent - 1.61.0 + 1.62.0-SNAPSHOT singer-java diff --git a/slf4j-standard/pom.xml b/slf4j-standard/pom.xml index 9381f7615c0ba..788d886399057 100644 --- a/slf4j-standard/pom.xml +++ b/slf4j-standard/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT slf4j-standard diff --git a/talend-component-kit-intellij-plugin/pom.xml b/talend-component-kit-intellij-plugin/pom.xml index a5592155c9dcc..c0d7ec6cf28fc 100644 --- a/talend-component-kit-intellij-plugin/pom.xml +++ b/talend-component-kit-intellij-plugin/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT talend-component-kit-intellij-plugin diff --git a/talend-component-maven-plugin/pom.xml b/talend-component-maven-plugin/pom.xml index 214ec38ac4f68..d047607aa23dc 100644 --- a/talend-component-maven-plugin/pom.xml +++ b/talend-component-maven-plugin/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT talend-component-maven-plugin diff --git a/vault-client/pom.xml b/vault-client/pom.xml index 9a64c5953baf3..bf187d21fa686 100644 --- a/vault-client/pom.xml +++ b/vault-client/pom.xml @@ -19,7 +19,7 @@ org.talend.sdk.component component-runtime - 1.61.0 + 1.62.0-SNAPSHOT vault-client From ca64b1d217037bdf620ef9dd2e542355ef7ae54b Mon Sep 17 00:00:00 2001 From: jenkins-git Date: Thu, 14 Sep 2023 12:36:40 +0000 Subject: [PATCH 09/18] >> Updating doc for next iteration --- component-runtime-beam/pom.xml | 2 +- component-runtime-manager/pom.xml | 2 +- .../component-runtime-http-junit/pom.xml | 2 +- .../component-server/pom.xml | 2 +- component-starter-server/pom.xml | 2 +- component-tools-webapp/pom.xml | 2 +- documentation/pom.xml | 12 +-- documentation/src/main/antora/antora.yml | 2 +- ...nerated_remote-engine-customizer-help.adoc | 13 ++- .../_partials/generated_rest-resources.adoc | 2 +- .../_partials/generated_sample-index.adoc | 68 +++++++------- .../src/main/frontend/package-lock.json | 4 +- pom.xml | 94 +++++++++---------- sample-parent/pom.xml | 2 +- sample-parent/sample-beam/pom.xml | 2 +- sample-parent/sample/pom.xml | 2 +- 16 files changed, 108 insertions(+), 105 deletions(-) diff --git a/component-runtime-beam/pom.xml b/component-runtime-beam/pom.xml index 82180046071f3..43a549ff8d1f8 100644 --- a/component-runtime-beam/pom.xml +++ b/component-runtime-beam/pom.xml @@ -206,7 +206,7 @@ - + diff --git a/component-runtime-manager/pom.xml b/component-runtime-manager/pom.xml index 953ee9137d1e6..03e8547325b86 100644 --- a/component-runtime-manager/pom.xml +++ b/component-runtime-manager/pom.xml @@ -179,7 +179,7 @@ - + diff --git a/component-runtime-testing/component-runtime-http-junit/pom.xml b/component-runtime-testing/component-runtime-http-junit/pom.xml index 86dc6f2e89a9f..570e6f2f28879 100644 --- a/component-runtime-testing/component-runtime-http-junit/pom.xml +++ b/component-runtime-testing/component-runtime-http-junit/pom.xml @@ -171,7 +171,7 @@ false - + diff --git a/component-server-parent/component-server/pom.xml b/component-server-parent/component-server/pom.xml index 4b74a4ff0c411..bc9c52b8dd68b 100644 --- a/component-server-parent/component-server/pom.xml +++ b/component-server-parent/component-server/pom.xml @@ -376,7 +376,7 @@ - + diff --git a/component-starter-server/pom.xml b/component-starter-server/pom.xml index 364545388defd..8c875ea87c857 100644 --- a/component-starter-server/pom.xml +++ b/component-starter-server/pom.xml @@ -335,7 +335,7 @@ npm - + start diff --git a/component-tools-webapp/pom.xml b/component-tools-webapp/pom.xml index 597e0063904a2..daab268987edb 100644 --- a/component-tools-webapp/pom.xml +++ b/component-tools-webapp/pom.xml @@ -169,7 +169,7 @@ npm - + run watch diff --git a/documentation/pom.xml b/documentation/pom.xml index 8493c9a4fa08e..bc550f2292621 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -586,7 +586,7 @@ npm - + ${component.front.build.skip} run antora:${antora.dev.site.mode} @@ -758,11 +758,11 @@ talend ${project.basedir}/src/main/asciidoctor/pdf/theme ${project.build.directory}/build-dependencies/asciidoctorj-pdf/gems/asciidoctor-pdf-${asciidoctor-pdf-gem.version}/data/fonts - - - - - + + + + + font fa - diff --git a/documentation/src/main/antora/antora.yml b/documentation/src/main/antora/antora.yml index e2c32638b8fdc..f68e15512b8cb 100644 --- a/documentation/src/main/antora/antora.yml +++ b/documentation/src/main/antora/antora.yml @@ -13,6 +13,6 @@ # limitations under the License. name: main title: Talend Component Kit Developer Reference Guide -version: '1.61.0' +version: '1.62.0' nav: - modules/ROOT/nav.adoc \ No newline at end of file diff --git a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_remote-engine-customizer-help.adoc b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_remote-engine-customizer-help.adoc index ca42081f4d699..f876f3c441c66 100644 --- a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_remote-engine-customizer-help.adoc +++ b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_remote-engine-customizer-help.adoc @@ -11,7 +11,8 @@ OPTIONS default: auto --cache-dir= - Where to cache the image layers - useful when the command is launched multiple times. + Where to cache the image layers - useful when the command is launched multiple + times. default: ${remote.engine.dir}/.remote_engine_customizer/cache @@ -27,7 +28,8 @@ OPTIONS Docker daemon executable path if custom. --from-image-type= - Type of source image, can be useful if you don't use the default version generation. + Type of source image, can be useful if you don't use the default version + generation. default: AUTO. enum: AUTO, DOCKER, REGISTRY @@ -41,7 +43,7 @@ OPTIONS Registry username when image type is REGISTRY. --remote-engine-dir= - Where the remote engine folder is, it should host a docker-compose.yml file. + Where the remote engine folder is, it should host a docker-compose.yml file. --target-image= Name of the target image, if not set it will be generated. @@ -54,10 +56,11 @@ OPTIONS default: DOCKER. enum: AUTO, DOCKER, REGISTRY --no-update-original-docker-compose - Should the Remote Engine docker-compose.yml be updated once the new image is built. + Should the Remote Engine docker-compose.yml be updated once the new image is + built. --work-dir= - Where to create temporary files needed for the build of the new image. + Where to create temporary files needed for the build of the new image. default: ${java.io.tmpdir}/remote-engine-customizer diff --git a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_rest-resources.adoc b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_rest-resources.adoc index 92e7ba2347ad8..a1eb6ac02f598 100644 --- a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_rest-resources.adoc +++ b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_rest-resources.adoc @@ -3,6 +3,6 @@ ++++ +(window.talend = (window.talend || {})).swaggerUi = {"components":{"schemas":{"org_talend_sdk_component_server_front_model_error_ErrorPayload":{"properties":{"code":{"enum":["PLUGIN_MISSING","FAMILY_MISSING","COMPONENT_MISSING","CONFIGURATION_MISSING","ICON_MISSING","ACTION_MISSING","ACTION_ERROR","BAD_FORMAT","DESIGN_MODEL_MISSING","UNEXPECTED","UNAUTHORIZED"],"nullable":true,"type":"string"},"description":{"type":"string"}},"type":"object"},"org_talend_sdk_component_server_api_ComponentResource_SampleErrorForBulk":{"properties":{},"type":"object"}}},"info":{"description":"UI related component server to provide metadata about component and callback for the forms.","title":"Talend Component Server","version":"1"},"openapi":"3.0.1","paths":{"/api/v1/action/execute":{"post":{"deprecated":false,"description":"This endpoint will execute any UI action and serialize the response as a JSON (pojo model). It takes as input the family, type and name of the related action to identify it and its configuration as a flat key value set using the same kind of mapping than for components (option path as key).","operationId":"execute","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Component family.","in":"query","name":"family","required":true,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Type of action.","in":"query","name":"type","required":true,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Action name.","in":"query","name":"action","required":true,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Requested language (as in a Locale) if supported by the action.","in":"query","name":"lang","required":false,"schema":{"type":"string"}}],"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}},"description":"Action parameters in key/value flat json form.","required":true},"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The action payload serialized in JSON."},"520":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the action execution failed, payload will be an ErrorPayload with the code ACTION_ERROR."},"400":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the action is not set, payload will be an ErrorPayload with the code ACTION_MISSING."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the action can't be found, payload will be an ErrorPayload with the code ACTION_MISSING."}},"tags":["Action"]}},"/api/v1/action/index":{"get":{"deprecated":false,"description":"This endpoint returns the list of available actions for a certain family and potentially filters the output limiting it to some families and types of actions.","operationId":"getActionIndex","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Filter the response by type.Repeat this parameter to request more than one type.","in":"query","name":"type","required":false,"schema":{"items":{"type":"string"},"type":"array"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Filter the response by family.Repeat this parameter to request more than one family.","in":"query","name":"family","required":false,"schema":{"items":{"type":"string"},"type":"array"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The action index."}},"tags":["Action"]}},"/api/v1/bulk":{"post":{"deprecated":false,"description":"Takes a request aggregating N other endpoint requests and responds all results in a normalized HTTP response representation.","operationId":"bulk","parameters":[],"requestBody":{"content":{"application/json":{"schema":{}}},"description":"The requests list as json objects containing a list of request objects. \nIf your request contains multiple identifiers, you must use a list of string. \nExample : \n`{ \n\"requests\" : [ \n{ \n \"path\" : \"/api/v1/component/index\", \n \"queryParameters\" : {\"identifiers\" : [\"12345\", \"6789A\"]}, \n \"verb\" : \"GET\", \n \"headers\" : {...}, \n}, \n{ [...]} \n] \n}`","required":true},"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The request payloads."}},"tags":["Bulk"]}},"/api/v1/component/index":{"get":{"deprecated":false,"description":"Returns the list of available components.","operationId":"getComponentIndex","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Should the icon binary format be included in the payload. Default is `false`.","in":"query","name":"includeIconContent","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Query in simple query language to filter components. It provides access to the component `plugin`, `name`, `id` and `metadata` of the first configuration property. Ex: `(id = AYETAE658349453) AND (metadata[configurationtype::type] = dataset) AND (plugin = jdbc-component) AND (name = input)`.","in":"query","name":"q","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"The index of available components."}},"tags":["Component"]}},"/api/v1/component/icon/family/{id}":{"get":{"deprecated":false,"description":"Returns the icon for a family.","operationId":"familyIcon","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Family identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"Returns a particular family icon in raw bytes."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"The family or icon is not found."}},"tags":["Component"]}},"/api/v1/component/details":{"get":{"deprecated":false,"description":"Returns the set of metadata about one or multiples components identified by their 'id'.","operationId":"getComponentDetail","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The identifier id to request. Repeat this parameter to request more than one element.","in":"query","name":"identifiers","required":false,"schema":{"items":{"type":"string"},"type":"array"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"List of details for the requested components."},"400":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_api_ComponentResource_SampleErrorForBulk","type":"object"}}},"description":"Some identifiers were not valid."}},"tags":["Component"]}},"/api/v1/component/dependencies":{"get":{"deprecated":false,"description":"Returns a list of dependencies for the given components. IMPORTANT: don't forget to add the component itself since it will not be part of the dependencies.Then you can use /dependency/{id} to download the binary.","operationId":"getDependencies","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"The identifier id to request. Repeat this parameter to request more than one element.","in":"query","name":"identifier","required":false,"schema":{"items":{"type":"string"},"type":"array"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The list of dependencies per component."}},"tags":["Component"]}},"/api/v1/component/dependency/{id}":{"get":{"deprecated":false,"description":"Return a binary of the dependency represented by `id`. It can be maven coordinates for dependencies or a component id.","operationId":"getDependency","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Dependency identifier for component/configurationType or maven coordinate. \nExample: `/api/v1/component/dependency/org.apache.commons:commons-lang3:jar:3.12.0`.","in":"path","name":"id","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"The dependency binary (jar)."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the plugin is missing, payload will be an ErrorPayload with the code PLUGIN_MISSING."}},"tags":["Component"]}},"/api/v1/component/icon/{id}":{"get":{"deprecated":false,"description":"Returns a particular component icon in raw bytes.","operationId":"icon","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Component icon identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/octet-stream":{"schema":{}}},"description":"The component icon in binary form."},"404":{"content":{"application/json":{"schema":{}}},"description":"The family or icon is not found."}},"tags":["Component"]}},"/api/v1/component/migrate/{id}/{configurationVersion}":{"post":{"deprecated":false,"description":"Allows to migrate a component configuration without calling any component execution.","operationId":"migrateComponent","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Component identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Configuration version sent, corresponding to the body content.","in":"path","name":"configurationVersion","required":false,"schema":{"type":"integer"}}],"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}},"description":"Actual configuration in key/value json form.","required":true},"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"New configuration for that component (or the same if no migration was needed)."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"The component is not found."}},"tags":["Component"]}},"/api/v1/configurationtype/index":{"get":{"deprecated":false,"description":"Returns all available configuration type - storable models. Note that the lightPayload flag allows to load all of them at once when you eagerly need to create a client model for all configurations.","operationId":"getRepositoryModel","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Should the payload skip the forms and actions associated to the configuration.Default value is `true`.","in":"query","name":"lightPayload","required":false,"schema":{"type":"boolean"}},{"allowEmptyValue":false,"allowReserved":false,"description":"Query in simple query language to filter configurations. It provides access to the configuration `type`, `name`, `type` and first configuration property `metadata`. See component index endpoint for a syntax example.","in":"query","name":"q","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"List of available and storable configurations (datastore, dataset, ...)."}},"tags":["Configuration Type"]}},"/api/v1/configurationtype/details":{"get":{"deprecated":false,"description":"Returns the set of metadata about one or multiples configuration identified by their 'id'.","operationId":"getConfigurationDetail","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"Response language in i18n format.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The identifier id to request. Repeat this parameter to request more than one element.","in":"query","name":"identifiers","required":false,"schema":{"items":{"type":"string"},"type":"array"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"List of details for the requested configuration."}},"tags":["Configuration Type"]}},"/api/v1/configurationtype/migrate/{id}/{configurationVersion}":{"post":{"deprecated":false,"description":"Allows to migrate a configuration without calling any component execution.","operationId":"migrateConfiguration","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"The configuration identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The configuration version you send in provided body.","in":"path","name":"configurationVersion","required":false,"schema":{"type":"integer"}}],"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}},"description":"Configuration to migrate in key/value json form.","required":true},"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"New values for that configuration (or the same if no migration was needed)."},"520":{"content":{"application/json":{"schema":{}}},"description":"An unexpected error occurred during migration, payload will be an ErrorPayload with the code UNEXPECTED."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the configuration is missing, payload will be an ErrorPayload with the code CONFIGURATION_MISSING."}},"tags":["Configuration Type"]}},"/api/v1/documentation/component/{id}":{"get":{"deprecated":false,"description":"Returns a documentation in asciidoctor format for the given component. The component is represented by its identifier (`id`).","operationId":"getDocumentation","parameters":[{"allowEmptyValue":false,"allowReserved":false,"description":"The component identifier.","in":"path","name":"id","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The language requested.","in":"query","name":"language","required":false,"schema":{"type":"string"}},{"allowEmptyValue":false,"allowReserved":false,"description":"The documentation part to extract. Available parts are: `ALL` (default), `DESCRIPTION`, `CONFIGURATION`","in":"query","name":"segment","required":false,"schema":{"type":"string"}}],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"The list of available and storable configurations (datastore, dataset, ...)."},"404":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/org_talend_sdk_component_server_front_model_error_ErrorPayload","type":"object"}}},"description":"If the component is not found in the server, response will be an ErrorPayload with the code COMPONENT_MISSING."}},"tags":["Documentation"]}},"/api/v1/environment":{"get":{"deprecated":false,"description":"Returns the environment information of this instance. Useful to check the version or configure a healthcheck for the server.","operationId":"getEnvironment","parameters":[],"responses":{"200":{"content":{"application/json":{"schema":{}}},"description":"Current environment representation."}},"tags":["Environment"]}}},"tags":[{"description":"Endpoints related to callbacks/triggers execution.","name":"Action"},{"description":"Enables to execute multiple requests at once.","name":"Bulk"},{"description":"Endpoints related to component metadata access.","name":"Component"},{"description":"Endpoints related to configuration types (reusable configuration) metadata access.","name":"Configuration Type"},{"description":"Endpoint to retrieve embedded component documentation.","name":"Documentation"},{"description":"Endpoint giving access to versions and last update timestamp of the server.","name":"Environment"}],"servers":[{"url":"https://starter-toolkit.talend.io/api/demo/1.62.0"}]};
++++ diff --git a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_sample-index.adoc b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_sample-index.adoc index 839838bb0e5ba..ffa04effb8f5a 100644 --- a/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_sample-index.adoc +++ b/documentation/src/main/antora/modules/ROOT/pages/_partials/generated_sample-index.adoc @@ -1,102 +1,102 @@ ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=activeif-component-distribution[ActiveIf]: Add visibility conditions on some configurations. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=activeif-component-distribution[ActiveIf]: Add visibility conditions on some configurations. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-activeif-component-distribution.zip[ActiveIf]: Add visibility conditions on some configurations. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-activeif-component-distribution.zip[ActiveIf]: Add visibility conditions on some configurations. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=checkbox-component-distribution[Checkbox]: Add checkboxes or toggles to your component. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=checkbox-component-distribution[Checkbox]: Add checkboxes or toggles to your component. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-checkbox-component-distribution.zip[Checkbox]: Add checkboxes or toggles to your component. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-checkbox-component-distribution.zip[Checkbox]: Add checkboxes or toggles to your component. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=code-component-distribution[Code]: Allow users to enter their own code. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=code-component-distribution[Code]: Allow users to enter their own code. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-code-component-distribution.zip[Code]: Allow users to enter their own code. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-code-component-distribution.zip[Code]: Allow users to enter their own code. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=credentials-component-distribution[Credential]: Mark a configuration as sensitive data to avoid displaying it as plain text. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=credentials-component-distribution[Credential]: Mark a configuration as sensitive data to avoid displaying it as plain text. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-credentials-component-distribution.zip[Credential]: Mark a configuration as sensitive data to avoid displaying it as plain text. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-credentials-component-distribution.zip[Credential]: Mark a configuration as sensitive data to avoid displaying it as plain text. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=datastorevalidation-component-distribution[Datastore]: Add a button allowing to check the connection to a datastore. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=datastorevalidation-component-distribution[Datastore]: Add a button allowing to check the connection to a datastore. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-datastorevalidation-component-distribution.zip[Datastore]: Add a button allowing to check the connection to a datastore. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-datastorevalidation-component-distribution.zip[Datastore]: Add a button allowing to check the connection to a datastore. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=dropdownlist-component-distribution[Datalist]: Two ways of implementing a dropdown list with predefined choices. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=dropdownlist-component-distribution[Datalist]: Two ways of implementing a dropdown list with predefined choices. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-dropdownlist-component-distribution.zip[Datalist]: Two ways of implementing a dropdown list with predefined choices. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-dropdownlist-component-distribution.zip[Datalist]: Two ways of implementing a dropdown list with predefined choices. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=integer-component-distribution[Integer]: Add numeric fields to your component configuration. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=integer-component-distribution[Integer]: Add numeric fields to your component configuration. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-integer-component-distribution.zip[Integer]: Add numeric fields to your component configuration. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-integer-component-distribution.zip[Integer]: Add numeric fields to your component configuration. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=minmaxvalidation-component-distribution[Min/Max]: Specify a minimum or a maximum value for a numeric configuration. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=minmaxvalidation-component-distribution[Min/Max]: Specify a minimum or a maximum value for a numeric configuration. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-minmaxvalidation-component-distribution.zip[Min/Max]: Specify a minimum or a maximum value for a numeric configuration. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-minmaxvalidation-component-distribution.zip[Min/Max]: Specify a minimum or a maximum value for a numeric configuration. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=multiselect-component-distribution[Multiselect]: Add a list and allow users to select multiple elements of that list. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=multiselect-component-distribution[Multiselect]: Add a list and allow users to select multiple elements of that list. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-multiselect-component-distribution.zip[Multiselect]: Add a list and allow users to select multiple elements of that list. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-multiselect-component-distribution.zip[Multiselect]: Add a list and allow users to select multiple elements of that list. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=patternvalidation-component-distribution[Pattern]: Enforce rules based on a specific a pattern to prevent users from entering invalid values. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=patternvalidation-component-distribution[Pattern]: Enforce rules based on a specific a pattern to prevent users from entering invalid values. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-patternvalidation-component-distribution.zip[Pattern]: Enforce rules based on a specific a pattern to prevent users from entering invalid values. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-patternvalidation-component-distribution.zip[Pattern]: Enforce rules based on a specific a pattern to prevent users from entering invalid values. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=requiredvalidation-component-distribution[Required]: Make a configuration mandatory. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=requiredvalidation-component-distribution[Required]: Make a configuration mandatory. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-requiredvalidation-component-distribution.zip[Required]: Make a configuration mandatory. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-requiredvalidation-component-distribution.zip[Required]: Make a configuration mandatory. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=suggestions-component-distribution[Suggestions]: Suggest possible values in a field based on what the users are entering. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=suggestions-component-distribution[Suggestions]: Suggest possible values in a field based on what the users are entering. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-suggestions-component-distribution.zip[Suggestions]: Suggest possible values in a field based on what the users are entering. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-suggestions-component-distribution.zip[Suggestions]: Suggest possible values in a field based on what the users are entering. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=table-component-distribution[Table]: Add a table to your component configuration. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=table-component-distribution[Table]: Add a table to your component configuration. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-table-component-distribution.zip[Table]: Add a table to your component configuration. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-table-component-distribution.zip[Table]: Add a table to your component configuration. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=textarea-component-distribution[Textarea]: Add a text area for configurations expecting long texts or values. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=textarea-component-distribution[Textarea]: Add a text area for configurations expecting long texts or values. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-textarea-component-distribution.zip[Textarea]: Add a text area for configurations expecting long texts or values. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-textarea-component-distribution.zip[Textarea]: Add a text area for configurations expecting long texts or values. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=textinput-component-distribution[Input]: Add a simple text input field to the component configuration +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=textinput-component-distribution[Input]: Add a simple text input field to the component configuration endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-textinput-component-distribution.zip[Input]: Add a simple text input field to the component configuration +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-textinput-component-distribution.zip[Input]: Add a simple text input field to the component configuration endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=updatable-component-distribution[Update]: Provide a button allowing to fill a part of the component configuration based on a service. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=updatable-component-distribution[Update]: Provide a button allowing to fill a part of the component configuration based on a service. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-updatable-component-distribution.zip[Update]: Provide a button allowing to fill a part of the component configuration based on a service. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-updatable-component-distribution.zip[Update]: Provide a button allowing to fill a part of the component configuration based on a service. endif::[] ifeval::["{page-origin-refname}" == "master"] -- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.61.0-SNAPSHOT&e=zip&c=urlvalidation-component-distribution[Validation]: Specify constraints to make sure that a URL is well formed. +- link:https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.talend.sdk.component&a=documentation-sample&v=1.62.0-SNAPSHOT&e=zip&c=urlvalidation-component-distribution[Validation]: Specify constraints to make sure that a URL is well formed. endif::[] ifeval::["{page-origin-refname}" != "master"] -- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.61.0/documentation-sample-1.61.0-urlvalidation-component-distribution.zip[Validation]: Specify constraints to make sure that a URL is well formed. +- link:https://repo.maven.apache.org/maven2/org/talend/sdk/component/documentation-sample/1.62.0/documentation-sample-1.62.0-urlvalidation-component-distribution.zip[Validation]: Specify constraints to make sure that a URL is well formed. endif::[] \ No newline at end of file diff --git a/documentation/src/main/frontend/package-lock.json b/documentation/src/main/frontend/package-lock.json index 269a90d0b2e39..60635818c0315 100644 --- a/documentation/src/main/frontend/package-lock.json +++ b/documentation/src/main/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "documentation", - "version": "1.61.0-SNAPSHOT", + "version": "1.62.0-SNAPSHOT", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "documentation", - "version": "1.61.0-SNAPSHOT", + "version": "1.62.0-SNAPSHOT", "dependencies": { "@antora/cli": "3.0.1", "@antora/site-generator-default": "3.0.1", diff --git a/pom.xml b/pom.xml index 37a7711b5233e..cdd00dad4d4f5 100644 --- a/pom.xml +++ b/pom.xml @@ -1259,7 +1259,7 @@ audit - + @@ -1447,78 +1447,78 @@ - - + + - + - - + + - - + + - + - + - + - - - - + + + + - + - + - - - + + + - + - + - + - + - + - + - - - - - - + + + + + + - + - - - - + + + + - + - - - - - + + + + + @@ -1712,8 +1712,8 @@ - - + + true @@ -1725,7 +1725,7 @@ - + false @@ -1864,7 +1864,7 @@ 1.8 - + diff --git a/sample-parent/pom.xml b/sample-parent/pom.xml index 2dda0f863020c..abc8d2f61143f 100644 --- a/sample-parent/pom.xml +++ b/sample-parent/pom.xml @@ -89,7 +89,7 @@ - + diff --git a/sample-parent/sample-beam/pom.xml b/sample-parent/sample-beam/pom.xml index 5a879a4436e67..83cb732caaccf 100644 --- a/sample-parent/sample-beam/pom.xml +++ b/sample-parent/sample-beam/pom.xml @@ -80,7 +80,7 @@ - + diff --git a/sample-parent/sample/pom.xml b/sample-parent/sample/pom.xml index 9c8ce169b134c..158c49ac3fdfd 100644 --- a/sample-parent/sample/pom.xml +++ b/sample-parent/sample/pom.xml @@ -88,7 +88,7 @@ - + From 080c1b68a7fb18f192a92f0c874ab0d87f221f7d Mon Sep 17 00:00:00 2001 From: lxia-talend Date: Fri, 15 Sep 2023 20:49:16 +0800 Subject: [PATCH 10/18] feat(TCOMP-2459) Cover dynamic_values action (#789) --- .../service/DynamicValuesServices.java | 54 ++++++ .../test/connectors/Messages.properties | 3 +- .../test/connectors/Messages_en.properties | 1 + .../test/connectors/Messages_fr.properties | 1 + .../test/connectors/Messages_ja.properties | 1 + .../test/connectors/Messages_uk.properties | 1 + .../test/connectors/Messages_zh_CN.properties | 1 + .../src/it/web/test/pom.xml | 1 + .../pom.xml | 51 ++++++ .../tck_action_dynamic_values_api_test.json | 156 ++++++++++++++++++ 10 files changed, 269 insertions(+), 1 deletion(-) create mode 100644 sample-parent/sample-connector/src/main/java/org/talend/sdk/component/test/connectors/service/DynamicValuesServices.java create mode 100644 talend-component-maven-plugin/src/it/web/test/tck-action-dynamic-values-api-test/pom.xml create mode 100644 talend-component-maven-plugin/src/it/web/test/tck-action-dynamic-values-api-test/tck_action_dynamic_values_api_test.json diff --git a/sample-parent/sample-connector/src/main/java/org/talend/sdk/component/test/connectors/service/DynamicValuesServices.java b/sample-parent/sample-connector/src/main/java/org/talend/sdk/component/test/connectors/service/DynamicValuesServices.java new file mode 100644 index 0000000000000..37e6592f05027 --- /dev/null +++ b/sample-parent/sample-connector/src/main/java/org/talend/sdk/component/test/connectors/service/DynamicValuesServices.java @@ -0,0 +1,54 @@ +/** + * Copyright (C) 2006-2023 Talend Inc. - www.talend.com + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.talend.sdk.component.test.connectors.service; + +import java.util.Arrays; + +import org.talend.sdk.component.api.service.Service; +import org.talend.sdk.component.api.service.completion.DynamicValues; +import org.talend.sdk.component.api.service.completion.Values; + +@Service +public class DynamicValuesServices { + + /** + * In this service sample class we will implement existing particular actions to check their API usages. + * Services actions are listed here: https://talend.github.io/component-runtime/main/latest/services-actions.html + * + * Implemented: + * - DynamicValues https://talend.github.io/component-runtime/main/latest/ref-actions.html#_dynamic_values + * + */ + + public final static String DYNAMIC_VALUES = "action_DYNAMIC_VALUES"; + + /** + * DynamicValues action + * Documentation: https://talend.github.io/component-runtime/main/latest/ref-actions.html#_dynamic_values + * Type: dynamic_values + * API: @org.talend.sdk.component.api.service.completion.DynamicValues + * Returned type: org.talend.sdk.component.api.service.completion.Values + */ + + @DynamicValues(DYNAMIC_VALUES) + public Values actions() { + return new Values(Arrays.asList( + new Values.Item("1", "Delete"), + new Values.Item("2", "Insert"), + new Values.Item("3", "Update"))); + } + +} diff --git a/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages.properties b/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages.properties index c0ac8b7e858b3..6a8cf3b31d996 100644 --- a/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages.properties +++ b/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages.properties @@ -35,4 +35,5 @@ the_family.actions.connection.action_CREATE_CONNECTION._displayName = Name: Crea the_family.actions.connection.action_CREATE_CONNECTION_ERROR._displayName = Name: Create the connection with error the_family.actions.user.action_USER._displayName = Name: Extension point for custom UI integrations and custom actions the_family.actions.dataset.action_DISCOVER_DATASET._displayName = Name: Discover the datasets -the_family.actions.connection.action_BUILTIN_SUGGESTABLE._displayName = Name: BuiltInSuggestable \ No newline at end of file +the_family.actions.connection.action_BUILTIN_SUGGESTABLE._displayName = Name: BuiltInSuggestable +the_family.actions.dynamic_values.action_DYNAMIC_VALUES._displayName = Name: DynamicValues \ No newline at end of file diff --git a/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_en.properties b/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_en.properties index a23e0ed94acf1..dd295adf8d51e 100644 --- a/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_en.properties +++ b/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_en.properties @@ -36,3 +36,4 @@ the_family.actions.connection.action_CREATE_CONNECTION_ERROR._displayName = Name the_family.actions.user.action_USER._displayName = Name: Extension point for custom UI integrations and custom actions -en the_family.actions.dataset.action_DISCOVER_DATASET._displayName = Name: Discover the datasets -en the_family.actions.connection.action_BUILTIN_SUGGESTABLE._displayName = Name: BuiltInSuggestable -en +the_family.actions.dynamic_values.action_DYNAMIC_VALUES._displayName = Name: DynamicValues -en diff --git a/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_fr.properties b/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_fr.properties index ffef9d3816810..532692416f2a9 100644 --- a/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_fr.properties +++ b/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_fr.properties @@ -36,3 +36,4 @@ the_family.actions.connection.action_CREATE_CONNECTION_ERROR._displayName = Name the_family.actions.user.action_USER._displayName = Name: Extension point for custom UI integrations and custom actions -fr the_family.actions.dataset.action_DISCOVER_DATASET._displayName = Name: Discover the datasets -fr the_family.actions.connection.action_BUILTIN_SUGGESTABLE._displayName = Name: BuiltInSuggestable -fr +the_family.actions.dynamic_values.action_DYNAMIC_VALUES._displayName = Name: DynamicValues -fr diff --git a/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_ja.properties b/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_ja.properties index 9505fb3342af9..54162e37d0397 100644 --- a/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_ja.properties +++ b/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_ja.properties @@ -36,3 +36,4 @@ the_family.actions.connection.action_CREATE_CONNECTION_ERROR._displayName = Name the_family.actions.user.action_USER._displayName = Name: Extension point for custom UI integrations and custom actions -ja the_family.actions.dataset.action_DISCOVER_DATASET._displayName = Name: Discover the datasets -ja the_family.actions.connection.action_BUILTIN_SUGGESTABLE._displayName = Name: BuiltInSuggestable -ja +the_family.actions.dynamic_values.action_DYNAMIC_VALUES._displayName = Name: DynamicValues -ja diff --git a/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_uk.properties b/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_uk.properties index fe1bc2b840552..1a761f90cd45d 100644 --- a/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_uk.properties +++ b/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_uk.properties @@ -36,3 +36,4 @@ the_family.actions.connection.action_CREATE_CONNECTION_ERROR._displayName = Name the_family.actions.user.action_USER._displayName = Name: Extension point for custom UI integrations and custom actions -uk the_family.actions.dataset.action_DISCOVER_DATASET._displayName = Name: Discover the datasets -uk the_family.actions.connection.action_BUILTIN_SUGGESTABLE._displayName = Name: BuiltInSuggestable -uk +the_family.actions.dynamic_values.action_DYNAMIC_VALUES._displayName = Name: DynamicValues -uk diff --git a/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_zh_CN.properties b/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_zh_CN.properties index 99f9538c26295..353c7579569e8 100644 --- a/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_zh_CN.properties +++ b/sample-parent/sample-connector/src/main/resources/org/talend/sdk/component/test/connectors/Messages_zh_CN.properties @@ -36,3 +36,4 @@ the_family.actions.connection.action_CREATE_CONNECTION_ERROR._displayName = Name the_family.actions.user.action_USER._displayName = Name: Extension point for custom UI integrations and custom actions -zh_CN the_family.actions.dataset.action_DISCOVER_DATASET._displayName = Name: Discover the datasets -zh_CN the_family.actions.connection.action_BUILTIN_SUGGESTABLE._displayName = Name: BuiltInSuggestable -zh_CN +the_family.actions.dynamic_values.action_DYNAMIC_VALUES._displayName = Name: DynamicValues -zh_CN diff --git a/talend-component-maven-plugin/src/it/web/test/pom.xml b/talend-component-maven-plugin/src/it/web/test/pom.xml index 6c009968ac474..3ff454439fcfc 100644 --- a/talend-component-maven-plugin/src/it/web/test/pom.xml +++ b/talend-component-maven-plugin/src/it/web/test/pom.xml @@ -28,6 +28,7 @@ tck-action-close-connection-api-test tck-action-create-connection-api-test tck-action-discoverdataset-api-test + tck-action-dynamic-values-api-test tck-action-errors-api-test tck-action-index-api-test tck-action-schema-api-test diff --git a/talend-component-maven-plugin/src/it/web/test/tck-action-dynamic-values-api-test/pom.xml b/talend-component-maven-plugin/src/it/web/test/tck-action-dynamic-values-api-test/pom.xml new file mode 100644 index 0000000000000..371e62bf5d9b5 --- /dev/null +++ b/talend-component-maven-plugin/src/it/web/test/tck-action-dynamic-values-api-test/pom.xml @@ -0,0 +1,51 @@ + + + + + 4.0.0 + tck-action-dynamic-values-api-test + + + org.talend.ci.api-tester + tck-endpoints-api-test + 1.0.0 + + + + + + org.talend.ci + api-tester-maven-plugin + ${api-tester.version} + + + + test + + test + + + + ${project.basedir}/tck_action_dynamic_values_api_test.json + + + + + + + + \ No newline at end of file diff --git a/talend-component-maven-plugin/src/it/web/test/tck-action-dynamic-values-api-test/tck_action_dynamic_values_api_test.json b/talend-component-maven-plugin/src/it/web/test/tck-action-dynamic-values-api-test/tck_action_dynamic_values_api_test.json new file mode 100644 index 0000000000000..005817374acbf --- /dev/null +++ b/talend-component-maven-plugin/src/it/web/test/tck-action-dynamic-values-api-test/tck_action_dynamic_values_api_test.json @@ -0,0 +1,156 @@ +{ + "version": 6, + "entities": [ + { + "entity": { + "type": "Project", + "description": "To run the test you need to run a component server. \nTesting documentation can be found [here](https://github.com/Talend/component-runtime/tree/master/talend-component-maven-plugin/src/it/web) \nApi doc is [here for action execute](https://talend.github.io/component-runtime/main/latest/rest-openapi.html#/Action/execute) \nAction documentation is [here for dynamic-values](https://talend.github.io/component-runtime/main/latest/ref-actions.html#_dynamic_values)", + "id": "e2f14162-5846-44ca-952a-3989cf126a2c", + "name": "tck-action-dynamic-values-api-test" + }, + "children": [ + { + "entity": { + "type": "Request", + "method": { + "requestBody": true, + "link": "http://tools.ietf.org/html/rfc7231#section-4.3.3", + "name": "POST" + }, + "body": { + "formBody": { + "overrideContentType": true, + "encoding": "application/x-www-form-urlencoded", + "items": [] + }, + "bodyType": "Text", + "textBodyEditorHeight": 150, + "textBody": "{}" + }, + "uri": { + "query": { + "delimiter": "&", + "items": [ + { + "enabled": true, + "name": "family", + "value": "the_family" + }, + { + "enabled": true, + "name": "type", + "value": "dynamic_values" + }, + { + "enabled": true, + "name": "action", + "value": "action_DYNAMIC_VALUES" + } + ] + }, + "scheme": { + "name": "http", + "version": "V11" + }, + "host": "${\"server-ip\"}:${\"server-port\"}", + "path": "/api/v1/action/execute" + }, + "id": "f3fc01e0-67c2-44ba-80d0-ddc74b3b36ed", + "name": "1. action.execute - dynamic-values", + "headers": [ + { + "enabled": true, + "name": "Content-Type", + "value": "application/json" + } + ], + "assertions": [ + { + "comparison": "Equals", + "subject": "ResponseStatus", + "path": "code", + "value": "200" + }, + { + "comparison": "Equals", + "subject": "ResponseJsonBody", + "path": "$.items.id", + "value": "[\"1\",\"2\",\"3\"]" + }, + { + "comparison": "Equals", + "subject": "ResponseJsonBody", + "path": "$.items.label", + "value": "[\"Delete\",\"Insert\",\"Update\"]" + } + ] + } + } + ] + } + ], + "environments": [ + { + "id": "d7975106-9ad9-41fd-8900-ab5520885d2c", + "name": "component_runtime_ci", + "variables": { + "32139a5d-57e2-4342-9c68-29352d78b513": { + "name": "output_id", + "value": "c2FtcGxlLWNvbm5lY3RvciN0aGVfZmFtaWx5I1RoZU91dHB1dDE", + "enabled": true, + "createdAt": "2023-08-10T02:16:30.587Z", + "private": false + }, + "98915cac-d4de-4864-8ac1-2c49574b550c": { + "name": "datastore_id", + "value": "c2FtcGxlLWNvbm5lY3RvciN0aGVfZmFtaWx5I2RhdGFzdG9yZSNUaGVDb25uZWN0aW9u", + "enabled": true, + "createdAt": "2023-08-10T02:16:30.587Z", + "private": false + }, + "1f9780cc-c7b0-43f1-ac1d-c3dc34ee7a7e": { + "name": "dataset_id", + "value": "c2FtcGxlLWNvbm5lY3RvciN0aGVfZmFtaWx5I2RhdGFzZXQjVGhlRGF0YXNldA", + "enabled": true, + "createdAt": "2023-08-10T02:16:30.587Z", + "private": false + }, + "d8d510f8-9dc8-45e1-b325-2a2b460d6dcb": { + "name": "httpbin_addr", + "value": "tal-rd22.talend.lan:8084", + "enabled": true, + "createdAt": "2023-08-10T02:16:30.587Z", + "private": false + }, + "d8fd546a-3c26-4b26-98a5-56fc5f4c1f5c": { + "name": "mapper_id", + "value": "c2FtcGxlLWNvbm5lY3RvciN0aGVfZmFtaWx5I1RoZU1hcHBlcjE", + "enabled": true, + "createdAt": "2023-08-10T02:16:30.587Z", + "private": false + }, + "dab18074-4f22-4509-9628-9e18231501d1": { + "name": "family_id", + "value": "c2FtcGxlLWNvbm5lY3RvciN0aGVfZmFtaWx5", + "enabled": true, + "createdAt": "2023-08-10T02:16:30.587Z", + "private": false + }, + "e84d1c64-c192-4dfe-88ab-0590948c1525": { + "name": "server-ip", + "value": "localhost", + "enabled": true, + "createdAt": "2023-08-10T02:16:30.587Z", + "private": false + }, + "f608f7fa-629f-4c68-809d-8ad862b89a4e": { + "name": "server-port", + "value": "8081", + "enabled": true, + "createdAt": "2023-08-10T02:16:30.587Z", + "private": false + } + } + } + ] +} \ No newline at end of file From 3f89cfd0cb69472705f8360f70c05be3ad3c3e83 Mon Sep 17 00:00:00 2001 From: yyin Date: Wed, 20 Sep 2023 15:23:51 +0800 Subject: [PATCH 11/18] fix(TCOMP-2538): [CVE]: (#794) org.apache.commons:commons-compress:jar:1.23.0:provided; --- bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 1e932dc0f0d0b..93b984cf68573 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -82,7 +82,7 @@ 2.20.0 1.15 - 1.23.0 + 1.24.0 3.11 2.15.2 diff --git a/pom.xml b/pom.xml index cdd00dad4d4f5..ff3db3924f6f8 100644 --- a/pom.xml +++ b/pom.xml @@ -281,7 +281,7 @@ 1.2.20 2.13.0 - 1.23.0 + 1.24.0 1.7.34 2.20.0 1.7.14 From f6163e635a54146921b8caa24711ba7605a01c4b Mon Sep 17 00:00:00 2001 From: undx Date: Wed, 20 Sep 2023 16:01:11 +0200 Subject: [PATCH 12/18] chore(master): set enabledForFailure to false in Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7398f24b4642f..f09e677537aac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -316,7 +316,7 @@ pipeline { post { always { recordIssues( - enabledForFailure: true, + enabledForFailure: false, tools: [ junitParser( id: 'unit-test', @@ -603,7 +603,7 @@ pipeline { } always { recordIssues( - enabledForFailure: true, + enabledForFailure: false, tools: [ taskScanner( id: 'disabled', From 3cb420f2989f5fbe23e2361653266fcc27812b48 Mon Sep 17 00:00:00 2001 From: undx Date: Wed, 20 Sep 2023 18:28:00 +0200 Subject: [PATCH 13/18] fix(TCOMP-2540): synchronize entryMap feed --- .../component/runtime/beam/spi/record/AvroSchema.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchema.java b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchema.java index a72eaf5d5764b..765a98822a321 100644 --- a/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchema.java +++ b/component-runtime-beam/src/main/java/org/talend/sdk/component/runtime/beam/spi/record/AvroSchema.java @@ -169,9 +169,13 @@ public Stream getAllEntries() { @Override @JsonbTransient public Map getEntryMap() { - if (entryMap == null) { - entryMap = new HashMap<>(); - getAllEntries().forEach(e -> entryMap.put(e.getName(), e)); + synchronized (this) { + if (entryMap == null || entryMap.isEmpty()) { + if (entryMap == null) { + entryMap = new HashMap<>(); + } + getAllEntries().forEach(e -> entryMap.put(e.getName(), e)); + } } return entryMap; } From 02b4b3a5cb2230aa27d1ca20567cf961e2876a77 Mon Sep 17 00:00:00 2001 From: yyin Date: Mon, 25 Sep 2023 14:34:43 +0800 Subject: [PATCH 14/18] fix(TCOMP-2539): Upgrade org.eclipse.jgit:jar to 5.13.2.202306221912-r (#797) * fix(TCOMP-2539): Upgrade org.eclipse.jgit:jar to 5.13.2.202306221912-r * fix(TCOMP-2539) change version * fix(TCOMP-2539) change version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff3db3924f6f8..0c216be1d1a70 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ 3.10.1 4.9.10 1.0.7 - 5.10.0.202012080955-r + 5.13.2.202306221912-r 2.8 3.0.0 0.8.10 From bd0210392c8e3fdb45e74612dc7dfba4790cca10 Mon Sep 17 00:00:00 2001 From: Axel CATOIRE Date: Thu, 28 Sep 2023 11:22:03 +0200 Subject: [PATCH 15/18] chore(TDI-49155): Add Sonar to GitHub (#801) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Inspired from https://github.com/Talend/apimgmt-jenkins-shared-libraries/blob/e8c355b599963dd5bbd249cf8cc2377195af7b7a/vars/buildBackendLib.groovy#L229 https://jira.talendforge.org/browse/TDI-49155 --------- Co-authored-by: Fabien Désiles <52663885+fdesiles@users.noreply.github.com> --- .jenkins/scripts/mvn_sonar_branch.sh | 42 +++++++++ .jenkins/scripts/mvn_sonar_pr.sh | 50 +++++++++++ Jenkinsfile | 122 ++++++++++++++++++--------- 3 files changed, 172 insertions(+), 42 deletions(-) create mode 100644 .jenkins/scripts/mvn_sonar_branch.sh create mode 100644 .jenkins/scripts/mvn_sonar_pr.sh diff --git a/.jenkins/scripts/mvn_sonar_branch.sh b/.jenkins/scripts/mvn_sonar_branch.sh new file mode 100644 index 0000000000000..931e2f2ec599f --- /dev/null +++ b/.jenkins/scripts/mvn_sonar_branch.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# +# Copyright (C) 2006-2023 Talend Inc. - www.talend.com +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +set -xe + +# Execute sonar analysis +# $1: Sonar analyzed branch +# $@: the extra parameters to be used in the maven commands +main() ( + branch="${1?Missing branch name}"; shift + extraBuildParams=("$@") + + declare -a LIST_FILE_ARRAY=( $(find $(pwd) -type f -name 'jacoco.xml') ) + LIST_FILE=$(IFS=, ; echo "${LIST_FILE_ARRAY[*]}") + + # Why sonar plugin is not declared in pom.xml: https://blog.sonarsource.com/we-had-a-dream-mvn-sonarsonar + # TODO https://jira.talendforge.org/browse/TDI-48980 (CI: Reactivate Sonar cache) + mvn sonar:sonar \ + --define 'sonar.host.url=https://sonar-eks.datapwn.com' \ + --define "sonar.login=${SONAR_LOGIN}" \ + --define "sonar.password=${SONAR_PASSWORD}" \ + --define "sonar.branch.name=${branch}" \ + --define "sonar.coverage.jacoco.xmlReportPaths='${LIST_FILE}'" \ + --define "sonar.analysisCache.enabled=false" \ + "${extraBuildParams[@]}" +) + +main "$@" diff --git a/.jenkins/scripts/mvn_sonar_pr.sh b/.jenkins/scripts/mvn_sonar_pr.sh new file mode 100644 index 0000000000000..b36889d96ddfd --- /dev/null +++ b/.jenkins/scripts/mvn_sonar_pr.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash +# +# Copyright (C) 2006-2023 Talend Inc. - www.talend.com +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +set -xe + +# Execute sonar analysis +# $1: Sonar analyzed branch +# $2: Sonar target branch for compare +# $3: PR id +# $@: the extra parameters to be used in the maven commands +main() ( + branch="${1?Missing branch name}"; shift + target_branch="${1?Missing target branch name}"; shift + pull_request_id="${1?Missing pull request id}"; shift + extraBuildParams=("$@") + + declare -a LIST_FILE_ARRAY=( $(find $(pwd) -type f -name 'jacoco.xml') ) + LIST_FILE=$(IFS=, ; echo "${LIST_FILE_ARRAY[*]}") + + # Why sonar plugin is not declared in pom.xml: https://blog.sonarsource.com/we-had-a-dream-mvn-sonarsonar + # TODO https://jira.talendforge.org/browse/TDI-48980 (CI: Reactivate Sonar cache) + mvn sonar:sonar \ + --define 'sonar.host.url=https://sonar-eks.datapwn.com' \ + --define "sonar.login=${SONAR_LOGIN}" \ + --define "sonar.password=${SONAR_PASSWORD}" \ + --define "sonar.coverage.jacoco.xmlReportPaths='${LIST_FILE}'" \ + --define "sonar.analysisCache.enabled=false" \ + --define "sonar.pullrequest.branch=${branch}" \ + --define "sonar.pullrequest.base=${target_branch}" \ + --define "sonar.pullrequest.key=${pull_request_id}" \ + "${extraBuildParams[@]}" + + +) + +main "$@" diff --git a/Jenkinsfile b/Jenkinsfile index f09e677537aac..62d992a8630f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,20 +18,49 @@ import java.time.LocalDateTime import java.util.regex.Matcher // Credentials -final def ossrhCredentials = usernamePassword(credentialsId: 'ossrh-credentials', usernameVariable: 'OSSRH_USER', passwordVariable: 'OSSRH_PASS') -final def nexusCredentials = usernamePassword(credentialsId: 'nexus-artifact-zl-credentials', usernameVariable: 'NEXUS_USER', passwordVariable: 'NEXUS_PASS') -final def jetbrainsCredentials = usernamePassword(credentialsId: 'jetbrains-credentials', usernameVariable: 'JETBRAINS_USER', passwordVariable: 'JETBRAINS_PASS') -final def jiraCredentials = usernamePassword(credentialsId: 'jira-credentials', usernameVariable: 'JIRA_USER', passwordVariable: 'JIRA_PASS') -final def gitCredentials = usernamePassword(credentialsId: 'github-credentials', usernameVariable: 'GITHUB_USER', passwordVariable: 'GITHUB_PASS') -final def dockerCredentials = usernamePassword(credentialsId: 'artifactory-datapwn-credentials', usernameVariable: 'DOCKER_USER', passwordVariable: 'DOCKER_PASS') -final def sonarCredentials = usernamePassword( credentialsId: 'sonar-credentials', usernameVariable: 'SONAR_USER', passwordVariable: 'SONAR_PASS') -final def keyImportCredentials = usernamePassword(credentialsId: 'component-runtime-import-key-credentials', usernameVariable: 'KEY_USER', passwordVariable: 'KEY_PASS') -final def gpgCredentials = usernamePassword(credentialsId: 'component-runtime-gpg-credentials', usernameVariable: 'GPG_KEYNAME', passwordVariable: 'GPG_PASSPHRASE') +final def ossrhCredentials = usernamePassword( + credentialsId: 'ossrh-credentials', + usernameVariable: 'OSSRH_USER', + passwordVariable: 'OSSRH_PASS') +final def nexusCredentials = usernamePassword( + credentialsId: 'nexus-artifact-zl-credentials', + usernameVariable: 'NEXUS_USER', passwordVariable: 'NEXUS_PASS') +final def jetbrainsCredentials = usernamePassword( + credentialsId: 'jetbrains-credentials', + usernameVariable: 'JETBRAINS_USER', + passwordVariable: 'JETBRAINS_PASS') +final def jiraCredentials = usernamePassword( + credentialsId: 'jira-credentials', + usernameVariable: 'JIRA_USER', + passwordVariable: 'JIRA_PASS') +final def gitCredentials = usernamePassword( + credentialsId: 'github-credentials', + usernameVariable: 'GITHUB_USER', + passwordVariable: 'GITHUB_PASS') +final def dockerCredentials = usernamePassword( + credentialsId: 'artifactory-datapwn-credentials', + usernameVariable: 'DOCKER_USER', + passwordVariable: 'DOCKER_PASS') +final def sonarCredentials = usernamePassword( + credentialsId: 'sonar-credentials', + usernameVariable: 'SONAR_LOGIN', + passwordVariable: 'SONAR_PASSWORD') +final def keyImportCredentials = usernamePassword( + credentialsId: 'component-runtime-import-key-credentials', + usernameVariable: 'KEY_USER', + passwordVariable: 'KEY_PASS') +final def gpgCredentials = usernamePassword( + credentialsId: 'component-runtime-gpg-credentials', + usernameVariable: 'GPG_KEYNAME', + passwordVariable: 'GPG_PASSPHRASE') + +// In PR environment, the branch name is not valid and should be swap with pr name. +final String pull_request_id = env.CHANGE_ID +final String branch_name = pull_request_id != null ? env.CHANGE_BRANCH : env.BRANCH_NAME // Job config -final String slackChannel = 'components-ci' -final Boolean isMasterBranch = env.BRANCH_NAME == "master" -final Boolean isStdBranch = (env.BRANCH_NAME == "master" || env.BRANCH_NAME.startsWith("maintenance/")) +final Boolean isMasterBranch = branch_name == "master" +final Boolean isStdBranch = (branch_name == "master" || branch_name.startsWith("maintenance/")) final Boolean hasPostLoginScript = params.POST_LOGIN_SCRIPT != "" final String extraBuildParams = "" final String buildTimestamp = String.format('-%tY% extract_branch_info(GString branch_name) { +private static ArrayList extract_branch_info(String branch_name) { String branchRegex = /^(?.*)\/(?[A-Z]{2,8}-\d{1,6})[_-](?.*)/ Matcher branchMatcher = branch_name =~ branchRegex @@ -761,4 +799,4 @@ private static ArrayList extract_branch_info(GString branch_name) { String description = branchMatcher.group("description") return [user, ticket, description] -} \ No newline at end of file +} From ec89e9a6e6a952211cd2122451f36f6de791ecbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabien=20D=C3=A9siles?= <52663885+fdesiles@users.noreply.github.com> Date: Fri, 29 Sep 2023 14:56:27 +0200 Subject: [PATCH 16/18] chore(TDI-50338): [internal] Fix Sonar diffs on PR builds (#802) https://jira.talendforge.org/browse/TDI-50338 --- .jenkins/scripts/mvn_sonar_pr.sh | 3 +++ Jenkinsfile | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.jenkins/scripts/mvn_sonar_pr.sh b/.jenkins/scripts/mvn_sonar_pr.sh index b36889d96ddfd..138aa11c92846 100644 --- a/.jenkins/scripts/mvn_sonar_pr.sh +++ b/.jenkins/scripts/mvn_sonar_pr.sh @@ -31,6 +31,9 @@ main() ( declare -a LIST_FILE_ARRAY=( $(find $(pwd) -type f -name 'jacoco.xml') ) LIST_FILE=$(IFS=, ; echo "${LIST_FILE_ARRAY[*]}") + # Fetch target branch for Sonar diff purpose + git fetch origin "${target_branch}":"${target_branch}" + # Why sonar plugin is not declared in pom.xml: https://blog.sonarsource.com/we-had-a-dream-mvn-sonarsonar # TODO https://jira.talendforge.org/browse/TDI-48980 (CI: Reactivate Sonar cache) mvn sonar:sonar \ diff --git a/Jenkinsfile b/Jenkinsfile index 62d992a8630f1..a0b6dec6058c5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -543,7 +543,8 @@ pipeline { steps { script { withCredentials([nexusCredentials, - sonarCredentials]) { + sonarCredentials, + gitCredentials]) { if (pull_request_id != null) { From bbc6ce2246f11b19f7f19f601e0bb3ec7e7813fd Mon Sep 17 00:00:00 2001 From: undx Date: Fri, 29 Sep 2023 16:31:07 +0200 Subject: [PATCH 17/18] chore(build): remove versions:property-updates-report to build --- Jenkinsfile | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a0b6dec6058c5..964f47a98bc6a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -497,24 +497,13 @@ pipeline { sh """\ #!/usr/bin/env bash set -xe - mvn versions:dependency-updates-report versions:plugin-updates-report \ - versions:property-updates-report \ - -pl '!bom' + mvn versions:dependency-updates-report versions:plugin-updates-report -pl '!bom' """.stripIndent() } } } post { always { - publishHTML( - target: [ - allowMissing : true, - alwaysLinkToLastBuild: false, - keepAll : true, - reportDir : 'target/site/', - reportFiles : 'property-updates-report.html', - reportName : "outdated::property" - ]) publishHTML( target: [ allowMissing : true, From 1ceafce3bf3b7270df846ca4b580fc2bc4da7a3f Mon Sep 17 00:00:00 2001 From: Emmanuel GALLOIS Date: Tue, 3 Oct 2023 15:06:57 +0200 Subject: [PATCH 18/18] feat(TCOMP-2543): bump tsbi to 4.0.1-20230911145727 (#804) --- images/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/pom.xml b/images/pom.xml index 0c2850d23a77f..5d358d8fd1d94 100644 --- a/images/pom.xml +++ b/images/pom.xml @@ -36,8 +36,8 @@ yyyyMMddHHmmss - 3.1.9 - 20230228074507 + 4.0.1 + 20230911145727 artifactory.datapwn.com /tlnd-docker-prod/talend/common/tsbi/ java17-base