Update to use the EF spec and tck v1.1 and tidy up the tck projects (#…

…177)
microprofile · May 20, 2024 · 63f291f · 63f291f
1 parent 3af748e
commit 63f291f
Show file tree

Hide file tree

Showing 11 changed files with 264 additions and 139 deletions.
diff --git a/pom.xml b/pom.xml
@@ -19,20 +19,20 @@
     <parent>
         <groupId>org.eclipse.microprofile</groupId>
         <artifactId>microprofile-parent</artifactId>
-        <version>3.2</version>
+        <version>3.3-RC1</version>
     </parent>
 
     <groupId>org.eclipse.microprofile.telemetry</groupId>
     <artifactId>microprofile-telemetry-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>MicroProfile Telemetry</name>
     <url>https://microprofile.io/project/eclipse/microprofile-telemetry</url>
 
     <properties>
         <inceptionYear>2022</inceptionYear>
         <opentelemetry.java.version>1.32.0</opentelemetry.java.version>
-        <opentelemetry.semconv.version>1.2ť.0</opentelemetry.semconv.version>
+        <opentelemetry.semconv.version>1.25.0</opentelemetry.semconv.version>
         <version.mp.rest.client>3.0.1</version.mp.rest.client>
         <version.microprofile-config-api>3.1</version.microprofile-config-api>
         <version.awaitility>4.2.1</version.awaitility>
@@ -70,6 +70,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>io.opentelemetry.semconv</groupId>
+                <artifactId>opentelemetry-semconv</artifactId>
+                <version>${version.otel.semconv}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/spec/pom.xml b/spec/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.eclipse.microprofile.telemetry</groupId>
         <artifactId>microprofile-telemetry-parent</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>microprofile-telemetry-spec</artifactId>

diff --git a/spec/src/main/asciidoc/license-alv2.adoc b/spec/src/main/asciidoc/license-alv2.adoc
diff --git a/spec/src/main/asciidoc/license-efsl.adoc b/spec/src/main/asciidoc/license-efsl.adoc
@@ -1,11 +1,8 @@
 [subs="normal"]
 ....
 Specification: {doctitle}
-
 Version: {revnumber}
-
 Status: {revremark}
-
 Release: {revdate}
 ....
 

diff --git a/tck/logs/pom.xml b/tck/logs/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.eclipse.microprofile.telemetry</groupId>
         <artifactId>microprofile-telemetry-tck-parent</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>microprofile-telemetry-logs-tck</artifactId>
@@ -57,7 +57,6 @@
         <dependency>
             <groupId>io.opentelemetry.semconv</groupId>
             <artifactId>opentelemetry-semconv</artifactId>
-            <version>${version.otel.semconv}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/io.opentelemetry.instrumentation/opentelemetry-logback-appender-1.0 -->
         <dependency>
@@ -104,27 +103,4 @@
         </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/metrics/pom.xml b/tck/metrics/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.eclipse.microprofile.telemetry</groupId>
         <artifactId>microprofile-telemetry-tck-parent</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>microprofile-telemetry-metrics-tck</artifactId>
@@ -54,19 +54,13 @@
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
         </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
-            <version>3.0.3</version>
-        </dependency>        
         <dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
             <artifactId>opentelemetry-instrumentation-annotations</artifactId>
         </dependency>
         <dependency>
             <groupId>io.opentelemetry.semconv</groupId>
             <artifactId>opentelemetry-semconv</artifactId>
-            <version>${version.otel.semconv}</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
@@ -91,30 +85,7 @@
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <version>${version.awaitility}</version>
         </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>