Skip to content

Commit

Permalink
MH-12746, Library Update
Browse files Browse the repository at this point in the history 
This patch updates several Java dependencies.
  • Loading branch information
@lkiesow
lkiesow committed Mar 5, 2018
1 parent 5e518ea commit edbbdfc
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 23 deletions.
17 changes: 8 additions & 9 deletions assemblies/karaf-features/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<feature name="query-dsl">
<bundle>mvn:com.google.guava/guava/18.0</bundle>
<bundle>mvn:joda-time/joda-time/2.9.4</bundle>
<bundle>mvn:joda-time/joda-time/2.9.9</bundle>
<bundle>mvn:com.mysema.commons/mysema-commons-lang/0.2.4</bundle>
<bundle>mvn:com.mysema.querydsl/querydsl-core/3.6.5</bundle>
<bundle>mvn:com.mysema.querydsl/querydsl-sql/3.6.5</bundle>
Expand All @@ -22,7 +22,7 @@
<bundle start-level="55">mvn:org.apache.httpcomponents/httpclient-osgi/${httpcomponents-httpclient.version}</bundle>
<bundle start-level="55">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcomponents-httpcore.version}</bundle>
<bundle start-level="55">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/3.1_7</bundle>
<bundle start-level="55">mvn:commons-codec/commons-codec/1.10</bundle>
<bundle start-level="55">mvn:commons-codec/commons-codec/1.11</bundle>

<!-- General specifications -->
<bundle>mvn:javax.el/javax.el-api/3.0.0</bundle>
Expand All @@ -42,23 +42,22 @@
<bundle>mvn:com.entwinemedia.common/functional/${functional.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
<bundle>mvn:com.google.guava/guava/18.0</bundle>
<bundle>mvn:com.google.code.gson/gson/2.8.1</bundle>
<bundle>mvn:commons-collections/commons-collections/3.2.2</bundle>
<bundle>mvn:com.google.code.gson/gson/2.8.2</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collection.version}</bundle>
<bundle>mvn:commons-fileupload/commons-fileupload/1.3.3</bundle>
<bundle>mvn:commons-io/commons-io/2.5</bundle>
<bundle>mvn:commons-io/commons-io/2.6</bundle>
<!-- FIXME: commons-lang 2.6 only needed for the ical library in the commons bundle -->
<bundle>mvn:commons-lang/commons-lang/2.6</bundle>
<bundle>mvn:joda-time/joda-time/2.9.4</bundle>
<bundle>mvn:joda-time/joda-time/2.9.9</bundle>
<bundle>mvn:org.aopalliance/com.springsource.org.aopalliance/1.0.0</bundle>
<bundle>mvn:org.apache.commons/com.springsource.org.apache.commons.beanutils/1.8.3</bundle>
<bundle>mvn:org.apache.commons/commons-compress/${commons-compress.version}</bundle>
<bundle>mvn:org.apache.commons/commons-csv/1.0</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/3.6</bundle>
<bundle>mvn:org.apache.commons/commons-csv/1.5</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/3.7</bundle>
<bundle>mvn:org.apache.neethi/neethi/3.0.1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/5.2_3</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.batik/1.7_3</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/3.2.4_1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_4</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jakarta-regexp/1.4_1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.8.5_1</bundle>
Expand Down
23 changes: 9 additions & 14 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<opencast.nexus-backup.url>https://nexus.opencast.org</opencast.nexus-backup.url>
<eclipselink.version>2.6.4</eclipselink.version>
<commons-collection.version>3.2.2</commons-collection.version>
<commons-compress.version>1.12</commons-compress.version>
<commons-compress.version>1.16.1</commons-compress.version>
<httpcomponents-httpcore.version>4.4.1</httpcomponents-httpcore.version>
<httpcomponents-httpclient.version>4.5</httpcomponents-httpclient.version>
<aws.version>1.11.49_1</aws.version>
Expand Down Expand Up @@ -939,7 +939,7 @@
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
<version>3.4</version>
<version>3.5.1</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Expand Down Expand Up @@ -988,7 +988,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
<version>1.11</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
Expand All @@ -1003,27 +1003,22 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.6</version>
<version>3.7</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.5.3</version>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.0</version>
<version>1.5</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -1045,7 +1040,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.9.4</version>
<version>2.9.9</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand Down Expand Up @@ -1093,7 +1088,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.1</version>
<version>2.8.2</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
Expand Down

0 comments on commit edbbdfc

Please sign in to comment.