- Pom cleanup (#36)

- added license header plugin (and regenerated all headers) - removed redundant elements - removed developers section - added sonatype plugin to auto release after close
mogilefs-moji · Jul 13, 2017 · 515d29a · 515d29a
1 parent e6dcdff
commit 515d29a
Show file tree

Hide file tree

Showing 108 changed files with 1,260 additions and 1,038 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 - Made ManagedTrackerHost timer a daemon thread - (https://github.com/mogilefs-moji/moji/pull/35).
+- Updated all license headers.
 
 ## [2.0.0] - 2016-11-16
 ### Added

diff --git a/README.md b/README.md
@@ -144,7 +144,7 @@ This project uses the [Maven](http://maven.apache.org/) build system.
 All contributions are welcome. Please use the [Last.fm codeformatting profile](https://github.com/lastfm/lastfm-oss-config/blob/master/src/main/resources/fm/last/last.fm.eclipse-codeformatter-profile.xml) found in the `lastfm-oss-config` project for formatting your changes.
 
 # Legal
-Copyright 2012-2016 [Last.fm](http://www.last.fm/) & The "mogilefs-moji" committers.
+Copyright 2012-2017 [Last.fm](http://www.last.fm/) & The "mogilefs-moji" committers.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,5 @@
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -7,12 +8,11 @@
     <version>1.1.0</version>
   </parent>
 
-  <groupId>fm.last</groupId>
   <artifactId>moji</artifactId>
   <version>2.0.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Moji</name>
   <description>A File-like MogileFS client</description>
+  <inceptionYear>2012</inceptionYear>
 
   <url>https://github.com/mogilefs-moji/moji/</url>
 
@@ -23,28 +23,9 @@
     <tag>HEAD</tag>
   </scm>
 
-  <developers>
-    <developer>
-      <name>Elliot West</name>
-      <email>teabot@gmail.com</email>
-      <url>http://www.last.fm/user/teabot</url>
-      <roles>
-        <role>Documentation</role>
-        <role>Java Developer</role>
-      </roles>
-      <organization>Last.fm</organization>
-      <organizationUrl>http://www.last.fm/</organizationUrl>
-    </developer>
-    <developer>
-      <name>James Grant</name>
-      <organization>Last.fm</organization>
-      <organizationUrl>http://www.last.fm/</organizationUrl>
-      <roles>
-        <role>Documentation</role>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-  </developers>
+  <properties>
+    <license.maven.plugin.version>3.0</license.maven.plugin.version>
+  </properties>
 
   <dependencies>
     <dependency>
@@ -104,4 +85,51 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.3</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>sonatype-nexus-staging</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>com.mycila</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <version>${license.maven.plugin.version}</version>
+        <dependencies>
+          <dependency>
+            <groupId>com.mycila</groupId>
+            <artifactId>license-maven-plugin-git</artifactId>
+            <version>${license.maven.plugin.version}</version>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <header>src/main/license/mycila/APACHE-2.txt</header>
+          <properties>
+            <owner>Last.fm &amp; The "mogilefs-moji" committers</owner>
+          </properties>
+          <includes>
+            <include>src/main/java/**</include>
+            <include>src/test/java/**</include>
+          </includes>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>format</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/src/main/java/fm/last/moji/Moji.java b/src/main/java/fm/last/moji/Moji.java
@@ -1,17 +1,17 @@
-/*
- * Copyright 2012 Last.fm
+/**
+ * Copyright (C) 2012-2017 Last.fm & The "mogilefs-moji" committers
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package fm.last.moji;
 

diff --git a/src/main/java/fm/last/moji/MojiDeviceStatus.java b/src/main/java/fm/last/moji/MojiDeviceStatus.java
@@ -1,17 +1,17 @@
-/*
- * Copyright 2012 Last.fm
+/**
+ * Copyright (C) 2012-2017 Last.fm & The "mogilefs-moji" committers
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package fm.last.moji;
 

diff --git a/src/main/java/fm/last/moji/MojiFactory.java b/src/main/java/fm/last/moji/MojiFactory.java
@@ -1,17 +1,17 @@
-/*
- * Copyright 2012 Last.fm
+/**
+ * Copyright (C) 2012-2017 Last.fm & The "mogilefs-moji" committers
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package fm.last.moji;
 

diff --git a/src/main/java/fm/last/moji/MojiFile.java b/src/main/java/fm/last/moji/MojiFile.java
@@ -1,17 +1,17 @@
-/*
- * Copyright 2012 Last.fm
+/**
+ * Copyright (C) 2012-2017 Last.fm & The "mogilefs-moji" committers
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package fm.last.moji;
 

diff --git a/src/main/java/fm/last/moji/MojiFileAttributes.java b/src/main/java/fm/last/moji/MojiFileAttributes.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2012-2017 Last.fm & The "mogilefs-moji" committers
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package fm.last.moji;
 
 public interface MojiFileAttributes {

diff --git a/src/main/java/fm/last/moji/impl/DefaultMojiFactory.java b/src/main/java/fm/last/moji/impl/DefaultMojiFactory.java
@@ -1,17 +1,17 @@
-/*
- * Copyright 2012 Last.fm
+/**
+ * Copyright (C) 2012-2017 Last.fm & The "mogilefs-moji" committers
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package fm.last.moji.impl;
 

diff --git a/src/main/java/fm/last/moji/impl/DeleteCommand.java b/src/main/java/fm/last/moji/impl/DeleteCommand.java
@@ -1,17 +1,17 @@
-/*
- * Copyright 2012 Last.fm
+/**
+ * Copyright (C) 2012-2017 Last.fm & The "mogilefs-moji" committers
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package fm.last.moji.impl;
 

diff --git a/src/main/java/fm/last/moji/impl/DeviceStatusField.java b/src/main/java/fm/last/moji/impl/DeviceStatusField.java
@@ -1,17 +1,17 @@
-/*
- * Copyright 2012 Last.fm
+/**
+ * Copyright (C) 2012-2017 Last.fm & The "mogilefs-moji" committers
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package fm.last.moji.impl;
 

diff --git a/src/main/java/fm/last/moji/impl/Executor.java b/src/main/java/fm/last/moji/impl/Executor.java
@@ -1,17 +1,17 @@
-/*
- * Copyright 2012 Last.fm
+/**
+ * Copyright (C) 2012-2017 Last.fm & The "mogilefs-moji" committers
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package fm.last.moji.impl;