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

Dependencies upgrade #279

Merged
merged 11 commits into from
Jul 4, 2018
Merged

Dependencies upgrade #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b623726
some dependencies updated
wiiitek Jun 29, 2018
da3bd78
mongo driver upgrade
wiiitek Jun 29, 2018
bdfca71
more upgrades
wiiitek Jun 29, 2018
89ea491
plugins dependencies updated
wiiitek Jul 2, 2018
f2d9f7c
changelog update
wiiitek Jul 2, 2018
4bf53a6
versions report updated
wiiitek Jul 2, 2018
631cb38
README updated
wiiitek Jul 2, 2018
56c1703
Merge branch 'master' into upgrade-dependencies
Skejven Jul 4, 2018
765999b
Merge branch 'master' into upgrade-dependencies
Skejven Jul 4, 2018
ded4fc7
Merge branch 'master' into upgrade-dependencies
Skejven Jul 4, 2018
6b47a46
Merge branch 'master' into upgrade-dependencies
Skejven Jul 4, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ All notable changes to AET will be documented in this file.

- [PR-271](https://github.com/Cognifide/aet/pull/271) Added possibility to override name parameter from the aet client
- [PR-268](https://github.com/Cognifide/aet/pull/268) Bobcat upgrade to version 1.4.0
- [PR-279](https://github.com/Cognifide/aet/pull/279) Upgrade for some of libraries used by AET

## Version 2.1.6

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/sanity-functional/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.0-beta-4</version>
<version>1.0-beta-9</version>
</dependency>
<dependency>
<groupId>com.github.ferstl</groupId>
<artifactId>pedantic-pom-enforcers</artifactId>
<version>1.2.0</version>
<version>1.3.1</version>
</dependency>
</dependencies>
</plugin>
Expand Down
7 changes: 7 additions & 0 deletions misc/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,10 @@ Used to store miscellaneous files, e.g.:

- mongodb maintenance scripts
- images

### Versions report

In order to generate current report for versions specified in top-level `pom.xml`
execute following command in AET root module:

mvn clean validate -Pversions
56 changes: 24 additions & 32 deletions misc/dependencies-report.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,34 @@
The following dependencies in Dependency Management have newer versions:
com.google.code.gson:gson ............................... 2.6.1 -> 2.7
com.google.guava:guava .................................. 15.0 -> 19.0
com.google.guava:guava-testlib .......................... 10.0 -> 19.0
com.google.guiceberry:guiceberry ...................... 3.1.0 -> 3.3.1
com.google.inject:guice ............................. 3.0 -> 4.0-beta5
com.google.inject.extensions:guice-assistedinject ... 3.0 -> 4.0-beta5
com.google.guava:guava-testlib ...................... 10.0 -> 25.1-jre
com.googlecode.java-diff-utils:diffutils .............. 1.2.1 -> 1.3.0
com.googlecode.zohhak:zohhak .......................... 1.0.2 -> 1.1.1
commons-codec:commons-codec .............................. 1.8 -> 1.10
commons-io:commons-io ..................................... 2.4 -> 2.5
info.cukes:cucumber-guice ............................. 1.2.3 -> 1.2.4
info.cukes:cucumber-java .............................. 1.2.3 -> 1.2.4
info.cukes:cucumber-junit ............................. 1.2.3 -> 1.2.4
joda-time:joda-time ................................... 2.9.3 -> 2.9.4
javax.validation:validation-api ........... 1.1.0.Final -> 2.0.1.Final
junit:junit ............................................. 4.11 -> 4.12
org.apache.activemq:activemq-osgi ................... 5.13.1 -> 5.13.4
org.apache.camel:camel-core ......................... 2.17.0 -> 2.17.2
org.apache.commons:commons-lang3 ........................ 3.3.2 -> 3.4
org.apache.felix:org.apache.felix.configadmin ........ 1.6.0 -> 1.8.10
org.apache.felix:org.apache.felix.scr.annotations .... 1.9.6 -> 1.11.0
org.apache.activemq:activemq-osgi ................... 5.15.2 -> 5.15.4
org.apache.felix:org.apache.felix.configadmin ........ 1.8.16 -> 1.9.2
org.apache.felix:org.osgi.compendium .................. 1.0.1 -> 1.4.0
org.apache.httpcomponents:fluent-hc ................... 4.3.4 -> 4.5.2
org.apache.servicemix.bundles:org.apache.servicemix.bundles.quartz ...
2.1.7_1 -> 2.2.3_1
org.apache.httpcomponents:httpclient .................. 4.3.3 -> 4.5.5
org.apache.sling:org.apache.sling.commons.osgi ........ 2.2.2 -> 2.4.0
org.apache.sling:org.apache.sling.commons.testing .... 2.0.6 -> 2.0.26
org.hibernate:hibernate-validator ........ 4.3.2.Final -> 5.3.0.Alpha1
org.jboss.logging:jboss-logging .............. 3.1.0.GA -> 3.3.0.Final
org.jsoup:jsoup ....................................... 1.8.1 -> 1.9.2
org.apache.sling:org.apache.sling.commons.testing ..... 2.0.6 -> 2.1.2
org.hibernate:hibernate-validator ........ 4.3.2.Final -> 6.0.10.Final
org.mockito:mockito-all .......................... 1.9.5 -> 2.0.2-beta
org.mongodb:mongo-java-driver ......................... 3.2.2 -> 3.3.0
org.ops4j.pax.web:pax-web-runtime .................... 1.1.17 -> 4.2.7
org.ops4j.pax.web:pax-web-runtime .................... 1.1.17 -> 7.2.0
org.osgi:org.osgi.compendium .......................... 4.2.0 -> 5.0.0
org.osgi:org.osgi.core ................................ 4.3.0 -> 6.0.0
org.powermock:powermock-api-mockito ................... 1.5.2 -> 1.6.5
org.powermock:powermock-core .......................... 1.5.2 -> 1.6.5
org.powermock:powermock-module-junit4 ................. 1.5.2 -> 1.6.5
org.slf4j:slf4j-api .................................. 1.7.7 -> 1.7.21
uk.co.jemos.podam:podam ............... 3.6.0.RELEASE -> 6.0.2.RELEASE
org.powermock:powermock-api-mockito ................... 1.5.2 -> 1.7.4
org.powermock:powermock-core ................... 1.5.2 -> 2.0.0-beta.5
org.powermock:powermock-module-junit4 .......... 1.5.2 -> 2.0.0-beta.5
org.reflections:reflections ......................... 0.9.10 -> 0.9.11
org.skyscreamer:jsonassert ............................ 1.3.0 -> 1.5.0
org.slf4j:slf4j-api ............................. 1.7.7 -> 1.8.0-beta2
org.slf4j:slf4j-simple .......................... 1.7.7 -> 1.8.0-beta2
uk.co.jemos.podam:podam ............... 3.6.0.RELEASE -> 7.1.1.RELEASE
xmlunit:xmlunit ........................................... 1.2 -> 1.6

The following dependencies in pluginManagement of plugins have newer versions:
org.apache.maven.wagon:wagon-ftp ....................... 2.10 -> 3.1.0
org.apache.maven.wagon:wagon-ssh ....................... 2.10 -> 3.1.0
org.eclipse.jetty:jetty-servlets ...
9.2.10.v20150310 -> 9.4.11.v20180605

No dependencies in Plugin Dependencies have newer versions.

7 changes: 2 additions & 5 deletions misc/plugins-report.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@

The following plugin updates are available:
org.apache.felix:maven-bundle-plugin ................. 2.4.0 -> 3.2.0
org.apache.felix:maven-scr-plugin .................. 1.15.0 -> 1.22.0
org.codehaus.mojo:build-helper-maven-plugin ............ 1.11 -> 1.12
org.eclipse.jetty:jetty-maven-plugin ... 9.2.10.v20150310 -> 9.4.0.M0
org.eclipse.jetty:jetty-maven-plugin 9.2.10.v20150310 -> 9.4.11.v20180605


Project defines minimum Maven version as: 3.1.0
Plugins require minimum Maven version of: 3.1.0
Note: the super-pom from Maven 3.3.9 defines some of the plugin
Note: the super-pom from Maven 3.5.4 defines some of the plugin
versions and may be influencing the plugins required minimum Maven
version.

Expand Down
29 changes: 14 additions & 15 deletions osgi-dependencies/aet-features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
</feature>

<feature name="aet-apache-commons" version="0.6.0" description="Apache Commons for AET" install="auto">
<bundle>mvn:commons-codec/commons-codec/1.8</bundle>
<bundle>mvn:commons-codec/commons-codec/1.11</bundle>
<bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
<bundle>mvn:commons-fileupload/commons-fileupload/1.3.2</bundle>
<bundle>mvn:commons-io/commons-io/2.4</bundle>
<bundle>mvn:commons-fileupload/commons-fileupload/1.3.3</bundle>
<bundle>mvn:commons-io/commons-io/2.6</bundle>

<bundle>mvn:org.apache.commons/commons-lang3/3.3.2</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/3.7</bundle>
<bundle>mvn:org.apache.commons/commons-exec/1.1</bundle>

<!-- required by fileupload -->
Expand All @@ -72,7 +72,6 @@
<bundle>mvn:com.wordnik/swagger-annotations/1.3.9</bundle>
</feature>


<feature name="aet-dependencies" version="0.6.0" description="Additional libraries needed by AET" install="auto">

<bundle>wrap:mvn:org.apache.ant/ant/1.8.2</bundle>
Expand All @@ -81,8 +80,8 @@
<bundle>wrap:mvn:cglib/cglib-nodep/2.2.2</bundle>

<bundle>wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.9</bundle>
<bundle>wrap:mvn:com.google.code.gson/gson/2.6.1</bundle>
<bundle>mvn:com.google.guava/guava/23.6-jre</bundle>
<bundle>wrap:mvn:com.google.code.gson/gson/2.8.5</bundle>
<bundle>mvn:com.google.guava/guava/25.1-jre</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.commons.osgi/2.2.2</bundle>
<bundle>wrap:mvn:org.hamcrest/hamcrest-core/1.3</bundle>
<bundle>wrap:mvn:net.sourceforge.htmlunit/htmlunit/2.13</bundle>
Expand All @@ -102,20 +101,20 @@
<bundle>wrap:mvn:com.google.sitebricks/sitebricks/0.8.3</bundle>
<bundle>wrap:mvn:org.yaml/snakeyaml/1.6</bundle>
<bundle>wrap:mvn:org.webbitserver/webbit/0.4.15</bundle>
<bundle>mvn:joda-time/joda-time/2.9.3</bundle>
<bundle>wrap:mvn:org.jsoup/jsoup/1.8.1</bundle>
<bundle>mvn:joda-time/joda-time/2.10</bundle>
<bundle>wrap:mvn:org.jsoup/jsoup/1.11.3</bundle>
<bundle>wrap:mvn:com.googlecode.java-diff-utils/diffutils/1.2.1</bundle>
<bundle>wrap:mvn:org.apache.httpcomponents/fluent-hc/4.3.4</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/2.1.7_1</bundle>
<bundle>mvn:org.apache.camel/camel-core/2.17.0</bundle>
<bundle>mvn:org.json/json/20160212</bundle>
<bundle>wrap:mvn:org.apache.httpcomponents/fluent-hc/4.5.5</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/2.3.0_2</bundle>
<bundle>mvn:org.apache.camel/camel-core/2.21.1</bundle>
<bundle>mvn:org.json/json/20180130</bundle>
<bundle>mvn:javax.validation/validation-api/1.1.0.Final</bundle>
<bundle>mvn:org.hibernate/hibernate-validator/4.3.2.Final</bundle>
<bundle>mvn:org.jboss.logging/jboss-logging/3.1.0.GA</bundle>
<bundle>mvn:org.jboss.logging/jboss-logging/3.3.2.Final</bundle>
<bundle>wrap:mvn:org.simpleframework/simple-xml/2.7.1</bundle>

<!--GRID FS bundles-->
<bundle>mvn:org.mongodb/mongo-java-driver/3.2.2</bundle>
<bundle>mvn:org.mongodb/mongo-java-driver/3.8.0</bundle>
<bundle>mvn:commons-beanutils/commons-beanutils/1.9.2</bundle>
<!--GRID FS bundles-->
</feature>
Expand Down
40 changes: 20 additions & 20 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,19 +157,19 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>23.6-jre</version>
<version>25.1-jre</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
<version>3.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-osgi</artifactId>
<version>5.13.1</version>
<version>5.15.2</version>
<scope>provided</scope>
</dependency>

Expand All @@ -195,7 +195,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>1.6.0</version>
<version>1.8.16</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -237,7 +237,7 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.1.0.GA</version>
<version>3.3.2.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -249,43 +249,43 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.quartz</artifactId>
<version>2.1.7_1</version>
<version>2.3.0_2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<version>2.17.0</version>
<version>2.21.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.9.3</version>
<version>2.10</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.8</version>
<version>1.11</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.2</version>
<version>1.3.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<version>2.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<version>3.2.2</version>
<version>3.8.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -297,7 +297,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20160212</version>
<version>20180130</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -323,19 +323,19 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
<version>4.3.4</version>
<version>4.5.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.6.1</version>
<version>2.8.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.8.1</version>
<version>1.11.3</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -491,7 +491,7 @@
<dependency>
<groupId>com.googlecode.zohhak</groupId>
<artifactId>zohhak</artifactId>
<version>1.0.2</version>
<version>1.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -561,7 +561,7 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -604,12 +604,12 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.0-beta-4</version>
<version>1.0-beta-9</version>
</dependency>
<dependency>
<groupId>com.github.ferstl</groupId>
<artifactId>pedantic-pom-enforcers</artifactId>
<version>1.2.0</version>
<version>1.3.1</version>
</dependency>
</dependencies>
</plugin>
Expand Down