[SCM] UNNAMED PROJECT branch, master, updated. debian/1.8.3-1-g4ec9e65
Emmanuel Bourg
ebourg at apache.org
Tue Jun 11 11:20:49 UTC 2013
The following commit has been merged in the master branch:
commit 4ec9e65740024c7286547cae9a18f07d6d8f4840
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Jun 11 11:12:23 2013 +0200
Moved license headers above package declarations (enables header folding in IDEs)
diff --git a/src/main/java/org/debian/maven/repo/Dependency.java b/src/main/java/org/debian/maven/repo/Dependency.java
index f57242a..2557a81 100644
--- a/src/main/java/org/debian/maven/repo/Dependency.java
+++ b/src/main/java/org/debian/maven/repo/Dependency.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/src/main/java/org/debian/maven/repo/DependencyNotFoundException.java b/src/main/java/org/debian/maven/repo/DependencyNotFoundException.java
index 3819bde..351961e 100644
--- a/src/main/java/org/debian/maven/repo/DependencyNotFoundException.java
+++ b/src/main/java/org/debian/maven/repo/DependencyNotFoundException.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
/**
* @author Ludovic Claude <ludovicc at users.sourceforge.net>
*/
diff --git a/src/main/java/org/debian/maven/repo/DependencyRule.java b/src/main/java/org/debian/maven/repo/DependencyRule.java
index 4007455..18842ea 100644
--- a/src/main/java/org/debian/maven/repo/DependencyRule.java
+++ b/src/main/java/org/debian/maven/repo/DependencyRule.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.util.StringTokenizer;
/**
diff --git a/src/main/java/org/debian/maven/repo/DependencyRuleSet.java b/src/main/java/org/debian/maven/repo/DependencyRuleSet.java
index 37496a8..84d371b 100644
--- a/src/main/java/org/debian/maven/repo/DependencyRuleSet.java
+++ b/src/main/java/org/debian/maven/repo/DependencyRuleSet.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.io.*;
import java.util.*;
import java.util.logging.Level;
diff --git a/src/main/java/org/debian/maven/repo/ListOfPOMs.java b/src/main/java/org/debian/maven/repo/ListOfPOMs.java
index 4463108..6417c50 100644
--- a/src/main/java/org/debian/maven/repo/ListOfPOMs.java
+++ b/src/main/java/org/debian/maven/repo/ListOfPOMs.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.io.*;
import java.util.*;
import java.util.logging.Level;
diff --git a/src/main/java/org/debian/maven/repo/POMCleaner.java b/src/main/java/org/debian/maven/repo/POMCleaner.java
index 186a016..3421c90 100644
--- a/src/main/java/org/debian/maven/repo/POMCleaner.java
+++ b/src/main/java/org/debian/maven/repo/POMCleaner.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -26,6 +26,7 @@ import javax.xml.stream.XMLStreamException;
import org.debian.maven.repo.POMInfo.DependencyType;
import static org.debian.maven.repo.DependencyRuleSetFiles.RulesType.*;
+
/**
* Cleans up a POM for inclusion in the /usr/share/maven-repo/ repository.
*
diff --git a/src/main/java/org/debian/maven/repo/POMHandler.java b/src/main/java/org/debian/maven/repo/POMHandler.java
index 8000ccf..8e31823 100644
--- a/src/main/java/org/debian/maven/repo/POMHandler.java
+++ b/src/main/java/org/debian/maven/repo/POMHandler.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.io.File;
/**
diff --git a/src/main/java/org/debian/maven/repo/POMInfo.java b/src/main/java/org/debian/maven/repo/POMInfo.java
index 5490e63..43c7ceb 100644
--- a/src/main/java/org/debian/maven/repo/POMInfo.java
+++ b/src/main/java/org/debian/maven/repo/POMInfo.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,11 +14,12 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.util.*;
import static org.debian.maven.repo.POMInfo.DependencyType.*;
/**
- *
* @author Ludovic Claude <ludovicc at users.sourceforge.net>
*/
public class POMInfo implements Cloneable {
diff --git a/src/main/java/org/debian/maven/repo/POMReader.java b/src/main/java/org/debian/maven/repo/POMReader.java
index f4bb346..cc2f4ce 100644
--- a/src/main/java/org/debian/maven/repo/POMReader.java
+++ b/src/main/java/org/debian/maven/repo/POMReader.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
diff --git a/src/main/java/org/debian/maven/repo/POMTransformer.java b/src/main/java/org/debian/maven/repo/POMTransformer.java
index e89fb5e..f772a9c 100644
--- a/src/main/java/org/debian/maven/repo/POMTransformer.java
+++ b/src/main/java/org/debian/maven/repo/POMTransformer.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -44,7 +44,6 @@ import static org.debian.maven.repo.DependencyRuleSet.*;
import static org.debian.maven.repo.DependencyRuleSetFiles.RulesType.*;
/**
- *
* @author Ludovic Claude <ludovicc at users.sourceforge.net>
*/
public class POMTransformer extends POMReader {
@@ -53,8 +52,7 @@ public class POMTransformer extends POMReader {
private static final List<String> WRITE_IGNORED_ELEMENTS = Arrays.asList("modelVersion", "parent");
private static final List<String> DEBIAN_BUILD_IGNORED_ELEMENTS = Arrays.asList("distributionManagement", "repositories", "pluginRepositories");
private static final List<String> DEBIAN_DOC_IGNORED_ELEMENTS = Arrays.asList("reports", "reporting", "site");
- private static final List<String> INFO_ELEMENTS = Arrays.asList("groupId",
- "artifactId", "packaging", "version");
+ private static final List<String> INFO_ELEMENTS = Arrays.asList("groupId", "artifactId", "packaging", "version");
private DependencyRuleSetFiles depRules = new DependencyRuleSetFiles();
private Map<File, Set<String>> ignoredModules = new HashMap<File, Set<String>>();
private Repository repository;
diff --git a/src/main/java/org/debian/maven/repo/Repository.java b/src/main/java/org/debian/maven/repo/Repository.java
index a25af86..a03ac13 100644
--- a/src/main/java/org/debian/maven/repo/Repository.java
+++ b/src/main/java/org/debian/maven/repo/Repository.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.InputStream;
diff --git a/src/main/java/org/debian/maven/repo/RepositoryReportHTMLWriter.java b/src/main/java/org/debian/maven/repo/RepositoryReportHTMLWriter.java
index 055a57c..903694f 100644
--- a/src/main/java/org/debian/maven/repo/RepositoryReportHTMLWriter.java
+++ b/src/main/java/org/debian/maven/repo/RepositoryReportHTMLWriter.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2011 Damien Raude-Morvan.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
/**
* @author Damien Raude-Morvan <drazzib at debian.org>
*/
diff --git a/src/main/java/org/debian/maven/repo/RepositoryReportTextWriter.java b/src/main/java/org/debian/maven/repo/RepositoryReportTextWriter.java
index b59d628..bb9eceb 100644
--- a/src/main/java/org/debian/maven/repo/RepositoryReportTextWriter.java
+++ b/src/main/java/org/debian/maven/repo/RepositoryReportTextWriter.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2011 Damien Raude-Morvan.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
/**
* @author Damien Raude-Morvan <drazzib at debian.org>
*/
diff --git a/src/main/java/org/debian/maven/repo/RepositoryReportWriter.java b/src/main/java/org/debian/maven/repo/RepositoryReportWriter.java
index 22721d5..d30ec7e 100644
--- a/src/main/java/org/debian/maven/repo/RepositoryReportWriter.java
+++ b/src/main/java/org/debian/maven/repo/RepositoryReportWriter.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2011 Damien Raude-Morvan.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
/**
* Interface of any check's output.
*
diff --git a/src/main/java/org/debian/maven/repo/Rule.java b/src/main/java/org/debian/maven/repo/Rule.java
index 33689d8..2ac3650 100644
--- a/src/main/java/org/debian/maven/repo/Rule.java
+++ b/src/main/java/org/debian/maven/repo/Rule.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,12 +14,13 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- *
* @author Ludovic Claude <ludovicc at users.sourceforge.net>
*/
public class Rule {
diff --git a/src/main/java/org/debian/maven/util/XMLWriterWrapper.java b/src/main/java/org/debian/maven/util/XMLWriterWrapper.java
index 2349d63..4319493 100644
--- a/src/main/java/org/debian/maven/util/XMLWriterWrapper.java
+++ b/src/main/java/org/debian/maven/util/XMLWriterWrapper.java
@@ -1,5 +1,3 @@
-package org.debian.maven.util;
-
/*
* Copyright 2013 Thomas Koch <thomas at koch.ro>
* Copyright 2009 Ludovic Claude.
@@ -17,6 +15,8 @@ package org.debian.maven.util;
* limitations under the License.
*/
+package org.debian.maven.util;
+
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
diff --git a/src/test/java/org/debian/maven/repo/DependencyRuleTest.java b/src/test/java/org/debian/maven/repo/DependencyRuleTest.java
index 16df9ba..d0ac709 100644
--- a/src/test/java/org/debian/maven/repo/DependencyRuleTest.java
+++ b/src/test/java/org/debian/maven/repo/DependencyRuleTest.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import org.junit.Test;
import static org.debian.maven.repo.DependencyRuleSet.*;
diff --git a/src/test/java/org/debian/maven/repo/ListOfPOMsTest.java b/src/test/java/org/debian/maven/repo/ListOfPOMsTest.java
index a45e1e0..cde4a42 100644
--- a/src/test/java/org/debian/maven/repo/ListOfPOMsTest.java
+++ b/src/test/java/org/debian/maven/repo/ListOfPOMsTest.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/debian/maven/repo/POMCleanerTest.java b/src/test/java/org/debian/maven/repo/POMCleanerTest.java
index dee56cc..d7b2fbb 100644
--- a/src/test/java/org/debian/maven/repo/POMCleanerTest.java
+++ b/src/test/java/org/debian/maven/repo/POMCleanerTest.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
diff --git a/src/test/java/org/debian/maven/repo/POMReaderTest.java b/src/test/java/org/debian/maven/repo/POMReaderTest.java
index 429c9e1..d30a2e2 100644
--- a/src/test/java/org/debian/maven/repo/POMReaderTest.java
+++ b/src/test/java/org/debian/maven/repo/POMReaderTest.java
@@ -1,8 +1,3 @@
-package org.debian.maven.repo;
-
-import org.debian.maven.repo.POMReader.TreePath;
-import static org.debian.maven.repo.POMInfo.DependencyType.*;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -19,15 +14,16 @@ import static org.debian.maven.repo.POMInfo.DependencyType.*;
* limitations under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNotNull;
+package org.debian.maven.repo;
import org.debian.maven.TemporaryPomFolder;
+import org.debian.maven.repo.POMReader.TreePath;
import org.junit.Rule;
import org.junit.Test;
+import static org.debian.maven.repo.POMInfo.DependencyType.*;
+import static org.junit.Assert.*;
+
public class POMReaderTest {
@Rule
diff --git a/src/test/java/org/debian/maven/repo/POMTransformerTest.java b/src/test/java/org/debian/maven/repo/POMTransformerTest.java
index 4f123d6..995105a 100644
--- a/src/test/java/org/debian/maven/repo/POMTransformerTest.java
+++ b/src/test/java/org/debian/maven/repo/POMTransformerTest.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import java.io.File;
import java.io.IOException;
diff --git a/src/test/java/org/debian/maven/repo/RepositoryTest.java b/src/test/java/org/debian/maven/repo/RepositoryTest.java
index da2a101..ff3e79d 100644
--- a/src/test/java/org/debian/maven/repo/RepositoryTest.java
+++ b/src/test/java/org/debian/maven/repo/RepositoryTest.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,7 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
import javax.xml.stream.XMLStreamException;
diff --git a/src/test/java/org/debian/maven/repo/RuleTest.java b/src/test/java/org/debian/maven/repo/RuleTest.java
index 9ee44cc..3b90e83 100644
--- a/src/test/java/org/debian/maven/repo/RuleTest.java
+++ b/src/test/java/org/debian/maven/repo/RuleTest.java
@@ -1,5 +1,3 @@
-package org.debian.maven.repo;
-
/*
* Copyright 2009 Ludovic Claude.
*
@@ -16,6 +14,8 @@ package org.debian.maven.repo;
* limitations under the License.
*/
+package org.debian.maven.repo;
+
import org.junit.Test;
import static org.junit.Assert.assertEquals;
--
UNNAMED PROJECT
More information about the pkg-java-commits
mailing list