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

Jump to bottom

[nobug] Travis upgrade to OpenJDK 10 #317

Merged
merged 10 commits into from
Dec 18, 2018
Merged

[nobug] Travis upgrade to OpenJDK 10 #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
df58931
[nobug] Update asm to version 7.0
rfelcman Jun 22, 2018
c667822
[nobug] Update asm to version 7.0
rfelcman Jun 22, 2018
4609746
[nobug] Update asm to version 7.0
rfelcman Jun 22, 2018
6760556
[nobug] Update asm to version 7.0
rfelcman Jun 22, 2018
6473fa3
[nobug] Update asm to version 7.0
rfelcman Jun 22, 2018
b323173
Merge remote-tracking branch 'upstream/2.7' into 2.7
rfelcman Dec 3, 2018
c4428fc
Merge remote-tracking branch 'upstream/2.7' into 2.7
rfelcman Dec 14, 2018
27d0d95
Merge remote-tracking branch 'upstream/2.7' into 2.7
rfelcman Dec 17, 2018
a4a330b
Merge remote-tracking branch 'upstream/2.7' into 2.7
rfelcman Dec 17, 2018
da41b58
[nobug] Travis upgrade to OpenJDK 10
rfelcman Jun 22, 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
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ env:

jdk:
- oraclejdk8
- oraclejdk9
- openjdk10

cache:
directories:
Expand Down Expand Up @@ -75,6 +75,7 @@ before_script:
- echo 'db.user=root' >> $HOME/build.properties
- echo 'db.pwd=root' >> $HOME/build.properties
- echo 'db.platform=org.eclipse.persistence.platform.database.MySQLPlatform' >> $HOME/build.properties
- if [[ $JAVA_HOME == *openjdk10 ]]; then openssl x509 -in <(openssl s_client -connect oss.sonatype.org:443 -prexit 2>/dev/null) -out ~/example.crt; sudo keytool -importcert -file ~/example.crt -alias example -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -noprompt; fi

script:
- cat $HOME/build.properties
Expand Down
8 changes: 4 additions & 4 deletions ...lipse/persistence/tools/workbench/test/framework/ui/chooser/DefaultListChooserUITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@

import org.eclipse.persistence.tools.workbench.test.framework.TestWorkbenchContext;

import com.sun.java.swing.plaf.motif.MotifLookAndFeel;
import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
//import com.sun.java.swing.plaf.motif.MotifLookAndFeel;
//import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;

import org.eclipse.persistence.tools.workbench.framework.context.ApplicationContext;
import org.eclipse.persistence.tools.workbench.framework.context.WorkbenchContext;
Expand Down Expand Up @@ -287,8 +287,8 @@ private JComboBox buildLookAndFeelComboBox() {
private ListValueModel buildLookAndFeelListValue() {
List lookAndFeelValues = new ArrayList();
lookAndFeelValues.add(MetalLookAndFeel.class.getName());
lookAndFeelValues.add(WindowsLookAndFeel.class.getName());
lookAndFeelValues.add(MotifLookAndFeel.class.getName());
lookAndFeelValues.add("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
lookAndFeelValues.add("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
lookAndFeelValues.add("oracle.bali.ewt.olaf.OracleLookAndFeel"); // remove compile-time dependency on OLAF

return new SimpleListValueModel(lookAndFeelValues);
Expand Down