revert some changes because set -DprepareRelease=true is no longer necessary
diff --git a/test12/pom.xml b/test12/pom.xml
index fee5ea9..d6c27f9 100644
--- a/test12/pom.xml
+++ b/test12/pom.xml
@@ -164,7 +164,6 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <!--
<reportSets>
<reportSet>
<id>non-aggregate</id>
@@ -175,7 +174,6 @@
</reports>
</reportSet>
</reportSets>
- -->
</plugin>
</plugins>
</reporting>
@@ -206,29 +204,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>generate-assembly-2</id>
- <activation>
- <property>
- <name>prepareRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/test20/pom.xml b/test20/pom.xml
index 37ffffb..277a48b 100644
--- a/test20/pom.xml
+++ b/test20/pom.xml
@@ -249,36 +249,11 @@
</plugins>
</build>
</profile>
- <profile>
- <id>generate-assembly-2</id>
- <activation>
- <property>
- <name>prepareRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<reporting>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <!--
<reportSets>
<reportSet>
<id>non-aggregate</id>
@@ -289,7 +264,6 @@
</reports>
</reportSet>
</reportSets>
- -->
</plugin>
</plugins>
</reporting>
diff --git a/test22/pom.xml b/test22/pom.xml
index e736df6..95618db 100644
--- a/test22/pom.xml
+++ b/test22/pom.xml
@@ -257,36 +257,11 @@
</plugins>
</build>
</profile>
- <profile>
- <id>generate-assembly-2</id>
- <activation>
- <property>
- <name>prepareRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<reporting>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <!--
<reportSets>
<reportSet>
<id>non-aggregate</id>
@@ -297,7 +272,6 @@
</reports>
</reportSet>
</reportSets>
- -->
</plugin>
</plugins>
</reporting>
diff --git a/test23/pom.xml b/test23/pom.xml
index 73b151a..dbfa3eb 100644
--- a/test23/pom.xml
+++ b/test23/pom.xml
@@ -141,8 +141,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
@@ -257,36 +257,11 @@
</plugins>
</build>
</profile>
- <profile>
- <id>generate-assembly-2</id>
- <activation>
- <property>
- <name>prepareRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<reporting>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <!--
<reportSets>
<reportSet>
<id>non-aggregate</id>
@@ -297,7 +272,6 @@
</reports>
</reportSet>
</reportSets>
- -->
</plugin>
</plugins>
</reporting>
