diff --git a/pom.xml b/pom.xml
index df749c580..e22773945 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.twitter4j</groupId>
     <artifactId>twitter4j</artifactId>
-    <version>4.0.5</version>
+    <version>4.0.8</version>
     <packaging>pom</packaging>
     <name>twitter4j</name>
     <description>A Java library for the Twitter API</description>
@@ -20,7 +20,7 @@
         <developerConnection>scm:git:https://github.com/yusuke/twitter4j.git
         </developerConnection>
 
-    <tag>4.0.5</tag>
+    <tag>4.0.8</tag>
   </scm>
     <developers>
         <developer>
diff --git a/twitter4j-appengine/pom.xml b/twitter4j-appengine/pom.xml
index 8e7c522a5..d4ad758d2 100644
--- a/twitter4j-appengine/pom.xml
+++ b/twitter4j-appengine/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.twitter4j</groupId>
     <artifactId>twitter4j-appengine</artifactId>
-    <version>4.0.5</version>
+    <version>4.0.8</version>
     <packaging>jar</packaging>
     <name>twitter4j-appengine</name>
     <description>A Java library for the Twitter API</description>
@@ -21,7 +21,7 @@
         <developerConnection>scm:https://github.com/yusuke/twitter4j.git
         </developerConnection>
 
-    <tag>4.0.5</tag>
+    <tag>4.0.8</tag>
   </scm>
     <developers>
         <developer>
@@ -138,8 +138,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>6</source>
-                    <target>6</target>
+                    <source>7</source>
+                    <target>7</target>
                 </configuration>
                 <version>2.5.1</version>
             </plugin>
diff --git a/twitter4j-async/pom.xml b/twitter4j-async/pom.xml
index 44c3f660e..ede41eb90 100644
--- a/twitter4j-async/pom.xml
+++ b/twitter4j-async/pom.xml
@@ -120,8 +120,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>6</source>
-                    <target>6</target>
+                    <source>7</source>
+                    <target>7</target>
                 </configuration>
                 <version>2.5.1</version>
             </plugin>
diff --git a/twitter4j-core/pom.xml b/twitter4j-core/pom.xml
index 44f551cbe..0fd4db43c 100644
--- a/twitter4j-core/pom.xml
+++ b/twitter4j-core/pom.xml
@@ -1,9 +1,10 @@
 <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/maven-v4_0_0.xsd">
+   
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.twitter4j</groupId>
     <artifactId>twitter4j-core</artifactId>
-    <version>4.0.5-CF</version>
+    <version>4.0.8-CF</version>
     <packaging>jar</packaging>
     <name>twitter4j-core</name>
     <description>A Java library for the Twitter API</description>
@@ -21,7 +22,7 @@
         <developerConnection>scm:https://github.com/yusuke/twitter4j.git
         </developerConnection>
 
-    <tag>4.0.5</tag>
+    <tag>4.0.8</tag>
   </scm>
     <developers>
         <developer>
@@ -166,8 +167,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>6</source>
-                    <target>6</target>
+                    <source>7</source>
+                    <target>7</target>
                 </configuration>
                 <version>2.5.1</version>
             </plugin>
diff --git a/twitter4j-core/src/main/java/twitter4j/conf/ConfigurationBase.java b/twitter4j-core/src/main/java/twitter4j/conf/ConfigurationBase.java
index e445d9463..1819739f5 100755
--- a/twitter4j-core/src/main/java/twitter4j/conf/ConfigurationBase.java
+++ b/twitter4j-core/src/main/java/twitter4j/conf/ConfigurationBase.java
@@ -49,12 +49,12 @@ class ConfigurationBase implements Configuration, java.io.Serializable {
     private String oAuth2TokenType;
     private String oAuth2AccessToken;
     private String oAuth2Scope;
-    private String oAuthRequestTokenURL = "https://api.twitter.com/oauth/request_token";
-    private String oAuthAuthorizationURL = "https://api.twitter.com/oauth/authorize";
-    private String oAuthAccessTokenURL = "https://api.twitter.com/oauth/access_token";
-    private String oAuthAuthenticationURL = "https://api.twitter.com/oauth/authenticate";
-    private String oAuth2TokenURL = "https://api.twitter.com/oauth2/token";
-    private String oAuth2InvalidateTokenURL = "https://api.twitter.com/oauth2/invalidate_token";
+    private String oAuthRequestTokenURL = "https://api.x.com/oauth/request_token";
+    private String oAuthAuthorizationURL = "https://api.x.com/oauth/authorize";
+    private String oAuthAccessTokenURL = "https://api.x.com/oauth/access_token";
+    private String oAuthAuthenticationURL = "https://api.x.com/oauth/authenticate";
+    private String oAuth2TokenURL = "https://api.x.com/oauth2/token";
+    private String oAuth2InvalidateTokenURL = "https://api.x.com/oauth2/invalidate_token";
 
     private String restBaseURL = "https://api.twitter.com/1.1/";
     private String streamBaseURL = "https://stream.twitter.com/1.1/";
diff --git a/twitter4j-media-support/pom.xml b/twitter4j-media-support/pom.xml
index 788179ff2..20db0cd5e 100644
--- a/twitter4j-media-support/pom.xml
+++ b/twitter4j-media-support/pom.xml
@@ -121,8 +121,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>6</source>
-                    <target>6</target>
+                    <source>7</source>
+                    <target>7</target>
                 </configuration>
                 <version>2.5.1</version>
             </plugin>
diff --git a/twitter4j-stream/pom.xml b/twitter4j-stream/pom.xml
index 18c9bbf39..2f99b3fcf 100644
--- a/twitter4j-stream/pom.xml
+++ b/twitter4j-stream/pom.xml
@@ -132,8 +132,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>6</source>
-                    <target>6</target>
+                    <source>7</source>
+                    <target>7</target>
                 </configuration>
                 <version>2.5.1</version>
             </plugin>