disable openjdk and java 7 build until codecoverage and travis is fixed.

interseroh · Feb 26, 2017 · 748acf1 · 748acf1
1 parent ef4df78
commit 748acf1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: java
 jdk:
-  - openjdk7
-  - oraclejdk7
+  #- openjdk7
+  #- oraclejdk7
   - oraclejdk8
 
 env:

diff --git a/src/main/java/de/interseroh/report/webconfig/DatabaseConfig.java b/src/main/java/de/interseroh/report/webconfig/DatabaseConfig.java
@@ -26,14 +26,12 @@
 @EnableJpaRepositories(basePackages = "de.interseroh.report.auth", entityManagerFactoryRef = "reportcockpitEntityManagerFactory")
 public class DatabaseConfig {
 
-	private static final String JDBC_PASSWORD_REPORTCOCKPIT = "jdbc.password.reportcockpit";
-	private static final String JDBC_USERNAME_REPORTCOCKPIT = "jdbc.username.reportcockpit";
-	private static final String JDBC_URL_REPORTCOCKPIT = "jdbc.url.reportcockpit";
-	private static final String JDBC_DRIVER_CLASSNAME_REPORTCOCKPIT = "jdbc.driver.classname.reportcockpit";
-
-	public static final String REPORTCOCKPIT_PERSISTENCE_UNIT = "reportcockpitPersistenceUnit";
 	public static final String REPORTCOCKPIT_JPA_TX_MANAGER = "transactionManager";
-
+	private static final String REPORTCOCKPIT_PERSISTENCE_UNIT = "reportcockpitPersistenceUnit";
+	private static final String JDBC_PASSWORD_REPORTCOCKPIT_KEY = "jdbc.password.reportcockpit";
+	private static final String JDBC_USERNAME_REPORTCOCKPIT_KEY = "jdbc.username.reportcockpit";
+	private static final String JDBC_URL_REPORTCOCKPIT_KEY = "jdbc.url.reportcockpit";
+	private static final String JDBC_DRIVER_CLASSNAME_REPORTCOCKPIT_LEY = "jdbc.driver.classname.reportcockpit";
 	private static final String REPORTCOCKPIT_ENTITYMANAGER_PACKAGES_TO_SCAN = "de.interseroh.report.auth";
 
 	private static final String REPORTCOCKPIT_PROPERTY_NAME_HIBERNATE_DIALECT = "hibernate.dialect.reportcockpit";
@@ -56,10 +54,12 @@ public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderCon
 	public DataSource reportcockpitDataSource() {
 		final HikariDataSource dataSource = new HikariDataSource();
 		dataSource.setDriverClassName(env
-				.getProperty(JDBC_DRIVER_CLASSNAME_REPORTCOCKPIT));
-		dataSource.setJdbcUrl(env.getProperty(JDBC_URL_REPORTCOCKPIT));
-		dataSource.setUsername(env.getProperty(JDBC_USERNAME_REPORTCOCKPIT));
-		dataSource.setPassword(env.getProperty(JDBC_PASSWORD_REPORTCOCKPIT));
+				.getProperty(JDBC_DRIVER_CLASSNAME_REPORTCOCKPIT_LEY));
+		dataSource.setJdbcUrl(env.getProperty(JDBC_URL_REPORTCOCKPIT_KEY));
+		dataSource
+				.setUsername(env.getProperty(JDBC_USERNAME_REPORTCOCKPIT_KEY));
+		dataSource
+				.setPassword(env.getProperty(JDBC_PASSWORD_REPORTCOCKPIT_KEY));
 		return dataSource;
 	}