Skip to content

Commit 316d764

Browse files
authored
Merge pull request #490 from wimjongman/master
#484 Neon Support
2 parents 951305d + 08a7d10 commit 316d764

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ script:
1111
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then echo Travis SECURE available -- Deploy; else echo Travis SECURE NOT available -- Verify; fi"
1212

1313
#Execute the maven commands depending on SECURE availabilty and print the elapsed time out periodically.
14-
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then ./travis_exec_and_print_time.sh 'mvn deploy -Pall --quiet --settings settings.xml'; else ./travis_exec_and_print_time.sh 'mvn verify -Pall --quiet --settings settings.xml'; fi"
14+
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then ./travis_exec_and_print_time.sh 'mvn deploy -Pall,neon --quiet --settings settings.xml'; else ./travis_exec_and_print_time.sh 'mvn verify -Pall,neon --quiet --settings settings.xml'; fi"
1515

1616
#Several usernames and passwords/tokens are required for deployment.
1717
#When testing on your local/remote setup then you need to set/export env. variables:

it.baeyens.arduino.common/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ Bundle-Activator: it.baeyens.arduino.common.Activator
77
Require-Bundle: org.eclipse.ui,
88
org.eclipse.core.runtime,
99
org.junit,
10-
org.eclipse.wb.core.lib,
1110
org.eclipse.cdt.core
1211
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
1312
Bundle-ActivationPolicy: lazy
1413
Export-Package: it.baeyens.arduino.arduino,
1514
it.baeyens.arduino.common
16-
Import-Package: org.eclipse.cdt.core,
15+
Import-Package: org.apache.commons.io,
16+
org.eclipse.cdt.core,
1717
org.eclipse.cdt.core.envvar,
1818
org.eclipse.cdt.core.index,
1919
org.eclipse.cdt.core.model,

it.baeyens.arduino.parent/pom.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -397,21 +397,16 @@
397397
<layout>p2</layout>
398398
<url> http://download.eclipse.org/releases/neon</url>
399399
</repository>
400-
401-
<repository>
402-
<id>window_builder_neon</id>
403-
<layout>p2</layout>
404-
<url>http://download.eclipse.org/windowbuilder/WB/release/R201506241200-1/4.5/</url>
405-
</repository>
400+
406401
</repositories>
407402
</profile>
408403
</profiles>
409404

410-
<repositories>
405+
<repositories>
411406
<repository>
412407
<id>nebula</id>
413408
<layout>p2</layout>
414-
<url> http://download.eclipse.org/technology/nebula/snapshot</url>
409+
<url>http://download.eclipse.org/technology/nebula/snapshot</url>
415410
</repository>
416411
</repositories>
417412

0 commit comments

Comments
 (0)