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.

Sign up for GitHub

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.x karaf update #6827

Open
wants to merge 7 commits into
base: 3.x
Choose a base branch
from
Open

3.x karaf update #6827

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bf14b16
Update Karaf Version
middlets719 Dec 6, 2024
cd18a79
Fix kernel itests
middlets719 Dec 12, 2024
eb6211a
Update Karaf Version
middlets719 Jan 14, 2025
1b2b8e8
Merge branch '3.x-karaf-update' of https://github.com/middlets719/ddf…
middlets719 Jan 14, 2025
4e5096d
Karaf 4.4.6 dependency updates
middlets719 Jan 22, 2025
ef9c817
Additional Dependency updates
middlets719 Jan 22, 2025
326c992
Fix CSW comparison test when running on windows
middlets719 Jan 23, 2025
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
5 changes: 3 additions & 2 deletions catalog/core/catalog-core-standardframework/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,10 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
<version>${apache-log4j.version}</version>
</dependency>
<dependency>
<groupId>ddf.mime.core</groupId>
Expand Down
6 changes: 6 additions & 0 deletions catalog/solr/catalog-solr-commands/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@
<version>${solr.jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<version>${pax.logging.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-test-framework</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...olr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ protected static void createMiniSolrCloudCluster() throws Exception {
.addConfig(
DEFAULT_CONFIGSET,
Paths.get(
BackupCommandTest.class.getClassLoader().getResource("configset").getPath()))
BackupCommandTest.class.getClassLoader().getResource("configset").toURI()))
.build();
miniSolrCloud.getSolrClient().connect();
System.setProperty("solr.cloud.shardCount", "1");
Expand Down
2 changes: 1 addition & 1 deletion distribution/ddf-catalog/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
<configuration>
<rules>
<requireFilesSize>
<maxsize>160000000</maxsize>
<maxsize>260000000</maxsize>
<minsize>120000000</minsize>
<files>
<file>${project.build.directory}/${distribution.file.name}.zip</file>
Expand Down
4 changes: 2 additions & 2 deletions distribution/ddf-common/src/main/resources-filtered/etc/startup.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ mvn\:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} = 9
mvn\:org.apache.felix/org.apache.felix.converter/1.0.14 = 9
mvn\:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} = 9
mvn\:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}=10
mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.2.6 = 11
mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.2.8 = 11
mvn\:org.apache.felix/org.apache.felix.configurator/1.0.16 = 11
mvn\:org.apache.felix/org.apache.felix.cm.json/1.0.6 = 11
mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.14 = 11
mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.16 = 11
mvn\:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}=12
mvn\:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.3/${servicemix.specs.jaxb.version}=13
mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-runtime/${servicemix.bundles.jaxb.version}=14
Expand Down
5 changes: 5 additions & 0 deletions distribution/kernel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,5 +339,10 @@
<artifactId>org.apache.servicemix.bundles.jaxb-runtime</artifactId>
<version>${servicemix.bundles.jaxb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>${spifly.version}</version>
</dependency>
</dependencies>
</project>
8 changes: 8 additions & 0 deletions ...est-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
Expand Down Expand Up @@ -109,6 +110,7 @@ public static Option[] examConfiguration() {
public void beforeExam() throws Exception {
startExampleBundle();
featuresService.installFeature(EXAMPLE_FEATURE);
resetBundleContext();
syncInstaller.waitForBundles();
}

Expand Down Expand Up @@ -325,6 +327,12 @@ private void resetExampleMSProps() throws IOException {
.equals(ExampleService.DEFAULT_EXAMPLE_PROP_VALUE));
}

private void resetBundleContext() {
Bundle bundle = FrameworkUtil.getBundle(this.getClass());
bundleContext = bundle.getBundleContext();
configAdmin = getService(ConfigurationAdmin.class);
}

private Stream<org.osgi.service.cm.Configuration> configurations(String filter)
throws IOException, InvalidSyntaxException {
org.osgi.service.cm.Configuration[] configs = configAdmin.listConfigurations(filter);
Expand Down
1 change: 1 addition & 0 deletions features/branding/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

<feature name="ddf-branding" version="${project.version}" description="DDF Branding">
<feature>branding-api</feature>
<bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
<bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle>mvn:commons-configuration/commons-configuration/${commons-configuration.version}</bundle>
<bundle>mvn:ddf.distribution/ddf-branding-plugin/${project.version}</bundle>
Expand Down
1 change: 1 addition & 0 deletions features/kernel/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">

<repository>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</repository>
<repository>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</repository>
<repository>mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features</repository>

<feature name="kernel" version="${project.version}"
Expand Down
4 changes: 4 additions & 0 deletions features/utilities/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<feature name="parser-xml" version="${project.version}"
description="Platform JAXB support.">
<feature>guava</feature>
<bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
<bundle>mvn:ddf.platform/platform-parser-api/${project.version}</bundle>
<bundle>mvn:ddf.platform/platform-parser-xml/${project.version}</bundle>
</feature>
Expand Down Expand Up @@ -97,6 +98,7 @@
description="Tika MIME Resolver">
<feature>mime-core-api</feature>
<feature>slf4j</feature>
<bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
<bundle>mvn:ddf.mime.tika/mime-tika-resolver/${project.version}</bundle>
</feature>

Expand Down Expand Up @@ -163,6 +165,7 @@
<feature prerequisite="true">wrap</feature>
<feature>spifly</feature>
<feature version="${project.version}">jackson</feature>
<bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
<bundle>mvn:org.slf4j/slf4j-api/${tika.slf4j.version}</bundle>
<bundle>mvn:org.slf4j/slf4j-nop/${tika.slf4j.version}</bundle>
<bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
Expand All @@ -173,6 +176,7 @@
</feature>

<feature name="io" version="${project.version}" description="I/O Utilities">
<bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
<bundle>mvn:ddf.platform.io/platform-io-internal-api/${project.version}</bundle>
<bundle>mvn:ddf.platform.io/platform-io-impl/${project.version}</bundle>
</feature>
Expand Down
21 changes: 11 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
<spock.version>2.3-groovy-3.0</spock.version>
<mockito.version>4.9.0</mockito.version>
<pax.exam.version>4.13.5</pax.exam.version>
<pax.logging.version>2.2.0</pax.logging.version>
<pax.url.version>2.6.12</pax.url.version>
<pax.logging.version>2.2.7</pax.logging.version>
<pax.url.version>2.6.14</pax.url.version>
<pax.web.version>8.0.15</pax.web.version>
<restito.version>1.1.0</restito.version>
<restassured.version>3.3.0</restassured.version>
Expand Down Expand Up @@ -155,10 +155,10 @@
<commons-csv.version>1.4</commons-csv.version>
<commons-digester.version>1.8.1</commons-digester.version>
<commons-exec.version>1.3</commons-exec.version>
<commons-io.version>2.13.0</commons-io.version>
<commons-io.version>2.15.1</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-logging.version>1.2</commons-logging.version>
<commons-lang3.version>3.13.0</commons-lang3.version>
<commons-logging.version>1.3.1</commons-logging.version>
<commons-math3.version>3.6.1</commons-math3.version>
<commons-net.version>3.5</commons-net.version>
<countryconverter.version>0.1.8</countryconverter.version>
Expand Down Expand Up @@ -203,11 +203,11 @@
<jts.geotools.version>1.19.0</jts.geotools.version>
<jts.spatial4j.version>1.17.0</jts.spatial4j.version>
<jwnl.version>1.3.3</jwnl.version>
<karaf.version>4.4.3</karaf.version>
<jansi.version>2.4.0</jansi.version>
<org.osgi.util.promise.version>1.2.0</org.osgi.util.promise.version>
<karaf.version>4.4.6</karaf.version>
<jansi.version>2.4.1</jansi.version>
<org.osgi.util.promise.version>1.3.0</org.osgi.util.promise.version>
<org.osgi.util.function.version>1.2.0</org.osgi.util.function.version>
<apache-log4j.version>2.17.0</apache-log4j.version>
<apache-log4j.version>2.24.1</apache-log4j.version>
<logback.classic.version>1.2.3</logback.classic.version>
<logback.version>1.2.3</logback.version>
<mariadb.version>2.4.1</mariadb.version>
Expand Down Expand Up @@ -244,9 +244,10 @@
<solr.httpcore.version>4.4.16</solr.httpcore.version>
<solr.httpmime.version>4.5.14</solr.httpmime.version>
<solr.jetty.version>10.0.12</solr.jetty.version>
<solr.zookeeper.version>3.8.1</solr.zookeeper.version>
<solr.zookeeper.version>3.8.3</solr.zookeeper.version>
<solr.spatial4j.version>0.8</solr.spatial4j.version>
<spatial4j.version>0.8</spatial4j.version>
<spifly.version>1.3.7</spifly.version>
<tika.version>2.8.0</tika.version>
<tika.slf4j.version>2.0.7</tika.slf4j.version>
<usng4j.version>0.4</usng4j.version>
Expand Down