changeset 414:6a9ce3b8ccc4

7902042: Make sure JCStress builds and runs with JDK 9 GA
author shade
date Tue, 26 Sep 2017 12:19:01 +0200
parents 4e9f1db0eba7
children 18db5d6682d7
files jcstress-benchmarks/pom.xml jcstress-core/pom.xml jcstress-core/src/assembly/whitebox.xml jcstress-java-test-archetype/pom.xml jcstress-test-gen/pom.xml pom.xml tests-chapter-0a/pom.xml tests-chapter-0b/pom.xml tests-chapter-0c/pom.xml tests-chapter-0e/pom.xml tests-chapter-1a/pom.xml tests-chapter-1b/pom.xml tests-chapter-1c/pom.xml tests-chapter-1d/pom.xml tests-chapter-2a/pom.xml tests-chapter-2b/pom.xml
diffstat 16 files changed, 85 insertions(+), 87 deletions(-) [+]
line wrap: on
line diff
--- a/jcstress-benchmarks/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/jcstress-benchmarks/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -84,7 +84,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
                 <configuration>
                     <compilerVersion>${javac.target}</compilerVersion>
                     <source>${javac.target}</source>
@@ -94,7 +93,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -127,46 +125,6 @@
                 </executions>
             </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>2.5</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>2.5.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.4</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.9.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.6</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.3</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>2.2.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.17</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 
 </project>
--- a/jcstress-core/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/jcstress-core/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -96,20 +96,7 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>whitebox</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>sun/hotspot/WhiteBox.class</include>
-                            </includes>
-                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                            <finalName>whitebox-api</finalName>
-                        </configuration>
-                    </execution>
-                    <execution>
+                        <id>default-jar</id>
                         <phase>package</phase>
                         <goals>
                             <goal>jar</goal>
@@ -123,6 +110,28 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>whitebox</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                            <finalName>whitebox-api</finalName>
+                            <attach>false</attach>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/assembly/whitebox.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <executions>
@@ -167,7 +176,6 @@
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
             <artifactId>jopt-simple</artifactId>
-            <version>4.6</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -178,7 +186,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jcstress-core/src/assembly/whitebox.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -0,0 +1,15 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>whitebox</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <files>
+        <file>
+            <source>${project.build.outputDirectory}/sun/hotspot/WhiteBox.class</source>
+            <outputDirectory>/sun/hotspot/</outputDirectory>
+        </file>
+    </files>
+</assembly>
\ No newline at end of file
--- a/jcstress-java-test-archetype/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/jcstress-java-test-archetype/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -63,7 +63,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-archetype-plugin</artifactId>
-                <version>2.2</version>
                 <goals>
                     <goal>integration-test</goal>
                 </goals>
@@ -71,10 +70,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <escapeString>\</escapeString>
-                  </configuration>
             </plugin>
             <plugin> <!-- deploy this artifact -->
                 <groupId>org.apache.maven.plugins</groupId>
--- a/jcstress-test-gen/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/jcstress-test-gen/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -56,7 +56,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.7.1</version>
                 <executions>
                     <execution>
                         <id>testgen</id>
--- a/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -151,7 +151,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>3.0.2</version>
                     <configuration>
                         <archive>
                             <manifest>
@@ -167,7 +167,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.2</version>
+                    <version>3.0.0-M1</version>
                     <executions>
                         <execution>
                             <id>enforce-versions</id>
@@ -216,7 +216,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10.4</version>
+                    <version>3.0.0-M1</version>
                     <executions>
                         <execution>
                             <id>attach-javadoc</id>
@@ -239,6 +239,34 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-archetype-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.6</version>
+                    <configuration>
+                        <escapeString>\</escapeString>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.7</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>1.2.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -253,6 +281,22 @@
         </plugins>
     </build>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>net.sf.jopt-simple</groupId>
+                <artifactId>jopt-simple</artifactId>
+                <version>4.6</version>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.10</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <modules>
         <module>jcstress-test-gen</module>
         <module>jcstress-result-gen</module>
--- a/tests-chapter-0a/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/tests-chapter-0a/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -55,7 +55,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>chapter0a-gen</id>
@@ -79,7 +78,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
--- a/tests-chapter-0b/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/tests-chapter-0b/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -61,7 +61,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>volatiles</id>
@@ -85,7 +84,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
--- a/tests-chapter-0c/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/tests-chapter-0c/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -61,7 +61,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>gen</id>
@@ -85,7 +84,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
--- a/tests-chapter-0e/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/tests-chapter-0e/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -55,7 +55,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>chapter0a-gen</id>
@@ -79,7 +78,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
--- a/tests-chapter-1a/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/tests-chapter-1a/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -61,7 +61,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>chapter1a-gen</id>
@@ -85,7 +84,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
--- a/tests-chapter-1b/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/tests-chapter-1b/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -61,7 +61,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>gen</id>
@@ -85,7 +84,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
--- a/tests-chapter-1c/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/tests-chapter-1c/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -61,7 +61,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>gen</id>
@@ -85,7 +84,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
--- a/tests-chapter-1d/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/tests-chapter-1d/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -55,7 +55,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>chapter0a-gen</id>
@@ -79,7 +78,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
--- a/tests-chapter-2a/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/tests-chapter-2a/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -61,7 +61,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>gen</id>
@@ -85,7 +84,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
--- a/tests-chapter-2b/pom.xml	Fri Sep 01 17:51:37 2017 +0200
+++ b/tests-chapter-2b/pom.xml	Tue Sep 26 12:19:01 2017 +0200
@@ -61,7 +61,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>gen</id>
@@ -86,7 +85,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
                 <executions>
                     <execution>
                         <id>add-source</id>