Preparing for release.

Norconex · Jan 2, 2022 · aeb7c80 · aeb7c80
1 parent 6788032
commit aeb7c80
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 27 deletions.
diff --git a/CHANGES.xml b/CHANGES.xml
@@ -7,15 +7,20 @@
   </properties>
   <body>
 
-    <release version="3.0.0-SNAPSHOT" date="2021-??-??"
-        description="Changes since RC1.">
+    <release version="3.0.0" date="2022-01-02" 
+            description="Major release. NOT a drop-in replacement for 2.x.">
+
+      <!-- 3.0.0 (GA) -->
+
+      <action dev="essiembre" type="update">
+        Updated transitive dependencies with known vulnerabilities.
+      </action>
       <action dev="essiembre" type="update">
         Updated dependencies to avoid logging library detection conflict. 
       </action>
-    </release>
 
-    <release version="3.0.0-RC1" date="2021-10-09" 
-        description="Release Candidate 1.">
+      <!-- 3.0.0-RC1 -->
+
       <action dev="essiembre" type="update">
         Maven dependency updates: Apache Tika 1.27 (and its many transitive
         dependencies), UCAR jj2000 5.4, Opencsv 5.5.2, 
@@ -24,10 +29,9 @@
       <action dev="essiembre" type="fix">
         Fixed invalid configuration in POM "maven-dependency-plugin".
       </action>
-    </release>
-
-    <release version="3.0.0-M2" date="2021-07-28" 
-        description="Changes since last milestone for this upcoming major release.">
+
+      <!-- 3.0.0-M2 -->
+
       <action dev="essiembre" type="add">
         Handlers now support XML "flow", which adds supports for 
         if/ifNot/condition/then/else tags in XML configuration.
@@ -50,10 +54,9 @@
       <action dev="essiembre" type="add">
         New CommonMatchers class.
       </action>
-    </release>
 
-    <release version="3.0.0-M1" date="2021-03-01" 
-        description="Milestone towards next major release.">
+      <!-- 3.0.0-M1 -->
+
       <action dev="essiembre" type="add">
         New ImageTransformer class.
       </action>

diff --git a/pom.xml b/pom.xml
@@ -20,20 +20,24 @@
   <parent>
     <groupId>com.norconex.commons</groupId>
     <artifactId>norconex-commons-maven-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
   </parent>  
   <groupId>com.norconex.collectors</groupId>
   <artifactId>norconex-importer</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.0.0</version>
   <name>Norconex Importer</name>
 
   <properties>
+    <commons-compress.version>1.21</commons-compress.version>
+    <cxf.version>3.4.5</cxf.version>
+    <jdom2.version>2.0.6.1</jdom2.version>
+    <jpeg2000-imageio.version>1.4.0</jpeg2000-imageio.version>
+    <jsoup.version>1.14.3</jsoup.version>
+    <luaj-jse.version>3.0.1</luaj-jse.version>
+    <opencsv.version>5.5.2</opencsv.version>
     <tika.version>1.27</tika.version>
     <ucar-jj2000.version>5.4</ucar-jj2000.version>
-    <opencsv.version>5.5.2</opencsv.version>
-    <luaj-jse.version>3.0.1</luaj-jse.version>
     <webp-imageio.version>0.1.6</webp-imageio.version>
-    <jpeg2000-imageio.version>1.4.0</jpeg2000-imageio.version>
   </properties>
   <inceptionYear>2009</inceptionYear>
 
@@ -54,6 +58,36 @@
     </repository>
   </repositories>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-compress</artifactId>
+        <version>${commons-compress.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-client</artifactId>
+        <version>${cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+        <version>${cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jdom</groupId>
+        <artifactId>jdom2</artifactId>
+        <version>${jdom2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jsoup</groupId>
+        <artifactId>jsoup</artifactId>
+        <version>${jsoup.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.tika</groupId>
@@ -150,16 +184,6 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
@@ -248,6 +272,7 @@
           </execution>
         </executions>
       </plugin>
+
     </plugins>
   </build>