Adapt the TCK mapper to the simplified spec architecture

jakartaee · Jan 23, 2017 · e6da50b · e6da50b
1 parent 37787b2
commit e6da50b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 57 deletions.
diff --git a/tck-mapper/pom.xml b/tck-mapper/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>javax.enterprise</groupId>
         <artifactId>cdi-spec</artifactId>
-        <version>1.2</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -16,7 +16,7 @@
 
     <properties>
         <jsoup.version>1.8.1</jsoup.version>
-        <path.to.cdi.spec>spec/jcp/target/publish/html/cdi-spec.html</path.to.cdi.spec>
+        <path.to.cdi.spec>spec/target/publish/html/cdi-spec.html</path.to.cdi.spec>
         <tck.version>1.2.3.Final</tck.version>
         <tck.audit.url>https://repo1.maven.org/maven2/org/jboss/cdi/tck/cdi-tck-impl/${tck.version}/cdi-tck-impl-${tck.version}-audit-cdi.xml</tck.audit.url>
         <tck.coverage.url>https://repo1.maven.org/maven2/org/jboss/cdi/tck/cdi-tck-impl/${tck.version}/cdi-tck-impl-${tck.version}-coverage-cdi.html</tck.coverage.url>
@@ -62,62 +62,13 @@
                     </archive>
                 </configuration>
             </plugin>
-            <!--plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.7</version>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>../spec/jcp/target/publish/html/images</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources/images/</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.3.2</version>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.jboss.cdi.tck.mapper.Mapper</mainClass>
-                    <includeProjectDependencies>true</includeProjectDependencies>
-                    <arguments>
-                        <argument>${tck.audit.url}</argument>
-                        <argument>${tck.coverage.url}</argument>
-                        <argument>${path.to.cdi.spec}</argument>
-                        <argument>${tck.version}</argument>
-                    </arguments>
-                </configuration>
-            </plugin-->
         </plugins>
     </build>
 
     <profiles>
 
         <profile>
-            <id>tck-assertions</id>
-            <activation>
-                <property>
-                    <name>tck</name>
-                </property>
-            </activation>
+            <id>tck</id>
             <build>
                 <plugins>
                     <plugin>
@@ -131,7 +82,7 @@
                                     <goal>copy-resources</goal>
                                 </goals>
                                 <configuration>
-                                    <outputDirectory>../spec/jcp/target/publish/html/images</outputDirectory>
+                                    <outputDirectory>../spec/target/publish/html/images</outputDirectory>
                                     <resources>
                                         <resource>
                                             <directory>src/main/resources/images/</directory>
@@ -168,6 +119,4 @@
             </build>
         </profile>
     </profiles>
-
-
-</project>
+</project>
diff --git a/tck-mapper/src/main/java/org/jboss/cdi/tck/mapper/Mapper.java b/tck-mapper/src/main/java/org/jboss/cdi/tck/mapper/Mapper.java
@@ -45,7 +45,7 @@ public class Mapper {
     private List<Section> auditSections;
     private String tckVersion;
     private static final Logger log = Logger.getLogger(Mapper.class.getName());
-    private final static String SPEC_WITH_ASSERTIONS = "spec/jcp/target/publish/html/cdi-spec-with-assertions.html";
+    private final static String SPEC_WITH_ASSERTIONS = "spec/target/publish/html/cdi-spec-with-assertions.html";
 
     public Mapper(String tckAuditURL, String coverageReportURL, String pathToCdiSpec, String tckVersion) {
         this.auditParser = new TckAuditSaxParser(tckAuditURL);