Preparing for release.

Norconex · Apr 1, 2015 · c70c0f7 · c70c0f7
1 parent f8ce700
commit c70c0f7
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 45 deletions.
diff --git a/norconex-committer-gsa/pom.xml b/norconex-committer-gsa/pom.xml
@@ -1,5 +1,5 @@
 <!--
-   Copyright 2013-2014 Norconex Inc.
+   Copyright 2013-20145 Norconex Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.norconex.collectors</groupId>
   <artifactId>norconex-committer-gsa</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.1</version>
   <name>Norconex Committer GSA</name>
 
   <properties>
@@ -54,38 +54,33 @@
   	<dependency>
 		<groupId>junit</groupId>
 		<artifactId>junit</artifactId>
-		<version>4.11</version>
+		<version>4.12</version>
 		<scope>test</scope>
 	</dependency>
     <dependency>
     	<groupId>com.norconex.collectors</groupId>
     	<artifactId>norconex-committer-core</artifactId>
-    	<version>2.0.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>1.7.5</version>
+    	<version>2.0.1</version>
     </dependency>
     <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.7.5</version>
+        <version>1.7.12</version>
     </dependency>
     <dependency>
     	<groupId>commons-codec</groupId>
     	<artifactId>commons-codec</artifactId>
-    	<version>1.7</version>
+    	<version>1.10</version>
     </dependency>
     <dependency>
 		<groupId>org.apache.httpcomponents</groupId>
 		<artifactId>httpclient</artifactId>
-		<version>4.3.4</version>
+		<version>4.4.1</version>
 	</dependency>
 	<dependency>
 		<groupId>org.apache.httpcomponents</groupId>
 		<artifactId>httpmime</artifactId>
-		<version>4.3.4</version>
+		<version>4.4.1</version>
 	</dependency>
   </dependencies>
 
@@ -95,7 +90,7 @@
         <resource>
             <directory>${project.build.testSourceDirectory}</directory>
             <includes>
-                <include>**/*.html</include>
+                <include>**</include>
             </includes>
         </resource>
         <resource>
@@ -107,22 +102,29 @@
             <excludes>
                 <exclude>**/*.java</exclude>
             </excludes>
-        </resource>      
+        </resource>    
+        <resource>
+            <filtering>false</filtering>
+            <directory>src/main/resources</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+        </resource>
     </resources>
     <extensions>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh</artifactId>
         <version>1.0</version>
       </extension>
-      <extension>  
-        <groupId>org.springframework.build.aws</groupId>  
-        <artifactId>org.springframework.build.aws.maven</artifactId>  
-        <version>3.0.0.RELEASE</version>  
-      </extension>  
     </extensions>
     <pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>2.5</version>
+            </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-site-plugin</artifactId>
@@ -159,10 +161,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.2</version>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
+          <encoding>UTF-8</encoding>
         </configuration>
       </plugin> 
       <plugin>
@@ -206,7 +209,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9.1</version>
+        <version>2.10.2</version>
         <configuration>
           <overview>${basedir}/src/main/javadoc/overview.html</overview>
           <show>protected</show>
@@ -232,7 +235,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.2.1</version>
+        <version>2.4</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -245,7 +248,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
+        <version>2.6</version>
         <executions>
           <execution>
             <goals>
@@ -257,21 +260,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-gpg-plugin</artifactId>
-        <version>1.5</version>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <version>1.5</version>
+        <version>1.6</version>
         <executions>
           <execution>
             <id>sign-artifacts</id>

diff --git a/norconex-committer-gsa/src/changes/changes.xml b/norconex-committer-gsa/src/changes/changes.xml
@@ -7,12 +7,16 @@
   </properties>
   <body>
 
-    <release version="1.0.1-SNAPSHOT" date="????-??-??" description="Maintenance release">
+    <release version="1.0.1" date="2015-04-01" description="Maintenance release">
       <action dev="essiembre" type="update">
         Added Sonatype repository to pom.xml for snapshot releases.
       </action>
       <action dev="essiembre" type="update">
-        Upgraded Norconex Committer Core to 2.0.1.
+        Updated several maven plugins and added SonarQube maven plugin.
+      </action>
+      <action dev="essiembre" type="update">
+        Library updates: Norconex Committer Core 2.0.1, SLF4j 1.7.12,
+        Apache Commons Codec 1.10, Apache HTTP Components 4.4.1.
       </action>      
     </release>
 

diff --git a/norconex-committer-gsa/src/main/java/com/norconex/committer/gsa/XmlOutput.java b/norconex-committer-gsa/src/main/java/com/norconex/committer/gsa/XmlOutput.java
@@ -116,10 +116,6 @@ private void writeAdd(IAddOperation op)
     private void writeContent(IAddOperation op) throws XMLStreamException,
     IOException {
         writer.writeStartElement("content");
-//                String encoding = op.getMetadata().getString(
-//                        "collector.content-encoding");
-//                if (encoding.equalsIgnoreCase("UTF-8")) encoding = "utf8";
-//                writer.writeAttribute("encoding", encoding);
         BufferedInputStream bufferedInput = null;
         byte[] buffer = new byte[1024 * 1024]; // 1MB
         try {