Upgrade parent POM

digipost · Dec 5, 2023 · 7ff9394 · 7ff9394
1 parent 0202e2a
commit 7ff9394
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 185 deletions.
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -1 +1 @@
--Pbuild-sources-and-javadoc
+-Pbuild-sources-and-javadoc,dependency-analyze,include-NOTICE
diff --git a/NOTICE b/NOTICE
@@ -0,0 +1,65 @@
+Digipost XSD
+
+Copyright 2014 Posten Norge AS. All Rights Reserved.
+
+This product includes software developed by Posten Norge AS. - https://www.posten.no/
+Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+This software includes third party software subject to the following licenses:
+
+  Angus Activation Registries under EDL 1.0
+  Apache Commons Codec under Apache License, Version 2.0
+  Apache Commons Lang under Apache-2.0
+  Apache HttpClient under Apache License, Version 2.0
+  Apache HttpCore under Apache License, Version 2.0
+  Apache WSS4J DOM WS-Security under Apache-2.0
+  Apache WSS4J WS-Security Common under Apache-2.0
+  Apache XML Security for Java under Apache-2.0
+  Bouncy Castle Provider under Bouncy Castle Licence
+  Cryptacular Library under Apache 2 or GNU Lesser General Public License
+  Digipost JAXB Resolver - com.sun.xml.bind under The Apache Software License, Version 2.0
+  Extended StAX API under Eclipse Distribution License - v 1.0
+  Guava InternalFutureFailureAccess and InternalFutures under The Apache Software License, Version 2.0
+  Guava: Google Core Libraries for Java under Apache License, Version 2.0
+  istack common utility code runtime under Eclipse Distribution License - v 1.0
+  Jakarta Activation API under EDL 1.0
+  Jakarta Mail API under EPL 2.0 or GPL2 w/ CPE or EDL 1.0
+  Jakarta SOAP Implementation under Eclipse Distribution License - v 1.0
+  Jakarta SOAP with Attachments API under Eclipse Distribution License - v 1.0
+  Jakarta XML Binding API under Eclipse Distribution License - v 1.0
+  JASYPT: Java Simplified Encryption under The Apache Software License, Version 2.0
+  JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
+  JAXB Core under Eclipse Distribution License - v 1.0
+  JAXB Runtime under Eclipse Distribution License - v 1.0
+  jaxb-api under CDDL 1.1 or GPL2 w/ CPE
+  JAXB2 Basics - Runtime under BSD-Style License
+  JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
+  JUL to SLF4J bridge under MIT License
+  Log4j Implemented Over SLF4J under Apache Software Licenses
+  micrometer-commons under The Apache Software License, Version 2.0
+  micrometer-observation under The Apache Software License, Version 2.0
+  Old JAXB Core under CDDL+GPL License
+  Old JAXB Runtime under Eclipse Distribution License - v 1.0
+  SDP Shared under The Apache Software License, Version 2.0
+  SDP Shared - API Client under The Apache Software License, Version 2.0
+  SDP Shared - API Commons under The Apache Software License, Version 2.0
+  SDP Shared - XSD & JAXB under The Apache Software License, Version 2.0
+  SLF4J API Module under MIT License
+  Spring AOP under Apache License, Version 2.0
+  Spring Beans under Apache License, Version 2.0
+  Spring Commons Logging Bridge under Apache License, Version 2.0
+  Spring Context under Apache License, Version 2.0
+  Spring Core under Apache License, Version 2.0
+  Spring Expression Language (SpEL) under Apache License, Version 2.0
+  Spring Object/XML Marshalling under Apache License, Version 2.0
+  Spring Transaction under Apache License, Version 2.0
+  Spring Web under Apache License, Version 2.0
+  Spring Web MVC under Apache License, Version 2.0
+  spring-security-core under Apache License, Version 2.0
+  spring-security-crypto under Apache License, Version 2.0
+  spring-ws-core under Apache License, Version 2.0
+  spring-ws-security under Apache License, Version 2.0
+  spring-xml under Apache License, Version 2.0
+  TXW2 Runtime under Eclipse Distribution License - v 1.0
+
diff --git a/api-client/pom.xml b/api-client/pom.xml
@@ -117,27 +117,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>check-dependency-declarations-vs-usage</id>
-                        <goals>
-                            <goal>analyze-only</goal>
-                        </goals>
-                        <configuration>
-                            <ignoreNonCompile>true</ignoreNonCompile>
-                            <failOnWarning>true</failOnWarning>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.jasig.maven</groupId>
-                <artifactId>maven-notice-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/api-client/src/main/notice/NOTICE.template b/api-client/src/main/notice/NOTICE.template
diff --git a/api-client/src/main/notice/license-mappings.xml b/api-client/src/main/notice/license-mappings.xml
diff --git a/api-commons/pom.xml b/api-commons/pom.xml
@@ -142,24 +142,4 @@
 
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <configuration>
-                        <ignoredNonTestScopedDependencies>
-                            <ignored>javax.xml.soap:javax.xml.soap-api</ignored>
-                        </ignoredNonTestScopedDependencies>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.jasig.maven</groupId>
-                <artifactId>maven-notice-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/api-commons/src/main/notice/NOTICE.template b/api-commons/src/main/notice/NOTICE.template
diff --git a/api-commons/src/main/notice/license-mappings.xml b/api-commons/src/main/notice/license-mappings.xml
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>no.digipost</groupId>
         <artifactId>digipost-open-super-pom</artifactId>
-        <version>7</version>
+        <version>13</version>
     </parent>
 
     <modules>
@@ -22,7 +22,6 @@
 
     <properties>
         <maven.compiler.release>17</maven.compiler.release>
-        <project.previousVersion>set_with_-Dproject.previousVersion=X.Y</project.previousVersion>
 
         <org.slf4j.version>1.7.36</org.slf4j.version>
         <spring.ws.version>4.0.8</spring.ws.version>
@@ -282,63 +281,22 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.6.0</version>
+                    <version>3.6.3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.jasig.maven</groupId>
-                    <artifactId>maven-notice-plugin</artifactId>
-                    <version>1.1.0</version>
+                    <artifactId>notice-maven-plugin</artifactId>
+                    <version>2.0.0</version>
                     <configuration>
-                        <includeScopes>
-                            <scope>compile</scope>
-                            <scope>runtime</scope>
-                        </includeScopes>
-                        <noticeTemplate>${project.basedir}/src/main/notice/NOTICE.template</noticeTemplate>
-                        <licenseMapping>
-                            <param>${project.basedir}/src/main/notice/license-mappings.xml</param>
-                        </licenseMapping>
+                        <generateChildNotices>false</generateChildNotices>
                     </configuration>
-                    <executions>
-                        <execution>
-                            <id>check-NOTICE-file</id>
-                            <phase>verify</phase>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <dependencies>
-                        <dependency>
-                            <groupId>jakarta.xml.bind</groupId>
-                            <artifactId>jakarta.xml.bind-api</artifactId>
-                            <version>2.3.3</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.glassfish.jaxb</groupId>
-                            <artifactId>jaxb-runtime</artifactId>
-                            <version>2.3.3</version>
-                            <scope>runtime</scope>
-                        </dependency>
-                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>com.github.siom79.japicmp</groupId>
                     <artifactId>japicmp-maven-plugin</artifactId>
                     <version>0.18.3</version>
                     <configuration>
-                        <oldVersion>
-                            <dependency>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>${project.artifactId}</artifactId>
-                                <version>${project.previousVersion}</version>
-                            </dependency>
-                        </oldVersion>
-                        <newVersion>
-                            <file><path>${project.build.directory}/${project.build.finalName}.${project.packaging}</path></file>
-                        </newVersion>
                         <parameter>
-                            <onlyModified>true</onlyModified>
-                            <onlyBinaryIncompatible>true</onlyBinaryIncompatible>
                             <includes>
                                 <include>no.digipost.api</include>
                                 <include>no.digipost.xsd</include>
@@ -408,7 +366,6 @@
                                     <include>org.glassfish.jaxb</include>
                                     <include>com.sun.istack</include>
                                     <include>jakarta.annotation:jakarta.annotation-api</include>
-                                    <!--include>jakarta.jws:jsr181-api</include-->
                                     <include>jakarta.xml.soap:jakarta.xml.soap-api</include>
                                     <include>com.sun.xml.messaging.saaj:saaj-impl</include>
                                     <include>org.jvnet.staxex:stax-ex</include>
@@ -434,7 +391,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.5.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>
@@ -443,23 +400,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>check-dependency-declarations-vs-usage</id>
-                        <goals>
-                            <goal>analyze-only</goal>
-                        </goals>
-                        <configuration>
-                            <ignoreNonCompile>true</ignoreNonCompile>
-                            <failOnWarning>true</failOnWarning>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
     </build>
 
 </project>
diff --git a/xsd/src/main/notice/NOTICE.template → src/NOTICE.template b/xsd/src/main/notice/NOTICE.template → src/NOTICE.template
diff --git a/xsd/pom.xml b/xsd/pom.xml
@@ -74,7 +74,7 @@
 			<plugin>
 				<groupId>org.jvnet.jaxb2.maven2</groupId>
 				<artifactId>maven-jaxb2-plugin</artifactId>
-				<version>0.15.2</version>
+				<version>0.15.3</version>
 				<executions>
 					<execution>
 						<goals>
@@ -137,10 +137,6 @@
 					</plugins>
 				</configuration>
 			</plugin>
-            <plugin>
-                <groupId>org.jasig.maven</groupId>
-                <artifactId>maven-notice-plugin</artifactId>
-            </plugin>
 		</plugins>
 	</build>
 

diff --git a/xsd/src/main/notice/license-mappings.xml b/xsd/src/main/notice/license-mappings.xml