Updated >project< artifact to 1.0.7 # Conflicts: # pom.xml
diff --git a/appserver/tests/appserv-tests/util/reportbuilder/pom.xml b/appserver/tests/appserv-tests/util/reportbuilder/pom.xml index 68857b3..f01f6d6 100644 --- a/appserver/tests/appserv-tests/util/reportbuilder/pom.xml +++ b/appserver/tests/appserv-tests/util/reportbuilder/pom.xml
@@ -21,18 +21,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <groupId>org.eclipse.ee4j</groupId> - <artifactId>project</artifactId> - <version>1.0</version> + <groupId>org.glassfish.main.tests</groupId> + <artifactId>ant-tests</artifactId> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.glassfish.devtests</groupId> - <version>4.0-SNAPSHOT</version> <artifactId>report-builder</artifactId> <packaging>jar</packaging> <name>report-builder</name> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <defaultGoal>install</defaultGoal> <plugins> <plugin> @@ -42,7 +41,7 @@ <phase>install</phase> <configuration> <tasks> - <copy file="target/${artifactId}.jar" tofile="../../lib/reportbuilder.jar"/> + <copy file="target/${project.artifactId}.jar" tofile="../../lib/reportbuilder.jar"/> </tasks> </configuration> <goals>
diff --git a/appserver/tests/quicklook/pom.xml b/appserver/tests/quicklook/pom.xml index 2bc75d2..cf495b1 100644 --- a/appserver/tests/quicklook/pom.xml +++ b/appserver/tests/quicklook/pom.xml
@@ -24,7 +24,7 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0</version> + <version>1.0.7</version> <relativePath/> </parent>
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index 3c4d1f3..5ab209a 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml
@@ -1023,7 +1023,6 @@ <plugins> <plugin> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0</version> <executions> <execution> <id>enforce-maven</id>
diff --git a/pom.xml b/pom.xml index 8fc0bd3..5925e97 100644 --- a/pom.xml +++ b/pom.xml
@@ -23,7 +23,7 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.6</version> + <version>1.0.7</version> </parent> <groupId>org.glassfish.main</groupId> @@ -134,9 +134,9 @@ <module>appserver</module> <module>nucleus/hk2/config-generator</module> <module>docs</module> - <module>appserver/admingui/devtests</module> <module>appserver/extras/embedded/common</module> - <module>nucleus/tests</module> + <module>appserver/tests/appserv-tests/util/reportbuilder</module> + <module>appserver/tests/tck</module> </modules> </profile>