Merge remote-tracking branch 'origin/master'

.gitignore

@@ -3,3 +3,4 @@
 .classpath
 .project
 .settings
+/filters/dev
\ No newline at end of file

filters/prod/jdbc.properties

+jdbc.username=root
+jdbc.password=

pom.xml

@@ -131,12 +131,39 @@
 
 	</dependencies>
 
+	<profiles>
+		<profile>
+			<id>dev</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<filters.env>dev</filters.env>
+			</properties>
+		</profile>
+
+		<profile>
+			<id>prod</id>
+			<properties>
+				<filters.env>prod</filters.env>
+			</properties>
+		</profile>
+	</profiles>
 
 	<build>
 		<finalName>drp</finalName>
 
 		<sourceDirectory>src/main/java</sourceDirectory>
 		<testSourceDirectory>src/test/java</testSourceDirectory>
+		<resources>
+			<resource>
+				<directory>${project.basedir}/src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+		<filters>
+			<filter>${basedir}/filters/${filters.env}/jdbc.properties</filter>
+		</filters>
 
 		<plugins>
 			<plugin>