debian/changelog

+ecj (3.14.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release (from the R4_8 tag, identifies itself as 3.14.0)
+    - Refreshed the patches
+    - Updated the version of the Maven pom
+    - Fixed the man page
+  * Standards-Version updated to 4.2.0
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 06 Aug 2018 19:48:52 +0200
+
 ecj (3.13.3-1) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -8,9 +8,9 @@ Build-Depends:
  debhelper (>= 11),
  default-jdk-headless,
  maven-repo-helper
-Standards-Version: 4.1.4
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/ecj.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/ecj.git
+Standards-Version: 4.2.0
+Vcs-Git: https://salsa.debian.org/java-team/ecj.git
+Vcs-Browser: https://salsa.debian.org/java-team/ecj
 Homepage: http://www.eclipse.org/jdt/core/index.php
 
 Package: ecj

debian/copyright

@@ -9,7 +9,7 @@ Files-Excluded: org.eclipse.jdt.apt.pluggable.tests/*
                 org.eclipse.jdt.core/notes/*
 
 Files: *
-Copyright: 2000-2017, IBM Corporation and others
+Copyright: 2000-2018, IBM Corporation and others
            2005-2013, BEA Systems, Inc.
            2008-2014, Technical University Berlin
            2013, Jesper S Moller

debian/patches/fix-manpage.patch

+Description: Fixes the manpage
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: https://github.com/eclipse/eclipse.jdt.core/pull/12
+--- a/org.eclipse.jdt.core/scripts/ecj.1
++++ b/org.eclipse.jdt.core/scripts/ecj.1
+@@ -1,4 +1,4 @@
+-.TH ecj "13 March 2017"
++.TH ecj 1 "13 March 2017"
+ .LP
+ .SH NAME
+ ecj \- the eclipse JDT Batch Compiler
+@@ -19,7 +19,7 @@
+ .ul
+ Module Options
+ .sp
+-.B --add-exports \--add-modules \--add-reads \--limit-modules \-p|--module-path \--module-source-path \ --processor-module-path \--system
++.B \--add-exports \--add-modules \--add-reads \--limit-modules \-p|--module-path \--module-source-path \ --processor-module-path \--system
+ .sp
+ .ul
+ ClassPath Options

debian/patches/remove-model-dependency.patch

-Description: Removes the dependency on the dom module (not required, pulls too many Eclipse dependencies)
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: not-needed
---- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModulePathEntry.java
-+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModulePathEntry.java
-@@ -10,7 +10,6 @@
-  *******************************************************************************/
- package org.eclipse.jdt.internal.compiler.env;
- 
--import org.eclipse.jdt.core.IJavaProject;
- import org.eclipse.jdt.core.compiler.CharOperation;
- 
- /**
-@@ -82,7 +81,7 @@
- 	}
- 
- 	/** Tests whether the current entry represents the given java project. */
--	public default boolean equalsProject(IJavaProject project) {
-+	public default boolean equalsProject(Object project) {
- 		return false;
- 	}
- }
-\ No newline at end of file

debian/patches/restore-java-1.9-option.patch

@@ -3,11 +3,11 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
 +++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
-@@ -214,6 +214,7 @@
+@@ -216,6 +216,7 @@
  	public static final String VERSION_1_6 = "1.6"; //$NON-NLS-1$
  	public static final String VERSION_1_7 = "1.7"; //$NON-NLS-1$
  	public static final String VERSION_1_8 = "1.8"; //$NON-NLS-1$
 +	public static final String VERSION_1_9 = "1.9"; //$NON-NLS-1$
  	public static final String VERSION_9 = "9"; //$NON-NLS-1$
+ 	public static final String VERSION_10 = "10"; //$NON-NLS-1$
  	public static final String ERROR = "error"; //$NON-NLS-1$
- 	public static final String WARNING = "warning"; //$NON-NLS-1$

debian/patches/series

-remove-model-dependency.patch
 restore-java-1.9-option.patch
+fix-manpage.patch

debian/poms/ecj.pom

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.jdt.core.compiler</groupId>
 	<artifactId>ecj</artifactId>
-	<version>3.13.2</version>
+	<version>3.14.0</version>
 	<packaging>jar</packaging>
 	<name>Eclipse ECJ</name>
 	<description>Eclipse JDT Core Batch Compiler</description>

org.eclipse.jdt.annotation/.settings/.api_filters

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.jdt.annotation" version="2">
+    <resource path="META-INF/MANIFEST.MF">
+        <filter comment="Target of NonNullByDefault has been removed" id="926941240">
+            <message_arguments>
+                <message_argument value="2.2.0"/>
+                <message_argument value="2.1.150"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>

org.eclipse.jdt.annotation/META-INF/MANIFEST.MF

@@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-Localization: bundle
 Bundle-SymbolicName: org.eclipse.jdt.annotation
-Bundle-Version: 2.1.100.qualifier
+Bundle-Version: 2.2.0.qualifier
 Export-Package: org.eclipse.jdt.annotation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
+Automatic-Module-Name: org.eclipse.jdt.annotation

org.eclipse.jdt.annotation/pom.xml

@@ -14,11 +14,11 @@
   <parent>
     <artifactId>eclipse.jdt.core</artifactId>
     <groupId>eclipse.jdt.core</groupId>
-    <version>4.7.3-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.annotation</artifactId>
-  <version>2.1.100-SNAPSHOT</version>
+  <version>2.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

org.eclipse.jdt.annotation/src/org/eclipse/jdt/annotation/NonNullByDefault.java

@@ -17,7 +17,6 @@ import static org.eclipse.jdt.annotation.DefaultLocation.*;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
  
 /**
  * Applying this annotation to a declaration has the effect that type references,
@@ -47,7 +46,8 @@ import java.lang.annotation.Target;
  * <code>package-info.java</code> is used.
  * </p>
  * <p>
- * <b>Note:</b> Since org.eclipse.jdt.annotation 2.0.0, this annotation also applies to field and local variable declarations.
+ * <b>Note:</b> Since org.eclipse.jdt.annotation 2.0.0, this annotation also applies to field and 
+ * local variable declarations and since 2.2.0 also to parameter and module declarations.
  * For the old API, see
  * <a href="http://help.eclipse.org/kepler/topic/org.eclipse.jdt.doc.isv/reference/api/org/eclipse/jdt/annotation/NonNullByDefault.html">
  * <code>@NonNullByDefault</code> in 1.1.0</a>.
@@ -56,7 +56,6 @@ import java.lang.annotation.Target;
  */
 @Documented
 @Retention(RetentionPolicy.CLASS)
-@Target({ ElementType.PACKAGE, ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.LOCAL_VARIABLE })
 public @interface NonNullByDefault {
 	/**
 	 * Specifies the set of locations within the annotated declaration that should be affected by the nonnull default.

org.eclipse.jdt.annotation_v1/META-INF/MANIFEST.MF

@@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-Localization: bundle
 Bundle-SymbolicName: org.eclipse.jdt.annotation
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.200.qualifier
 Export-Package: org.eclipse.jdt.annotation
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
+Automatic-Module-Name: org.eclipse.jdt.annotation

org.eclipse.jdt.annotation_v1/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2016 Eclipse Foundation and others.
+  Copyright (c) 2012, 2017 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -14,10 +14,10 @@
   <parent>
     <artifactId>eclipse.jdt.core</artifactId>
     <groupId>eclipse.jdt.core</groupId>
-    <version>4.7.3-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.annotation</artifactId>
-  <version>1.1.100-SNAPSHOT</version>
+  <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

org.eclipse.jdt.apt.core/.settings/.api_filters

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.jdt.apt.core" version="2">
+    <resource path="src/org/eclipse/jdt/apt/core/util/AptPreferenceConstants.java" type="org.eclipse.jdt.apt.core.util.AptPreferenceConstants">
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.jdt.apt.core.util.AptPreferenceConstants"/>
+                <message_argument value="APT_GENTESTSRCDIR"/>
+            </message_arguments>
+        </filter>
+        <filter id="336658481">
+            <message_arguments>
+                <message_argument value="org.eclipse.jdt.apt.core.util.AptPreferenceConstants"/>
+                <message_argument value="DEFAULT_GENERATED_TEST_SOURCE_FOLDER_NAME"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>

org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.apt.core; singleton:=true
-Bundle-Version: 3.5.50.qualifier
+Bundle-Version: 3.6.0.qualifier
 Bundle-Localization: plugin
 Export-Package: com.sun.mirror.apt,
  com.sun.mirror.declaration,
@@ -27,3 +27,4 @@ Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: com.sun.mirror.type
+Automatic-Module-Name: org.eclipse.jdt.apt.core

org.eclipse.jdt.apt.core/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2017 Eclipse Foundation and others.
+  Copyright (c) 2012, 2018 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -14,10 +14,10 @@
   <parent>
     <artifactId>eclipse.jdt.core</artifactId>
     <groupId>eclipse.jdt.core</groupId>
-    <version>4.7.3-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.apt.core</artifactId>
-  <version>3.5.50-SNAPSHOT</version>
+  <version>3.6.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessors.java

@@ -43,6 +43,7 @@ import java.util.*;
 public class AnnotationProcessors {
     static class NoOpAP implements AnnotationProcessor {
 	NoOpAP() {}
+	@Override
 	public void process(){}
     }
 
@@ -78,6 +79,7 @@ public class AnnotationProcessors {
 	 * Invokes the <tt>process</tt> method of each component processor,
 	 * in the order in which the processors were passed to the constructor.
 	 */
+	@Override
 	public void process() { 
 	    for(AnnotationProcessor ap: aps)
 		ap.process();

org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/RoundCompleteEvent.java

@@ -70,6 +70,7 @@ public abstract class RoundCompleteEvent extends java.util.EventObject {
     /**
      * Return source.
      */
+    @Override
 	public AnnotationProcessorEnvironment getSource() {
 	return (AnnotationProcessorEnvironment)super.getSource();
     }

org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/AnnotationTypeDeclaration.java

@@ -54,5 +54,6 @@ public interface AnnotationTypeDeclaration extends InterfaceDeclaration {
      * @return the annotation type elements of this annotation type,
      * or an empty collection if there are none
      */
+    @Override
 	Collection<AnnotationTypeElementDeclaration> getMethods();
 }