From b9a2e155fdabe5ffd8fc17b67c2554bd879c36ff Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Sun, 21 Feb 2016 20:50:21 +0100 Subject: [PATCH 1/7] Removed runtime dependencies to sass compiler package --- .../ui/components/SPUIComponentProvider.java | 6 +-- .../management/targettable/TargetTable.java | 49 +++++++++---------- .../ui/rollout/AbstractSimpleTableHeader.java | 2 +- pom.xml | 24 --------- 4 files changed, 27 insertions(+), 54 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java index 265b1db83..62e16da94 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java @@ -11,6 +11,7 @@ package org.eclipse.hawkbit.ui.components; import java.util.Arrays; import java.util.Map; +import org.apache.commons.lang3.StringUtils; import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.ui.decorators.SPUIButtonDecorator; import org.eclipse.hawkbit.ui.decorators.SPUIComboBoxDecorator; @@ -23,7 +24,6 @@ import org.eclipse.hawkbit.ui.utils.SPUIDefinitions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.vaadin.sass.internal.util.StringUtil; import com.vaadin.server.ExternalResource; import com.vaadin.server.FontAwesome; import com.vaadin.server.Resource; @@ -109,7 +109,7 @@ public final class SPUIComponentProvider { // Do we really need this??? HorizontalLayout hLayout = getHorizontalLayout(new SPUIHorizontalLayout().getUiHorizontalLayout().getClass()); try { - SPUIHeaderLayoutDecorator layoutDecorator = null; + SPUIHeaderLayoutDecorator layoutDecorator; if (tableHeaderLayoutDecorator != null) { layoutDecorator = tableHeaderLayoutDecorator.newInstance(); hLayout = layoutDecorator.decorate(hLayout); @@ -324,7 +324,7 @@ public final class SPUIComponentProvider { * @return Label */ public static Label createNameValueLabel(final String label, final String... values) { - final String valueStr = StringUtil.collectionToDelimitedString(Arrays.asList(values), " "); + final String valueStr = StringUtils.join(Arrays.asList(values), " "); final Label nameValueLabel = new Label(getBoldHTMLText(label) + valueStr, ContentMode.HTML); nameValueLabel.setSizeFull(); nameValueLabel.addStyleName(SPUIDefinitions.TEXT_STYLE); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java index 62276346e..9ed202343 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java @@ -73,8 +73,8 @@ import org.vaadin.spring.events.EventBus; import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; +import com.google.common.base.Strings; import com.google.common.collect.Iterables; -import com.google.gwt.thirdparty.guava.common.base.Strings; import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.event.Action; @@ -104,6 +104,8 @@ import com.vaadin.ui.themes.ValoTheme; @ViewScope public class TargetTable extends AbstractTable implements Handler { + private static final String TARGET_PINNED = "targetPinned"; + private static final long serialVersionUID = -2300392868806614568L; private static final Logger LOG = LoggerFactory.getLogger(TargetTable.class); @@ -271,7 +273,7 @@ public class TargetTable extends AbstractTable implements Handler { final Map queryConfig = prepareQueryConfigFilters(); // Create TargetBeanQuery factory with the query config. - final BeanQueryFactory targetQF = new BeanQueryFactory(TargetBeanQuery.class); + final BeanQueryFactory targetQF = new BeanQueryFactory<>(TargetBeanQuery.class); targetQF.setQueryConfiguration(queryConfig); // create lazy query container with lazy defination and query @@ -394,7 +396,7 @@ public class TargetTable extends AbstractTable implements Handler { */ @Override protected List getTableVisibleColumns() { - final List columnList = new ArrayList(); + final List columnList = new ArrayList<>(); if (isMaximized()) { columnList.add(new TableColumn(SPUILabelDefinitions.VAR_NAME, i18n.get("header.name"), 0.2f)); columnList.add(new TableColumn(SPUILabelDefinitions.VAR_CREATED_BY, i18n.get("header.createdBy"), 0.1f)); @@ -469,7 +471,7 @@ public class TargetTable extends AbstractTable implements Handler { } private Map prepareQueryConfigFilters() { - final Map queryConfig = new HashMap(); + final Map queryConfig = new HashMap<>(); managementUIState.getTargetTableFilters().getSearchText() .ifPresent(value -> queryConfig.put(SPUIDefinitions.FILTER_BY_TEXT, value)); managementUIState.getTargetTableFilters().getDistributionSet() @@ -481,7 +483,7 @@ public class TargetTable extends AbstractTable implements Handler { queryConfig.put(SPUIDefinitions.FILTER_BY_NO_TAG, managementUIState.getTargetTableFilters().isNoTagSelected()); if (isFilteredByTags()) { - final List list = new ArrayList(); + final List list = new ArrayList<>(); list.addAll(managementUIState.getTargetTableFilters().getClickedTargetTags()); queryConfig.put(SPUIDefinitions.FILTER_BY_TAG, list.toArray(new String[list.size()])); } @@ -522,7 +524,7 @@ public class TargetTable extends AbstractTable implements Handler { pinBtn.setId(SPUIComponetIdProvider.TARGET_PIN_ICON + "." + itemId); pinBtn.addClickListener(event -> addPinClickListener(event)); if (isPinned(((TargetIdName) itemId).getControllerId())) { - pinBtn.addStyleName("targetPinned"); + pinBtn.addStyleName(TARGET_PINNED); isTargetPinned = Boolean.TRUE; targetPinnedBtn = pinBtn; eventBus.publish(this, PinUnpinEvent.PIN_TARGET); @@ -533,7 +535,7 @@ public class TargetTable extends AbstractTable implements Handler { } private boolean isPinned(final String targetId) { - boolean result = false; + boolean result; if (managementUIState.getDistributionTableFilters().getPinnedTargetId().isPresent() && targetId.equals(managementUIState.getDistributionTableFilters().getPinnedTargetId().get())) { result = true; @@ -594,7 +596,7 @@ public class TargetTable extends AbstractTable implements Handler { eventBus.publish(this, PinUnpinEvent.PIN_TARGET); /* change target table styling */ styleTargetTable(); - eventBtn.addStyleName("targetPinned"); + eventBtn.addStyleName(TARGET_PINNED); isTargetPinned = Boolean.FALSE; } @@ -605,7 +607,7 @@ public class TargetTable extends AbstractTable implements Handler { } private void resetPinStyle(final Button pinBtn) { - pinBtn.removeStyleName("targetPinned"); + pinBtn.removeStyleName(TARGET_PINNED); pinBtn.addStyleName(SPUIStyleDefinitions.TARGET_STATUS_PIN_TOGGLE); HawkbitCommonUtil.applyStatusLblStyle(this, pinBtn, pinBtn.getData()); } @@ -644,7 +646,7 @@ public class TargetTable extends AbstractTable implements Handler { final com.vaadin.event.dd.TargetDetails taregtDet = event.getTargetDetails(); final Table targetTable = (Table) taregtDet.getTarget(); final Set targetSelected = HawkbitCommonUtil.getSelectedTargetDetails(targetTable); - final Set targetList = new HashSet(); + final Set targetList = new HashSet<>(); final AbstractSelectTargetDetails dropData = (AbstractSelectTargetDetails) event.getTargetDetails(); final Object targetItemId = dropData.getItemIdOver(); if (!targetSelected.contains(targetItemId)) { @@ -701,9 +703,8 @@ public class TargetTable extends AbstractTable implements Handler { private static Set getDraggedDistributionSet(final TableTransferable transferable, final Table source) { - @SuppressWarnings("unchecked") final Set distSelected = HawkbitCommonUtil.getSelectedDSDetails(source); - final Set distributionIdSet = new HashSet(); + final Set distributionIdSet = new HashSet<>(); if (!distSelected.contains(transferable.getData(ITEMID))) { distributionIdSet.add((DistributionSetIdName) transferable.getData(ITEMID)); } else { @@ -828,15 +829,11 @@ public class TargetTable extends AbstractTable implements Handler { } } - /** - * @param filterEvent - * @return - */ - private boolean checkFilterEvent(final TargetFilterEvent filterEvent) { - boolean isFilterEvent = false; - boolean isFilter = false; - boolean isRemoveFilters = false; - boolean isStatusFilter = false; + private static boolean checkFilterEvent(final TargetFilterEvent filterEvent) { + boolean isFilterEvent; + boolean isFilter; + boolean isRemoveFilters; + boolean isStatusFilter; isFilter = filterEvent == TargetFilterEvent.FILTER_BY_TEXT || filterEvent == TargetFilterEvent.FILTER_BY_TAG || filterEvent == TargetFilterEvent.FILTER_BY_DISTRIBUTION || filterEvent == TargetFilterEvent.FILTER_BY_TARGET_FILTER_QUERY; @@ -1020,11 +1017,11 @@ public class TargetTable extends AbstractTable implements Handler { private List getTargetIdsBySimpleFilters(final PageRequest pageRequest) { final Long filterByDistId = managementUIState.getTargetTableFilters().getDistributionSet().isPresent() ? managementUIState.getTargetTableFilters().getDistributionSet().get().getId() : null; - final List statusList = new ArrayList(); + final List statusList = new ArrayList<>(); if (isFilteredByStatus()) { statusList.addAll(managementUIState.getTargetTableFilters().getClickedStatusTargetTags()); } - final List tagList = new ArrayList(); + final List tagList = new ArrayList<>(); if (isFilteredByTags()) { tagList.addAll(managementUIState.getTargetTableFilters().getClickedTargetTags()); } @@ -1081,7 +1078,7 @@ public class TargetTable extends AbstractTable implements Handler { String[] targetTags = null; Long distributionId = null; String searchText = null; - Boolean noTagClicked = Boolean.FALSE; + Boolean noTagClicked; Long pinnedDistId = null; if (isFilteredByTags()) { @@ -1129,13 +1126,13 @@ public class TargetTable extends AbstractTable implements Handler { && !Strings.isNullOrEmpty(managementUIState.getTargetTableFilters().getSearchText().get()); } - private Boolean anyFilterSelected(final Collection status, final Long distributionId, + private static Boolean anyFilterSelected(final Collection status, final Long distributionId, final Boolean noTagClicked, final String[] targetTags, final String searchText) { return status == null && distributionId == null && Strings.isNullOrEmpty(searchText) && !isTagSelected(targetTags, noTagClicked); } - private Boolean isTagSelected(final String[] targetTags, final Boolean noTagClicked) { + private static Boolean isTagSelected(final String[] targetTags, final Boolean noTagClicked) { return targetTags == null && !noTagClicked; } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/AbstractSimpleTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/AbstractSimpleTableHeader.java index c51c02fe4..38f59b270 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/AbstractSimpleTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/AbstractSimpleTableHeader.java @@ -15,7 +15,7 @@ import org.eclipse.hawkbit.ui.utils.SPUIDefinitions; import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions; -import com.google.gwt.thirdparty.guava.common.base.Strings; +import com.google.common.base.Strings; import com.vaadin.server.FontAwesome; import com.vaadin.ui.AbstractTextField.TextChangeEventMode; import com.vaadin.ui.Alignment; diff --git a/pom.xml b/pom.xml index aa188e76a..82163f1d3 100644 --- a/pom.xml +++ b/pom.xml @@ -363,30 +363,6 @@ vaadin-push ${vaadin.version} - - - com.vaadin - vaadin-client-compiler - ${vaadin.version} - provided - - - org.eclipse.jetty - jetty-servlets - - - org.eclipse.jetty - jetty-annotations - - - org.eclipse.jetty - jetty-util - - - com.vaadin vaadin-themes From 13345406ee2e9d7355b89802c210d549606cf7a4 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Mon, 22 Feb 2016 11:01:47 +0100 Subject: [PATCH 2/7] Upgraded 3rd party libs --- .../hawkbit/artifact/MongoDBTestRule.java | 2 +- .../AbstractIntegrationTestWithMongoDB.java | 2 +- pom.xml | 41 +++++++++++-------- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/MongoDBTestRule.java b/hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/MongoDBTestRule.java index d8485787e..f5d88ceaa 100644 --- a/hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/MongoDBTestRule.java +++ b/hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/MongoDBTestRule.java @@ -88,7 +88,7 @@ public class MongoDBTestRule implements TestRule { System.setProperty("spring.data.mongodb.port", String.valueOf(port)); } - Version version = Version.V3_1_0; + Version version = Version.V3_0_8; if (System.getProperty("inf.mongodb.version") != null) { version = Version.valueOf("V" + System.getProperty("inf.mongodb.version").trim().replaceAll("\\.", "_")); } diff --git a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/AbstractIntegrationTestWithMongoDB.java b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/AbstractIntegrationTestWithMongoDB.java index eb2174a57..6d116c5f0 100644 --- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/AbstractIntegrationTestWithMongoDB.java +++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/AbstractIntegrationTestWithMongoDB.java @@ -55,7 +55,7 @@ public abstract class AbstractIntegrationTestWithMongoDB extends AbstractIntegra System.setProperty("spring.data.mongodb.port", String.valueOf(port)); } - Version version = Version.V3_0_5; + Version version = Version.V3_0_8; if (System.getProperty("inf.mongodb.version") != null) { version = Version .valueOf("V" + System.getProperty("inf.mongodb.version").trim().replaceAll("\\.", "_")); diff --git a/pom.xml b/pom.xml index aa188e76a..99471bb93 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.7.RELEASE + 1.2.8.RELEASE org.eclipse.hawkbit @@ -57,42 +57,49 @@ - 1.2.7.RELEASE + 1.2.8.RELEASE - - 1.4.186 + + 2.5.0 5.2.2.Final - Fowler-SR1 1.2.0.RELEASE - 3.0.2 - + + Fowler-SR1 + 3.2.2 + 1.0.0 0.0.6.RELEASE - 7.5.7 + 7.5.10 ${vaadin.version} - + 1.4 2.0M10 - 1.8 1.4.15 - 2.6.0 + 2.6.2 1.5.4 1.0.2 0.9.1 3.4 1.8.5 + 19.0 + 1.3.5 + 1.50.2 + + + 1.8 - + scm:git:https://github.com/eclipse/hawkbit.git scm:git:https://github.com/eclipse/hawkbit.git https://github.com/eclipse/hawkbit.git + - + https://sonar.eu-gb.mybluemix.net eclipse/hawkbit jacoco @@ -123,7 +130,7 @@ ${jacoco.outputDir}/${jacoco.out.it.file} - 19.0 + @@ -335,7 +342,7 @@ org.slf4j slf4j-api - 1.7.7 + ${slf4j.version} @@ -582,7 +589,7 @@ de.flapdoodle.embed de.flapdoodle.embed.mongo - 1.50.0 + ${embedded-mongo.version} test @@ -624,7 +631,7 @@ org.mariadb.jdbc mariadb-java-client - 1.2.3 + ${mariadb-java-client.version} test From cf3adaac63c62886b4e5fc24c72c0e87e05ee511 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Mon, 22 Feb 2016 12:20:56 +0100 Subject: [PATCH 3/7] Cleaned up POM --- pom.xml | 65 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/pom.xml b/pom.xml index 99471bb93..67dbdadd9 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,11 @@ 0.0.6.RELEASE 7.5.10 ${vaadin.version} + 7.4.0.1 + 2.2.0 + 7.0.1 + 1.2.0 + 4.5 @@ -84,11 +89,18 @@ 1.5.4 1.0.2 0.9.1 - 3.4 1.8.5 19.0 1.3.5 1.50.2 + 1.18.1 + 2.2.4 + 1.1.7 + 1.1 + 1.1.1 + 3.4 + 20141113 + 2.0.0 1.8 @@ -402,44 +414,44 @@ org.vaadin.addons.lazyquerycontainer vaadin-lazyquerycontainer - 7.4.0.1 + ${vaadin.addon.vaadin-lazyquerycontainer.version} org.vaadin.addons flexibleoptiongroup - 2.2.0 + ${vaadin.addon.flexibleoptiongroup.version} org.vaadin.addons tokenfield - 7.0.1 + ${vaadin.addon.tokenfield.version} org.vaadin.alump.distributionbar dbar-addon - 1.2.0 + ${vaadin.addon.dbar-addon.version} org.vaadin.addons contextmenu - 4.5 + ${vaadin.addon.contextmenu.version} javax.el javax.el-api - 2.2.4 + ${javax.el-api.version} net.sf.corn corn-cps - 1.1.7 + ${corn-cps.version} net._01001111 jlorem - 1.1 + ${jlorem.version} @@ -521,13 +533,6 @@ - - - com.fasterxml - classmate - 1.3.0 - org.eclipse.persistence org.eclipse.persistence.jpa @@ -537,7 +542,7 @@ cz.jirutka.rsql rsql-parser - 2.0.0 + ${rsql-parser.version} @@ -548,7 +553,7 @@ com.googlecode.json-simple json-simple - 1.1.1 + ${json-simple.version} junit @@ -556,13 +561,13 @@ - - - xml-apis - xml-apis - 1.4.01 + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} - + org.springframework.boot spring-boot-starter-test @@ -574,16 +579,10 @@ - - com.vaadin - vaadin-testbench - 4.0.3 - test - org.json json - 20141113 + ${json.version} test @@ -613,7 +612,7 @@ com.sun.jersey jersey-client - 1.18.1 + ${jersey-client.version} test @@ -625,7 +624,7 @@ com.jayway.jsonpath json-path-assert - 0.9.1 + ${json-path.version} test From 713922d7624077a2e33b62f8651c32c413e1c7c1 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Mon, 22 Feb 2016 12:21:14 +0100 Subject: [PATCH 4/7] Remove broken spring property usage for vaadin caching --- .../src/main/resources/hawkbitdefaults.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties b/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties index 09ae37f90..98749a384 100644 --- a/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties +++ b/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties @@ -29,10 +29,8 @@ flyway.initOnMigrate=true flyway.sqlMigrationSuffix=${spring.jpa.database}.sql # Vaadin Servlet -vaadin.static.servlet.resourceCacheTime=${spring.resources.cache-period} vaadin.static.servlet.productionMode=true vaadin.servlet.productionMode=true -vaadin.servlet.resourceCacheTime=${spring.resources.cache-period} vaadin.servlet.urlMapping=/UI/* vaadin.servlet.params.heartbeatInterval=60 vaadin.servlet.params.closeIdleSessions=false From 8507ae2bd3cf0baece719f8865215d7ba5559512 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Tue, 23 Feb 2016 11:14:48 +0100 Subject: [PATCH 5/7] Moved java version on top --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 67dbdadd9..e5ac3ca26 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,8 @@ + 1.8 + 1.2.8.RELEASE @@ -102,8 +104,6 @@ 20141113 2.0.0 - - 1.8 scm:git:https://github.com/eclipse/hawkbit.git From 6a5a3f2188b18f1168766987578eab4a62b36f7b Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Tue, 23 Feb 2016 11:34:36 +0100 Subject: [PATCH 6/7] Cleaned up code --- .../ui/components/SPUIComponentProvider.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java index 62e16da94..5b2e4ed9a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java @@ -108,16 +108,16 @@ public final class SPUIComponentProvider { final Class tableHeaderLayoutDecorator) { // Do we really need this??? HorizontalLayout hLayout = getHorizontalLayout(new SPUIHorizontalLayout().getUiHorizontalLayout().getClass()); + + if (tableHeaderLayoutDecorator == null) { + return hLayout; + } + try { - SPUIHeaderLayoutDecorator layoutDecorator; - if (tableHeaderLayoutDecorator != null) { - layoutDecorator = tableHeaderLayoutDecorator.newInstance(); - hLayout = layoutDecorator.decorate(hLayout); - } - } catch (final InstantiationException exception) { - LOG.error("Error occured while creating horizontal decorator " + SPUIHeaderLayoutDecorator.class, - exception); - } catch (final IllegalAccessException exception) { + final SPUIHeaderLayoutDecorator layoutDecorator = tableHeaderLayoutDecorator.newInstance(); + hLayout = layoutDecorator.decorate(hLayout); + + } catch (final InstantiationException | IllegalAccessException exception) { LOG.error("Error occured while creating horizontal decorator " + SPUIHeaderLayoutDecorator.class, exception); } From 1db0d6a5e98c3191e67ba305f4fde0d87741c743 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Tue, 23 Feb 2016 13:10:33 +0100 Subject: [PATCH 7/7] Upgraded to newer jackson and hibernate validator version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e5ac3ca26..f5ec54435 100644 --- a/pom.xml +++ b/pom.xml @@ -63,8 +63,8 @@ - 2.5.0 - 5.2.2.Final + 2.5.5 + 5.2.4.Final 1.2.0.RELEASE Fowler-SR1