Skip to content

Commit

Permalink
Version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesagnew committed May 22, 2011
1 parent 1e8ec03 commit dab2ce5
Show file tree
Hide file tree
Showing 14 changed files with 559 additions and 449 deletions.
100 changes: 55 additions & 45 deletions hapi-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hapi</artifactId>
<groupId>ca.uhn.hapi</groupId>
<version>1.1</version>
<version>1.2-alpha2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -100,50 +100,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>sources</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>../src/assembly/source.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>javadoc</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>../src/assembly/javadoc.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>retrotranslator-maven-plugin</artifactId>
<version>1.0-alpha-4</version>
<executions>
<execution>
<goals>
<goal>translate-project</goal>
</goals>
<configuration>
<attach>true</attach>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
Expand Down Expand Up @@ -180,4 +136,58 @@
</resources>
</build>

<profiles>
<profile>
<id>DIST</id>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>sources</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>../src/assembly/source.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>javadoc</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>../src/assembly/javadoc.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>retrotranslator-maven-plugin</artifactId>
<version>1.0-alpha-4</version>
<executions>
<execution>
<goals>
<goal>translate-project</goal>
</goals>
<configuration>
<attach>true</attach>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion hapi-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>hapi</artifactId>
<groupId>ca.uhn.hapi</groupId>
<version>1.1</version>
<version>1.2-alpha2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
70 changes: 40 additions & 30 deletions hapi-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hapi</artifactId>
<groupId>ca.uhn.hapi</groupId>
<version>1.1</version>
<version>1.2-alpha2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -141,35 +141,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>sources</id>
<phase>package</phase> <!-- append to the packaging phase. -->
<goals>
<goal>single</goal> <!-- goals == mojos -->
</goals>
<configuration>
<descriptors>
<descriptor>../src/assembly/source.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>javadoc</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>../src/assembly/javadoc.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
Expand All @@ -178,5 +149,44 @@
</resource>
</resources>
</build>

<profiles>
<profile>
<id>DIST</id>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>sources</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>../src/assembly/source.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>javadoc</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>../src/assembly/javadoc.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion hapi-osgi-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hapi</artifactId>
<groupId>ca.uhn.hapi</groupId>
<version>1.1</version>
<version>1.2-alpha2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion hapi-sourcegen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hapi</artifactId>
<groupId>ca.uhn.hapi</groupId>
<version>1.1</version>
<version>1.2-alpha2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
102 changes: 56 additions & 46 deletions hapi-structures-v21/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hapi</artifactId>
<groupId>ca.uhn.hapi</groupId>
<version>1.1</version>
<version>1.2-alpha2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -76,51 +76,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- append to the packaging phase. -->
<goals>
<goal>single</goal> <!-- goals == mojos -->
</goals>
<inherited>true</inherited>
<configuration>
<descriptors>
<descriptor>../src/assembly/structures-source.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>javadoc</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>../src/assembly/javadoc.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>retrotranslator-maven-plugin</artifactId>
<version>1.0-alpha-4</version>
<executions>
<execution>
<goals>
<goal>translate-project</goal>
</goals>
<configuration>
<attach>true</attach>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
Expand Down Expand Up @@ -149,4 +104,59 @@
</plugins>
</reporting>

<profiles>
<profile>
<id>DIST</id>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- append to the packaging phase. -->
<goals>
<goal>single</goal> <!-- goals == mojos -->
</goals>
<inherited>true</inherited>
<configuration>
<descriptors>
<descriptor>../src/assembly/structures-source.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>javadoc</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>../src/assembly/javadoc.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>retrotranslator-maven-plugin</artifactId>
<version>1.0-alpha-4</version>
<executions>
<execution>
<goals>
<goal>translate-project</goal>
</goals>
<configuration>
<attach>true</attach>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
Loading

0 comments on commit dab2ce5

Please sign in to comment.