Fix licenses and update dependencies (#225)

* Fix licenses and update dependencies
microprofile · Sep 27, 2021 · 33319f2 · 33319f2
1 parent 9f520fc
commit 33319f2
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 185 deletions.
diff --git a/api/src/main/javadoc/licenses/Draft/license.html b/api/src/main/javadoc/licenses/Draft/license.html
diff --git a/api/src/main/javadoc/licenses/Final/license.html b/api/src/main/javadoc/licenses/Final/license.html
diff --git a/pom.xml b/pom.xml
@@ -32,8 +32,8 @@
     <url>http://microprofile.io</url>
 
     <properties>
-        <version.mp.config>3.0-RC4</version.mp.config>
-        <version.mp.rest.client>3.0-RC2</version.mp.rest.client>
+        <version.mp.config>3.0-RC5</version.mp.config>
+        <version.mp.rest.client>3.0-RC3</version.mp.rest.client>
         <version.opentracing>0.33.0</version.opentracing>
         <!-- Versions of API dependencies -->
         <osgi-annotation.version>1.1.0</osgi-annotation.version>

diff --git a/tck/running_the_tck.asciidoc → tck/README.adoc b/tck/running_the_tck.asciidoc → tck/README.adoc
diff --git a/tck/base/pom.xml b/tck/base/pom.xml
@@ -77,5 +77,27 @@
             <artifactId>opentracing-api</artifactId>
         </dependency>
     </dependencies>
-
+<build>
+        <plugins>
+            <plugin>
+                <groupId>com.coderplus.maven.plugins</groupId>
+                <artifactId>copy-rename-maven-plugin</artifactId>
+                <version>${version.plugin.copy.rename}</version>
+                <executions>
+                    <execution>
+                        <id>copy-readme</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                                    <sourceFile>../README.adoc</sourceFile>
+                                    <destinationFile>target/classes/README.adoc</destinationFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
+
diff --git a/tck/base/src/main/resources/META-INF/tck b/tck/base/src/main/resources/META-INF/tck
diff --git a/tck/licenses/Final/LICENSE b/tck/licenses/Final/LICENSE
diff --git a/tck/rest-client/pom.xml b/tck/rest-client/pom.xml
@@ -58,4 +58,27 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+<build>
+        <plugins>
+            <plugin>
+                <groupId>com.coderplus.maven.plugins</groupId>
+                <artifactId>copy-rename-maven-plugin</artifactId>
+                <version>${version.plugin.copy.rename}</version>
+                <executions>
+                    <execution>
+                        <id>copy-readme</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                                    <sourceFile>../README.adoc</sourceFile>
+                                    <destinationFile>target/classes/README.adoc</destinationFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
+
diff --git a/tck/licenses/Draft/LICENSE → ...lient/src/main/resources/META-INF/LICENSE b/tck/licenses/Draft/LICENSE → ...lient/src/main/resources/META-INF/LICENSE
diff --git a/tck/rest-client/src/main/resources/META-INF/NOTICE b/tck/rest-client/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,16 @@
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for Microprofile OpenTracing             ==
+=========================================================================
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+SPDXVersion: SPDX-2.1
+PackageName: Eclipse Microprofile
+PackageHomePage: http://www.eclipse.org/microprofile
+PackageLicenseDeclared: Apache-2.0
+
+PackageCopyrightText: <text>
+Steve Fontes [email protected]
+</text>
diff --git a/tck/rest-client/src/main/resources/META-INF/tck b/tck/rest-client/src/main/resources/META-INF/tck