Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ script:
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then echo Travis SECURE available -- Deploy; else echo Travis SECURE NOT available -- Verify; fi"

#Execute the maven commands depending on SECURE availabilty and print the elapsed time out periodically.
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then ./travis_exec_and_print_time.sh 'mvn deploy -Pall,oxygen,NOSDK -Dtest=RegressionTest --quiet --settings settings.xml'; else ./travis_exec_and_print_time.sh 'mvn verify -Pall,oxygen,NOSDK -Dtest=RegressionTest --quiet --settings settings.xml'; fi"
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then ./travis_exec_and_print_time.sh 'mvn deploy -Pall,photon,NOSDK -Dnexus.view.exhaustForAgents=Apache-Maven.* -Dtest=RegressionTest --settings settings.xml'; else ./travis_exec_and_print_time.sh 'mvn verify -Pall,photon,NOSDK -Dnexus.view.exhaustForAgents=Apache-Maven.* -Dtest=RegressionTest --settings settings.xml'; fi"

#Several usernames and passwords/tokens are required for deployment.
#When testing on your local/remote setup then you need to set/export env. variables:
Expand All @@ -37,15 +37,9 @@ env:
- secure: "gUpJ6dlh/SBsJP+QlNFbNhchZzKRDmwuWjrId7lTyToVhAzoQSygNS7DfuemfJkhIdHVkZELnvfTx3FaeIfW59zQ2654HMiUrvUINFys+pq6C0vwPyQzAXg4KLn6kExgbn6md5zb8w2fE68Mb2y20jduhzBOAVWvK361lC4oeSI="
- secure: "ZNF1Tc17sq5tsChKi4+yAv6mqhxOfq/zZ38TnRYr1zos2G1jCJJNw4zq1ojUGFViCxdt76xwlDYwavjzAMfsdI3/zoPePtaFJj3w8V6y4C10rgGW67bY4HwW2i0sudIbSWQ+skmG2zbVvJLrIMj2c6IXDM13sTW1Dv+Pt4tTaSs="

#Only for development work on brodykenrick's repo
#brodykenrick/arduino-eclipse-plugin
# - secure: "CkTScsFgbeqTznfGoAhhS0XRie2jr+syjpD3Vvn8Gw/OFCXkKjDEBWUebQdpJjXe9ia23dmTdQMFwp2HcPhrUj6cpnHNcOqVSfPRKfYPbYgXMmVSciGfqkgY3aWArddQ1G8SOMzivfYW6QZIkhanFsk00HkWOrYzxppXyA3m4GY="
# - secure: "bd0gCncNkyhwmIHkir2d7jprS+HNTd4DOVutYpIKQTVaJpvFKRw4anqZGMZp3wwxPyP3i30fMVvPoFJVCEphxRuJRomeqgrJJUpKAsh5QAIODYj9A2A8/KDa+jrTtbpPh16YAiMPmnMgq4NT3Wd5cjZuuBHxRmvaMMlb6BoJCO0="
# - secure: "oFSaKCjBm8L8ZgSvC3rAPKIXcXXJuEb+3eQ+lJbU84QK6C7wRd+2mz4fQ0E5GNSNxWACPbtypopUCPj4auCazhcbudO2wzpAksfJJpkIXd6vZN6xmxJLRzQWp7aNQG7a0UWvuY49/11IY834uhxPoJHBIFRh9jALHMLeF4epfko="

# This is the Github username of the repository of the source we are building.
# This is the Github username of the repository of the source we are building.
#Needs to be inline with the repo being built (i.e. change it).
- CI_GITHUB_REPOUSERNAME=jantje
- CI_GITHUB_REPOUSERNAME=sloeber
#Only for development work on brodykenrick's repo
# - CI_GITHUB_REPOUSERNAME=brodykenrick
jdk:
Expand Down
2 changes: 1 addition & 1 deletion io.sloeber.application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
<groupId>io.sloeber</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.2.0-SNAPSHOT</version>
<relativePath>../io.sloeber.parent</relativePath>
Expand Down
2 changes: 1 addition & 1 deletion io.sloeber.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
<groupId>io.sloeber</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.2.0-SNAPSHOT</version>
<relativePath>../io.sloeber.parent</relativePath>
Expand Down
1 change: 1 addition & 0 deletions io.sloeber.feature/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ bin.includes = feature.xml,\
license.html,\
epl-v10.html,\
feature.properties
root=rootfiles
2 changes: 1 addition & 1 deletion io.sloeber.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
<groupId>io.sloeber</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.2.0-SNAPSHOT</version>
<relativePath>../io.sloeber.parent</relativePath>
Expand Down
17 changes: 17 additions & 0 deletions io.sloeber.feature/rootfiles/log4j/log4j.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">

<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="console" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %c{1} - %m%n"/>
</layout>
</appender>

<root>
<priority value ="debug" />
<appender-ref ref="console" />
</root>

</log4j:configuration>
14 changes: 7 additions & 7 deletions io.sloeber.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
<groupId>io.sloeber</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
<tycho.version>0.24.0</tycho.version>
<tycho.version>1.2.0</tycho.version>
<built.repo.dir>${project.build.directory}/repo</built.repo.dir>
</properties>

<parent>
<!--<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<relativePath>org.sonatype.oss:oss-parent</relativePath>
Expand All @@ -23,9 +23,9 @@
<connection>scm:git:git://github.com/${github.repo.username}/arduino-eclipse-plugin.git</connection>
<developerConnection>scm:git:git@github.com:${github.repo.username}/arduino-eclipse-plugin.git</developerConnection>
<url>http://github.com/${github.repo.username}/arduino-eclipse-plugin</url>
</scm>
</scm> -->

<!-- Sonatype repos -->
<!-- Sonatype repos -->
<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
Expand Down Expand Up @@ -469,13 +469,13 @@
<repository>
<id>platform_photon</id>
<layout>p2</layout>
<url>http://download.eclipse.org/eclipse/updates/4.8</url>
<url>http://download.eclipse.org/eclipse/updates/4.8/</url>
</repository>

<repository>
<id>release-train_photon</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/photon</url>
<url>http://download.eclipse.org/releases/photon</url>
</repository>

</repositories>
Expand Down
2 changes: 2 additions & 0 deletions io.sloeber.product.sdk/arduino.product
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ https://github.com/jantje/arduino-eclipse-plugin/graphs/contributors
</programArgs>
<vmArgs>-Dosgi.requiredJavaVersion=1.8
-Dorg.eclipse.update.reconcile=false
-Dlog4j.configuration=log4j/log4j.xml
-Xms40m
-Xmx512m
--add-modules=ALL-SYSTEM
Expand Down Expand Up @@ -356,6 +357,7 @@ rights to a jury trial in any resulting litigation.&lt;/p&gt;
<feature id="org.eclipse.rcp.source" installMode="root"/>
<feature id="org.eclipse.pde" installMode="root"/>
<feature id="org.eclipse.pde.source" installMode="root"/>
<feature id="org.eclipse.tips.feature" installMode="root"/>
</features>

<configurations>
Expand Down
2 changes: 1 addition & 1 deletion io.sloeber.product.sdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.github.brodykenrick.arduino-eclipse-plugin</groupId>
<groupId>io.sloeber</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.2.0-SNAPSHOT</version>
<relativePath>../io.sloeber.parent</relativePath>
Expand Down
Loading