remove media-support module

bamibestelt · Aug 16, 2018 · 0e1a17b · 0e1a17b
1 parent d13745d
commit 0e1a17b
Show file tree

Hide file tree

Showing 35 changed files with 1 addition and 1,590 deletions.
diff --git a/package.sh b/package.sh
@@ -22,11 +22,6 @@ cp -r twitter4j-examples/bin $DIR/
 rm $DIR/twitter4j-examples/src/main/resources/twitter4j.properties
 rm $DIR/twitter4j-examples/src/test/resources/twitter4j.properties
 
-mkdir $DIR/twitter4j-media-support
-cp -r twitter4j-media-support/src $DIR/twitter4j-media-support/
-cp twitter4j-media-support/pom.xml $DIR/twitter4j-media-support/
-rm $DIR/twitter4j-media-support/src/test/resources/twitter4j.properties
-
 mkdir $DIR/twitter4j-async
 cp -r twitter4j-async/src $DIR/twitter4j-async/
 cp twitter4j-async/pom.xml $DIR/twitter4j-async/
@@ -57,13 +52,11 @@ sed -i '' "s/<url>https:\/\/oss.sonatype.org\/service\/local\/staging\/deploy\/m
 sed -i '' "s/<url>https:\/\/oss.sonatype.org\/service\/local\/staging\/deploy\/maven2\//<url>file:\/Users\/yusuke\/maven2\//g" $DIR/twitter4j-core/pom.xml
 sed -i '' "s/<url>https:\/\/oss.sonatype.org\/service\/local\/staging\/deploy\/maven2\//<url>file:\/Users\/yusuke\/maven2\//g" $DIR/twitter4j-appengine/pom.xml
 sed -i '' "s/<url>https:\/\/oss.sonatype.org\/service\/local\/staging\/deploy\/maven2\//<url>file:\/Users\/yusuke\/maven2\//g" $DIR/twitter4j-examples/pom.xml
-sed -i '' "s/<url>https:\/\/oss.sonatype.org\/service\/local\/staging\/deploy\/maven2\//<url>file:\/Users\/yusuke\/maven2\//g" $DIR/twitter4j-media-support/pom.xml
 sed -i '' "s/<url>https:\/\/oss.sonatype.org\/service\/local\/staging\/deploy\/maven2\//<url>file:\/Users\/yusuke\/maven2\//g" $DIR/twitter4j-async/pom.xml
 sed -i '' "s/<url>https:\/\/oss.sonatype.org\/service\/local\/staging\/deploy\/maven2\//<url>file:\/Users\/yusuke\/maven2\//g" $DIR/twitter4j-stream/pom.xml
 sed -i '' "s/<url>https:\/\/oss.sonatype.org\/service\/local\/staging\/deploy\/maven2\//<url>file:\/Users\/yusuke\/maven2\//g" $DIR/twitter4j-http2-support/pom.xml
 
 sed -i '' "s/-SNAPSHOT\";/-SNAPSHOT\(build: $HASH\)\";/g" $DIR/twitter4j-core/src/main/java/twitter4j/Version.java
-sed -i '' "s/-SNAPSHOT\";/-SNAPSHOT\(build: $HASH\)\";/g" $DIR/twitter4j-media-support/src/main/java/twitter4j/media/Version.java
 sed -i '' "s/-SNAPSHOT\";/-SNAPSHOT\(build: $HASH\)\";/g" $DIR/twitter4j-async/src/main/java/twitter4j/VersionAsync.java
 sed -i '' "s/-SNAPSHOT\";/-SNAPSHOT\(build: $HASH\)\";/g" $DIR/twitter4j-appengine/src/main/java/twitter4j/VersionAppEngine.java
 sed -i '' "s/-SNAPSHOT\";/-SNAPSHOT\(build: $HASH\)\";/g" $DIR/twitter4j-stream/src/main/java/twitter4j/VersionStream.java
@@ -80,8 +73,6 @@ if [ -n "$DEPLOY" ];
   mvn clean package -Dmaven.test.skip=true
   cd ../twitter4j-examples
   mvn clean package -Dmaven.test.skip=true
-  cd ../twitter4j-media-support
-  mvn clean package -Dmaven.test.skip=true
   cd ../twitter4j-async
   mvn clean package -Dmaven.test.skip=true
   cd ../twitter4j-stream
@@ -98,11 +89,6 @@ unzip twitter4j-core/target/twitter4j-core-$LATEST_VERSION-javadoc.jar -d twitte
 mv twitter4j-core/target/twitter4j-core-$LATEST_VERSION-javadoc.jar twitter4j-core/
 # mv twitter4j-core/target/twitter4j-core-$LATEST_VERSION-sources.jar twitter4j-core/
 
-mkdir twitter4j-media-support/javadoc/
-unzip twitter4j-media-support/target/twitter4j-media-support-$LATEST_VERSION-javadoc.jar -d twitter4j-media-support/javadoc/
-mv twitter4j-media-support/target/twitter4j-media-support-$LATEST_VERSION-javadoc.jar twitter4j-media-support/
-# mv twitter4j-media-support/target/twitter4j-media-support-$LATEST_VERSION-sources.jar twitter4j-media-support/
-
 mkdir twitter4j-examples/javadoc/
 unzip twitter4j-examples/target/twitter4j-examples-$LATEST_VERSION-javadoc.jar -d twitter4j-examples/javadoc/
 mv twitter4j-examples/target/twitter4j-examples-$LATEST_VERSION-javadoc.jar twitter4j-examples/
@@ -137,13 +123,11 @@ rm twitter4j-http2-support/src/test/resources/twitter4j.properties
 mkdir lib
 cp ../readme-libs.txt lib
 mv twitter4j-core/target/twitter4j-core-$LATEST_VERSION.jar lib
-mv twitter4j-media-support/target/twitter4j-media-support-$LATEST_VERSION.jar lib
 mv twitter4j-examples/target/twitter4j-examples-$LATEST_VERSION.jar lib
 mv twitter4j-async/target/twitter4j-async-$LATEST_VERSION.jar lib
 mv twitter4j-stream/target/twitter4j-stream-$LATEST_VERSION.jar lib
 
 rm -Rf twitter4j-core/target
-rm -Rf twitter4j-media-support/target
 rm -Rf twitter4j-async/target
 rm -Rf twitter4j-examples/target
 rm -Rf twitter4j-stream/target

diff --git a/pom.xml b/pom.xml
@@ -100,6 +100,5 @@
         <module>twitter4j-appengine</module>
         <module>twitter4j-http2-support</module>
         <module>twitter4j-stream</module>
-        <module>twitter4j-media-support</module>
     </modules>
 </project>
diff --git a/readme-libs.txt b/readme-libs.txt
@@ -1,11 +1,8 @@
 Twittetr4J is a Twitter API binding library for the Java language licensed under Apache License 2.0.
 
-Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html
-
 readme-libs.txt - this file
 twitter4j-core.jar - REST and Search API support 
 twitter4j-async.jar - Async API support : use with twitter4j-core
-twitter4j-media-support.jar - media API support : use with twitter4j-core
 twitter4j-stream.jar - Streaming API support : use with twitter4j-core
 twitter4j-examples.jar - examples : use with twitter4j-core, twitter4j-async and twitter4j-stream
-twitter4j-spdy.jar - SPDY / HTTP2.0 support : adds SPDY / HTTP2.0 support, boosts Twitter4J performance, reduce packets, save the earth
+twitter4j-http2-support.jar - SPDY / HTTP2.0 support : adds HTTP2.0 support, boosts Twitter4J performance, reduce packets, save the earth
diff --git a/readme.txt b/readme.txt
@@ -1,15 +1,12 @@
 Twitter4J is a Twitter API binding library for the Java language licensed under Apache License 2.0.
 
-Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html
-
 LICENSE.txt - the terms of license of this software
 pom.xml - maven parent pom
 powered-by-badge - badge
 readme.txt - this file
 twitter4j-core - core component : support REST and Search API
 twitter4j-apache-httpclient-support - optional component adds Apache HttpClient support
 twitter4j-examples - examples
-twitter4j-media-support - media API support
 twitter4j-async - Async API support : depending on twitter4j-core
 twitter4j-stream - Streaming API support : depending on twitter4j-core and twitter4j-async
 twitter4j-http2-support - HTTP/2 support : adds HTTP/2 support, boosts Twitter4J performance, reduce packets, save the earth

diff --git a/twitter4j-appengine/src/main/resources/META-INF/LICENSE.txt b/twitter4j-appengine/src/main/resources/META-INF/LICENSE.txt
@@ -174,6 +174,3 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-Twitter4J SUBCOMPONENTS:
-
-Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html
diff --git a/twitter4j-async/src/main/resources/META-INF/LICENSE.txt b/twitter4j-async/src/main/resources/META-INF/LICENSE.txt
@@ -174,6 +174,3 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-Twitter4J SUBCOMPONENTS:
-
-Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html
diff --git a/twitter4j-examples/bin/media/imgLyImageUpload.cmd b/twitter4j-examples/bin/media/imgLyImageUpload.cmd
diff --git a/twitter4j-examples/bin/media/imgLyImageUpload.sh b/twitter4j-examples/bin/media/imgLyImageUpload.sh
diff --git a/twitter4j-examples/bin/media/tweetPhotoImageUpload.cmd b/twitter4j-examples/bin/media/tweetPhotoImageUpload.cmd
diff --git a/twitter4j-examples/bin/media/tweetPhotoImageUpload.sh b/twitter4j-examples/bin/media/tweetPhotoImageUpload.sh
diff --git a/twitter4j-examples/bin/media/twippleImageUpload.cmd b/twitter4j-examples/bin/media/twippleImageUpload.cmd
diff --git a/twitter4j-examples/bin/media/twippleImageUpload.sh b/twitter4j-examples/bin/media/twippleImageUpload.sh
diff --git a/twitter4j-examples/pom.xml b/twitter4j-examples/pom.xml
@@ -110,11 +110,6 @@
             <artifactId>twitter4j-stream</artifactId>
             <version>4.0.7-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.twitter4j</groupId>
-            <artifactId>twitter4j-media-support</artifactId>
-            <version>4.0.7-SNAPSHOT</version>
-        </dependency>
     </dependencies>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/twitter4j-examples/src/main/java/twitter4j/examples/media/ImgLyImageUpload.java b/twitter4j-examples/src/main/java/twitter4j/examples/media/ImgLyImageUpload.java
diff --git a/twitter4j-examples/src/main/java/twitter4j/examples/media/TwippleImageUpload.java b/twitter4j-examples/src/main/java/twitter4j/examples/media/TwippleImageUpload.java
diff --git a/twitter4j-examples/src/main/java/twitter4j/examples/media/package-info.java b/twitter4j-examples/src/main/java/twitter4j/examples/media/package-info.java
diff --git a/twitter4j-http2-support/src/main/resources/META-INF/LICENSE.txt b/twitter4j-http2-support/src/main/resources/META-INF/LICENSE.txt
@@ -174,6 +174,3 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-Twitter4J SUBCOMPONENTS:
-
-Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html