From aea8b1e5a103a45c16d8aa9978863679df4ddbd2 Mon Sep 17 00:00:00 2001 From: zipwiz Date: Fri, 8 Jan 2016 19:10:21 +0100 Subject: [PATCH 1/3] Update org.eclipse.wst.common.component to refer to current lib versions --- .../.settings/org.eclipse.wst.common.component | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.common.component index d66e56848c..20b3a54fcd 100644 --- a/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.common.component +++ b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.common.component @@ -4,10 +4,10 @@ - + uses - + uses From 5a422f956074f961e8ad7cc86d9c741a389e9194 Mon Sep 17 00:00:00 2001 From: zipwiz Date: Wed, 6 Jan 2016 12:34:23 +0100 Subject: [PATCH 2/3] Update org.eclipse.wst.common.component to refer to current lib versions --- .../.settings/org.eclipse.wst.common.component | 8 ++++---- .../.settings/org.eclipse.wst.common.component | 10 +++++----- .../.settings/org.eclipse.wst.common.component | 8 ++++---- .../.settings/org.eclipse.wst.common.component | 10 +++++----- .../.settings/org.eclipse.wst.common.component | 10 +++++----- .../.settings/org.eclipse.wst.common.component | 8 ++++---- .../.settings/org.eclipse.wst.common.component | 8 ++++---- .../.settings/org.eclipse.wst.common.component | 8 ++++---- .../.settings/org.eclipse.wst.common.component | 8 ++++---- .../.settings/org.eclipse.wst.common.component | 8 ++++---- .../.settings/org.eclipse.wst.common.component | 8 ++++---- 11 files changed, 47 insertions(+), 47 deletions(-) diff --git a/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.common.component index 21244a9df3..a1c5b8640e 100644 --- a/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.common.component +++ b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.common.component @@ -4,16 +4,16 @@ - + uses - + uses - + uses - + uses diff --git a/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.common.component b/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.common.component index 79c6ebb094..c45c5b0913 100644 --- a/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.common.component +++ b/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.common.component @@ -2,19 +2,19 @@ - + uses - + uses - + uses - + uses - + uses diff --git a/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.common.component index 5655482041..9fe57c3038 100644 --- a/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.common.component +++ b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.common.component @@ -4,16 +4,16 @@ - + uses - + uses - + uses - + uses diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.common.component b/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.common.component index de108145f5..2446fc941b 100644 --- a/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.common.component +++ b/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.common.component @@ -2,19 +2,19 @@ - + uses - + uses - + uses - + uses - + uses diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.common.component b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.common.component index 508eb80e6b..42e54bb742 100644 --- a/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.common.component +++ b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.common.component @@ -3,19 +3,19 @@ - + uses - + uses - + uses - + uses - + uses diff --git a/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.common.component index 551e4669de..9cef180152 100644 --- a/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.common.component +++ b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.common.component @@ -4,16 +4,16 @@ - + uses - + uses - + uses - + uses diff --git a/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.common.component index 537d2a64fa..11c0dc44ba 100644 --- a/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.common.component +++ b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.common.component @@ -3,16 +3,16 @@ - + uses - + uses - + uses - + uses diff --git a/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.common.component index 5e60b38ea3..89abd5a535 100644 --- a/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.common.component +++ b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.common.component @@ -2,16 +2,16 @@ - + uses - + uses - + uses - + uses diff --git a/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.common.component index b28dc4b094..78fd9cd870 100644 --- a/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.common.component +++ b/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.common.component @@ -3,16 +3,16 @@ - + uses - + uses - + uses - + uses diff --git a/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.common.component index 4d839b2d84..848846542a 100644 --- a/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.common.component +++ b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.common.component @@ -2,16 +2,16 @@ - + uses - + uses - + uses - + uses diff --git a/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.common.component index ce761a5d25..a8f7616e9f 100644 --- a/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.common.component +++ b/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.common.component @@ -2,16 +2,16 @@ - + uses - + uses - + uses - + uses From 07a48de4470bce5e95631edbef219764d399299c Mon Sep 17 00:00:00 2001 From: zipwiz Date: Sun, 10 Jan 2016 10:10:05 +0100 Subject: [PATCH 3/3] Fix #1759 = https://github.com/travis-ci/travis-ci/issues/4629 for SBT --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ceb5594262..3fbd5db947 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: java +before_install: +- sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml install: echo 'Skipping mvn install' before_script: - ./test-whitespaces.sh