Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.15.x midstream backports #420

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.TreeMap;

import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.RuntimeProvider;
Expand All @@ -42,7 +39,6 @@ public class QuarkusRuntimeProvider implements RuntimeProvider {
private static final String TRANSFORMER_DIR = "org/apache/camel/catalog/quarkus/transformers";
private static final String OTHER_DIR = "org/apache/camel/catalog/quarkus/others";
private static final String BEANS_DIR = "org/apache/camel/catalog/quarkus/beans";
private static final String CAPABILITIES_CATALOG = "org/apache/camel/catalog/quarkus/capabilities.properties";
private static final String COMPONENTS_CATALOG = "org/apache/camel/catalog/quarkus/components.properties";
private static final String DEV_CONSOLE_CATALOG = "org/apache/camel/catalog/quarkus/dev-consoles.properties";
private static final String DATA_FORMATS_CATALOG = "org/apache/camel/catalog/quarkus/dataformats.properties";
Expand Down Expand Up @@ -210,16 +206,4 @@ public List<String> findBeansNames() {
}
return names;
}

@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public Map<String, String> findCapabilities() {
final Properties properties = new Properties();
try (InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(CAPABILITIES_CATALOG)) {
properties.load(is);
} catch (IOException e) {
// ignore
}
return new TreeMap<>((Map<String, String>) (Map) properties);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import org.apache.camel.component.smb.SmbConstants;
import org.hamcrest.Matchers;
import org.apache.camel.quarkus.test.DisabledIfFipsMode;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.awaitility.Awaitility;

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
<version>4.8.0.redhat-00004</version>
<version>4.8.0.redhat-00006</version>
</parent>

<groupId>org.apache.camel.quarkus</groupId>
Expand All @@ -41,7 +41,7 @@
<!-- Primary dependencies - maintained manually -->
<camel.major.minor>4.8</camel.major.minor>
<camel-community.version>${camel.major.minor}.0</camel-community.version> <!-- run after each change: cd docs && mvnd validate -->
<camel.version>${camel.major.minor}.0.redhat-00004</camel.version>
<camel.version>${camel.major.minor}.0.redhat-00006</camel.version>
<camel.docs.components.version>${camel.major.minor}.x</camel.docs.components.version><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.components.xref>${camel.docs.components.version}@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable camel branch on which our Antora docs depends -->
Expand Down
674 changes: 337 additions & 337 deletions poms/bom/src/main/generated/flattened-full-pom.xml

Large diffs are not rendered by default.

Loading