Skip to content

Commit

Permalink
Undo lost comments and CDATA sections from POM introduced by maven-re…
Browse files Browse the repository at this point in the history
…lease-plugin during 6.0.1 release
  • Loading branch information
anistor authored and danberindei committed Jan 13, 2014
1 parent b844c0c commit 7e46163
Show file tree
Hide file tree
Showing 27 changed files with 212 additions and 152 deletions.
16 changes: 8 additions & 8 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</issueManagement>

<properties>

<!-- Versions for dependencies -->
<version.protostream>1.0.0.CR1</version.protostream>
<version.aesh>0.33.7</version.aesh>
<version.antlr>3.4</version.antlr>
Expand Down Expand Up @@ -85,7 +85,7 @@

<dependencyManagement>
<dependencies>

<!-- Infinispan module versions -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-cachestore-jdbc</artifactId>
Expand Down Expand Up @@ -207,7 +207,7 @@
<artifactId>infinispan-jcache</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Infinispan core modules dependencies -->
<dependency>
<groupId>gnu-getopt</groupId>
<artifactId>getopt</artifactId>
Expand Down Expand Up @@ -258,7 +258,7 @@
<artifactId>org.osgi.core</artifactId>
<version>${version.osgi}</version>
</dependency>

<!-- Infinispan RHQ module dependencies -->
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-domain</artifactId>
Expand Down Expand Up @@ -290,7 +290,7 @@
<artifactId>rhq-core-native-system</artifactId>
<version>${version.rhq}</version>
</dependency>

<!-- Infinispan Query module dependencies -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-engine</artifactId>
Expand All @@ -301,7 +301,7 @@
<artifactId>hibernate-search-infinispan</artifactId>
<version>${version.hibernate.search}</version>
</dependency>

<!-- Infinispan Remote Query module dependencies -->
<dependency>
<groupId>org.infinispan.protostream</groupId>
<artifactId>protostream</artifactId>
Expand All @@ -312,7 +312,7 @@
<artifactId>sample-domain-implementation</artifactId>
<version>${version.protostream}</version>
</dependency>

<!-- Infinispan Protocols module dependencies -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
Expand All @@ -330,4 +330,4 @@
</dependency>
</dependencies>
</dependencyManagement>
</project>
</project>
8 changes: 4 additions & 4 deletions cdi/extension/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<artifactId>infinispan-client-hotrod</artifactId>
</dependency>


<!-- Logging dependency -->
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>


<!-- Test dependencies -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Expand Down Expand Up @@ -104,7 +104,7 @@
</dependencies>
<build>
<plugins>

<!-- Disable parallel execution of tests ARQ-127 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down Expand Up @@ -201,4 +201,4 @@
</dependencies>
</profile>
</profiles>
</project>
</project>
4 changes: 2 additions & 2 deletions cli/cli-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<name>Infinispan CLI Server</name>
<description>Infinispan CLI Server module</description>


<!-- This module declares components that either has lifecycle (@Start or @Stop) or uses @Inject to retrieve dependencies -->
<properties>
<module.skipComponentMetaDataProcessing>false</module.skipComponentMetaDataProcessing>
</properties>
Expand Down Expand Up @@ -118,4 +118,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
6 changes: 3 additions & 3 deletions commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<build>
<plugins>

<!-- compiler to use -XDignore.symbol.file to suppress warnings regarding the use of sun.misc.Unsafe -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand All @@ -49,7 +49,7 @@
<encoding>UTF-8</encoding>
<compilerArgument>-AtranslationFilesPath=${project.basedir}/target/generated-translation-files</compilerArgument>
<compilerArgument>-XDignore.symbol.file</compilerArgument>

<!-- Forking is necessary to allow for the compiler args to be picked up. -->
<fork>true</fork>
</configuration>
</plugin>
Expand All @@ -66,4 +66,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
9 changes: 6 additions & 3 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
<artifactId>jgroups</artifactId>
</dependency>


<!--
For the JTA 1.1 API; consuming projects can safely
exclude this and replace with any valid source of this API, such as a Java EE app server.
-->
<dependency>
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
Expand Down Expand Up @@ -91,7 +94,7 @@
<pluginManagement>
<plugins>
<plugin>

<!-- This plugin's configuration is used in m2e only. -->
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
Expand Down Expand Up @@ -149,4 +152,4 @@
</plugins>
</build>

</project>
</project>
4 changes: 2 additions & 2 deletions demos/gridfs-webdav/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<groupId>net.sf.webdav-servlet</groupId>
<artifactId>webdav-servlet</artifactId>
</dependency>

<!-- required by Webdav-Servlet -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Expand All @@ -32,4 +32,4 @@
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
</project>
</project>
10 changes: 6 additions & 4 deletions demos/lucene-directory-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>

<!-- Hack to make Eclipse happy when opening multiple modules at once:
the eclipse project related to infinispan-lucene-directory does not
contain the actual classes packaged in its jar -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-lucene-v3</artifactId>
Expand All @@ -35,7 +37,7 @@
<build>
<plugins>


<!-- Creates executable scripts -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
Expand All @@ -51,7 +53,7 @@
</configuration>
</plugin>


<!-- Testing Configuration -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -65,4 +67,4 @@
</plugins>
</build>

</project>
</project>
25 changes: 17 additions & 8 deletions demos/nearcache-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,15 @@

<dependencyManagement>
<dependencies>


<!-- Define the version of JBoss' Java EE 6 APIs we want to use -->
<!-- JBoss distributes a complete set of Java EE 6 APIs including
a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or
a collection) of artifacts. We use this here so that we always get the correct
versions of artifacts. Here we use the jboss-javaee-web-6.0 stack (you can
read this as the JBoss stack of the Java EE 6 Web Profile APIs), and we use
version 2.0.0.Final which is the latest release of the stack. You can actually
use this stack with any version of JBoss AS that implements Java EE 6, not
just JBoss AS 7! -->
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-web-6.0</artifactId>
Expand All @@ -85,7 +92,7 @@
<scope>import</scope>
</dependency>


<!-- Define the versions of Arquillian dependencies we want to use -->
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
Expand All @@ -97,13 +104,14 @@
</dependencyManagement>

<build>

<!-- Set the name of the war, used as the context root when the app
is deployed -->
<finalName>infinispan-nearcache</finalName>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>

<!-- No web.xml needed in Java EE 6 -->
<failOnMissingWebXml>false</failOnMissingWebXml>
<archive>
<manifest>
Expand All @@ -113,14 +121,15 @@
</configuration>
</plugin>


<!-- JBoss AS plugin to deploy war -->
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
<version>7.1.0.Beta1b</version>
</plugin>


<!-- Compiler plugin enforces Java 1.6 compatibility and activates
annotation processors -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
Expand All @@ -132,4 +141,4 @@
</plugins>
</build>

</project>
</project>
4 changes: 2 additions & 2 deletions demos/nearcache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<artifactId>netty</artifactId>
</dependency>


<!-- HornetQ dependencies -->
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-bootstrap</artifactId>
Expand Down Expand Up @@ -80,4 +80,4 @@

</dependencies>

</project>
</project>
4 changes: 2 additions & 2 deletions documentation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<properties>
<infinispan.version>6.0.x</infinispan.version>

<!-- Skip artifact deployment -->
<maven.deploy.skip>true</maven.deploy.skip>
<skipTests>true</skipTests>
</properties>
Expand Down Expand Up @@ -58,4 +58,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions extended-statistics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<name>Infinispan Extended Statistics</name>
<description>Infinispan Extended Statistics module</description>


<!-- This module declares components that either has lifecycle (@Start or @Stop) or uses @Inject to retrieve dependencies -->
<properties>
<module.skipComponentMetaDataProcessing>false</module.skipComponentMetaDataProcessing>
</properties>
Expand All @@ -37,4 +37,4 @@
<version>2.2.0</version>
</dependency>
</dependencies>
</project>
</project>
8 changes: 4 additions & 4 deletions integrationtests/as-integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<description>Integration tests: AS Module Integration Tests</description>

<properties>
<eap.dir />
<eap.dir></eap.dir>
</properties>

<dependencies>
Expand Down Expand Up @@ -113,7 +113,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>

<!-- Force use of JUnit, since TestNG+Arquillian break in wonderful ways -->
<testNGArtifactName>none:none</testNGArtifactName>
</configuration>
<executions>
Expand Down Expand Up @@ -167,7 +167,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>

<!-- Copy the AS configuration files so we can use our custom configurations -->
<execution>
<id>configure-as-node</id>
<phase>pre-integration-test</phase>
Expand All @@ -189,4 +189,4 @@
</plugins>
</build>

</project>
</project>
4 changes: 2 additions & 2 deletions integrationtests/cdi-jcache-it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<build>
<plugins>

<!-- Disable parallel execution of tests ARQ-127 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down Expand Up @@ -111,4 +111,4 @@
</profile>
</profiles>

</project>
</project>
Loading

0 comments on commit 7e46163

Please sign in to comment.