Remove java5 artifact

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 ===
 
+Version 25.0.0
+---
+* Removed Java 5 artifact.
+
 Version 24.1.0
 ---
 * `@CheckReturnValue` is not experimental anymore.

CONTRIBUTING.md

@@ -17,13 +17,6 @@ During the new version release:
 * Use 'Draft a new release' button on the Releases GitHub page; select the added tag; copy it to the release title
  field; copy the added changelog section into the release details field.
 
-### Java 5 package
-We generate annotations-java5 package for legacy clients. This package cannot use ElementType.TYPE_USE
-which appeared in Java 8. The Java 5 package is generated from common/src sources 
-stripping the `, ElementType.TYPE_USE` substring from files.
-So no Java features that appear in Java 6 or higher except `ElementType.TYPE_USE` should be used in common/src.
-New TYPE_USE annotations should be created in java8/src. They will not appear in annotations-java5 package. 
-
 ### Backward compatibility
 All the changes should be backward compatible i.e. you can only add new annotations and new elements into existing annotation. 
 If it's absolutely necessary to remove an annotation or its element we must firstly release a new major version where 

README.md

@@ -17,15 +17,15 @@ using gradle write the following in the
 `build.gradle` file (Groovy DSL)
 ```
 dependencies {
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:25.0.0'
 }
 
 ```
 
 or in the `build.gradle.kts` file (Kotlin DSL)
 ```
 dependencies {
-    compileOnly("org.jetbrains:annotations:24.1.0")
+    compileOnly("org.jetbrains:annotations:25.0.0")
 }
 
 ```
@@ -34,11 +34,11 @@ To add a dependency using Maven, write the following in `pom.xml`:
 <dependency>
   <groupId>org.jetbrains</groupId>
   <artifactId>annotations</artifactId>
-  <version>24.1.0</version>
+  <version>25.0.0</version>
   <scope>provided</scope>
 </dependency>
 ```
 
-`annotations` artifact requires JDK 1.8 or higher. If your project is compiled using JDK 1.5, 1.6 or 1.7 you can use 
-the `annotations-java5` artifact instead. Please note that `annotations-java5` artifact is considered a legacy, so
- most of new annotations will appear in the `annotations` artifact only.
+`annotations` artifact requires JDK 1.8 or higher. If your project is compiled using JDK 1.5, 1.6 or 1.7 you can use
+the `annotations-java5` artifact instead. Please note that `annotations-java5` artifact is considered a legacy
+and will receive no further updates. The latest version of `annotations-java5` is 24.1.0.

build.gradle

@@ -61,14 +61,9 @@ subprojects {
     }
 }
 
-project(':java5').archivesBaseName = 'annotations-java5'
-project(':java8').archivesBaseName = 'annotations'
+project(':java-annotations').archivesBaseName = 'annotations'
 
-configure([project(':java5'), project(':java8')]) {
-    dependencies {
-        compile project(':module-info')
-    }
-
+configure([project(':java-annotations')]) {
     task mainJar(type: Jar) {
         into ("META-INF/versions/9", {
             from (project(':module-info').sourceSets.main.output, {

gradle.properties

@@ -14,5 +14,4 @@
 # limitations under the License.
 #
 
-projectVersion=24.1.0
-#JDK_5=<path-to-older-java-version>
+projectVersion=25.0.0

common/build.gradle → java-annotations/build.gradle

@@ -15,4 +15,15 @@
  */
 
 sourceCompatibility = 1.8
-javadoc.enabled = false
+
+mainJar {
+    from sourceSets.main.output
+}
+
+sourceJar {
+    from sourceSets.main.java
+}
+
+javadoc {
+    source = [sourceSets.main.java]
+}

module-info/build.gradle

@@ -17,12 +17,12 @@
 sourceCompatibility = 1.9
 
 dependencies {
-    compile project(':common')
+    compile project(':java-annotations')
 }
 
 compileJava {
     // Without common sources, compiler complains that exported packages don't exist
-    source = [sourceSets.main.java, project(':common').sourceSets.main.java]
+    source = [sourceSets.main.java, project(':java-annotations').sourceSets.main.java]
 }
 
 task mainJar(type: Jar) {

settings.gradle

@@ -16,4 +16,4 @@
 
 rootProject.name = 'annotations-parent'
 
-include 'common', 'java5', 'java8', 'module-info'
+include 'java-annotations', 'module-info'