Skip to content

Commit

Permalink
Merge pull request #6 from sencha/brandon-updates
Browse files Browse the repository at this point in the history 
pom.xml fix.
  • Loading branch information
@branflake2267
branflake2267 authored Nov 21, 2017
2 parents 3d9c60f + 852e920 commit 698410d
Showing 1 changed file with 37 additions and 94 deletions.
131 changes: 37 additions & 94 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,13 @@
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
<version>1.2</version>
<version>2.4.2</version>
<configuration>
<includes>**/server/data/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
<toolProperties>
<property>
<name>directory</name>
<value>${project.build.outputDirectory}</value>
</property>
</toolProperties>
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
</configuration>
<executions>
<execution>
Expand All @@ -126,18 +121,8 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<!-- set the version to be the same as the level in your runtime -->
<version>2.4.2</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -188,11 +173,9 @@
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
<artifactId>
openjpa-maven-plugin
</artifactId>
<versionRange>[1.2,)</versionRange>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
<versionRange>[2.4.2,)</versionRange>
<goals>
<goal>enhance</goal>
</goals>
Expand All @@ -203,6 +186,7 @@
</execute>
</action>
</pluginExecution>

<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -235,10 +219,10 @@
<properties>
<profile.fast.build>
&lt;set-property name="user.agent" value="safari" /&gt;
&lt;set-property
name="gxt.user.agent" value="chrome" /&gt;
&lt;set-property name="gxt.user.agent" value="chrome" /&gt;
&lt;set-property name="gxt.device" value="desktop" /&gt;
&lt;set-property name="gxt.theme" value="triton" /&gt; </profile.fast.build>
&lt;set-property name="gxt.theme" value="triton" /&gt;
</profile.fast.build>
</properties>
<build>
<resources>
Expand All @@ -264,43 +248,18 @@
</plugins>
</build>
</profile>

</profiles>

<repositories>
<repository>
<id>snapshots-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<!-- http://docs.sencha.com/gxt/latest/getting_started/maven/Maven.html -->
<!-- ~/.m2/settings.xml add <server/> with the support portal credentials -->
<id>sencha-gxt-repository</id>
<name>Sencha GXT Repository</name>

<!-- Commercial (with Support) -->
<!-- <url>https://maven.sencha.com/repo/gxt-commercial-release</url> -->
<url>https://maven.sencha.com/repo/gxt-support-commercial-release</url>
<!-- <url>https://maven.sencha.com/repo/gxt-commercial-snapshot</url> -->

<!-- GPL -->
<!-- <url>https://maven.sencha.com/repo/gxt-gpl-release</url> -->
<!-- <url>https://maven.sencha.com/repo/gxt-gpl-snapshot</url> -->

<!-- GPL with Support -->
<!-- <url>https://maven.sencha.com/repo/gxt-support-gpl-release</url> -->
<!-- <url>https://maven.sencha.com/repo/gxt-support-commercial-release</url> -->
<url>https://maven.sencha.com/repo/gxt-commercial-snapshot</url>
</repository>
</repositories>

<!-- Maven Exec, it uses the theme builder -->
<pluginRepositories>
<pluginRepository>
<repository>
<id>snapshots-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
Expand All @@ -309,66 +268,46 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
<layout>default</layout>
</pluginRepository>
<pluginRepository>
<!-- http://docs.sencha.com/gxt/latest/getting_started/maven/Maven.html -->
<!-- ~/.m2/settings.xml add <server/> with the support portal credentials -->
<id>sencha-gxt-repository</id>
<name>Sencha GXT Repository</name>

<!-- Commercial (with Support) -->
<!-- <url>https://maven.sencha.com/repo/gxt-commercial-release</url> -->
<!-- <url>https://maven.sencha.com/repo/gxt-support-commercial-release</url> -->
<url>https://maven.sencha.com/repo/gxt-commercial-snapshot</url>

<!-- GPL -->
<!-- <url>https://maven.sencha.com/repo/gxt-gpl-release</url> -->
<!-- <url>https://maven.sencha.com/repo/gxt-gpl-snapshot</url> -->

<!-- GPL with Support -->
<!-- <url>https://maven.sencha.com/repo/gxt-support-gpl-release</url> -->
</repository>
</repositories>

<layout>default</layout>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
</pluginRepository>
</pluginRepositories>
<!-- GWT (BOM or Bill of Materials) -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt</artifactId>
<version>${gwt.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
<!-- GWT -->
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<version>${gwt.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<version>${gwt.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
<version>${gwt.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.google.gwt.inject</groupId>
<artifactId>gin</artifactId>
<version>2.1.2</version>
</dependency>

<!-- GXT -->
<dependency>
<groupId>com.sencha.gxt</groupId>
<artifactId>gxt</artifactId>
Expand Down Expand Up @@ -410,7 +349,6 @@
<dependency>
<groupId>com.google.web.bindery</groupId>
<artifactId>requestfactory-apt</artifactId>
<version>${gwt.version}</version>
<scope>provided</scope>
</dependency>
<!-- RF needs a JSON jar at runtime -->
Expand All @@ -425,7 +363,6 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
<scope>compile</scope>
</dependency>
<!-- Simple javax.validation impl -->
Expand All @@ -437,6 +374,12 @@
</dependency>

<!-- Testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.senchalabs.gwt</groupId>
<artifactId>gxt-driver</artifactId>
Expand Down

0 comments on commit 698410d

Please sign in to comment.