You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by st...@apache.org on 2018/10/28 12:08:46 UTC
[openjpa] branch master updated (9d4b2ec -> 7ece63d)
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git.
from 9d4b2ec OPENJPA-2753 deduplicate database configurations
new 5c38bfa OPENJPA-2754 update to latest dbcp2 SNAPSHOT
new 7ece63d replace tabs with spaces - no functional change!
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
openjpa-features/pom.xml | 126 +++++++-------
openjpa-features/src/main/feature/feature.xml | 6 +-
openjpa-jest/pom.xml | 28 ++--
openjpa-tools/openjpa-fetch-statistics-was/pom.xml | 184 ++++++++++-----------
openjpa-tools/openjpa-fetch-statistics/pom.xml | 150 ++++++++---------
openjpa/pom.xml | 34 ++--
pom.xml | 18 +-
7 files changed, 274 insertions(+), 272 deletions(-)
[openjpa] 02/02: replace tabs with spaces - no functional change!
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit 7ece63de3c379556f0b1559733dde9b9da64a1f9
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sun Oct 28 13:07:42 2018 +0100
replace tabs with spaces - no functional change!
Space indention is what we use in most of OpenJPA.
---
openjpa-features/pom.xml | 126 +++++++-------
openjpa-features/src/main/feature/feature.xml | 6 +-
openjpa-jest/pom.xml | 28 ++--
openjpa-tools/openjpa-fetch-statistics-was/pom.xml | 184 ++++++++++-----------
openjpa-tools/openjpa-fetch-statistics/pom.xml | 150 ++++++++---------
openjpa/pom.xml | 34 ++--
pom.xml | 10 +-
7 files changed, 269 insertions(+), 269 deletions(-)
diff --git a/openjpa-features/pom.xml b/openjpa-features/pom.xml
index c184099..5a6b555 100644
--- a/openjpa-features/pom.xml
+++ b/openjpa-features/pom.xml
@@ -1,73 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<!-- Please keep the project tag on one line to avoid confusing the release
- plugin. -->
+ plugin. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-parent</artifactId>
+ <version>3.0.1-SNAPSHOT</version>
+ </parent>
- <artifactId>openjpa-features</artifactId>
- <packaging>pom</packaging>
- <name>OpenJPA Features</name>
+ <artifactId>openjpa-features</artifactId>
+ <packaging>pom</packaging>
+ <name>OpenJPA Features</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <configuration>
- </configuration>
- <executions>
- <execution>
- <id>compile</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>features-generate-descriptor</goal>
- </goals>
- <configuration>
- <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>target/feature/feature.xml</file>
- <classifier>features</classifier>
- <type>xml</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>features-generate-descriptor</goal>
+ </goals>
+ <configuration>
+ <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/feature/feature.xml</file>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/openjpa-features/src/main/feature/feature.xml b/openjpa-features/src/main/feature/feature.xml
index 4acc188..c49ac3a 100644
--- a/openjpa-features/src/main/feature/feature.xml
+++ b/openjpa-features/src/main/feature/feature.xml
@@ -24,9 +24,9 @@
<bundle dependency="true">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
- <bundle dependency="true">mvn:org.apache.commons/commons-pool2/2.6.0</bundle>
- <bundle dependency="true">mvn:org.apache.commons/commons-dbcp2/2.5.0</bundle>
- <bundle dependency="true">mvn:commons-collections/commons-collections4/4.3</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-pool2/2.6.0</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-dbcp2/2.5.0</bundle>
+ <bundle dependency="true">mvn:commons-collections/commons-collections4/4.3</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.14.1_1</bundle>
<bundle dependency="true">mvn:org.apache.xbean/xbean-asm6-shaded/4.9</bundle>
<bundle>mvn:org.apache.openjpa/openjpa/${project.version}</bundle>
diff --git a/openjpa-jest/pom.xml b/openjpa-jest/pom.xml
index 69ba3c4..47a100b 100644
--- a/openjpa-jest/pom.xml
+++ b/openjpa-jest/pom.xml
@@ -61,22 +61,22 @@
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.7.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jci-rhino</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.7.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-rhino</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -101,6 +101,6 @@
</executions>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
diff --git a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
index cad880c..f2abfb4 100644
--- a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
+++ b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
@@ -1,64 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<!-- Maven release plugin requires the project tag to be on a single line. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-tools</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-tools</artifactId>
+ <version>3.0.1-SNAPSHOT</version>
+ </parent>
- <artifactId>openjpa-fetch-statistics-was</artifactId>
- <packaging>jar</packaging>
+ <artifactId>openjpa-fetch-statistics-was</artifactId>
+ <packaging>jar</packaging>
- <name>OpenJPA Fetching Statistic Tool -- WAS Bundle</name>
- <description> OpenJPA tool to capture the fetching statistic data for the persistent fields .</description>
- <inceptionYear>2012</inceptionYear>
+ <name>OpenJPA Fetching Statistic Tool -- WAS Bundle</name>
+ <description> OpenJPA tool to capture the fetching statistic data for the persistent fields .</description>
+ <inceptionYear>2012</inceptionYear>
- <properties>
- <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
- </properties>
+ <properties>
+ <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-fetch-statistics</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-fetch-statistics</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
- <licenses>
- <license>
- <name>Apache License 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>Apache License 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
- <build>
- <!-- Skip the default jar so it doesn't overwrite the shaded jar -->
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
+ <build>
+ <!-- Skip the default jar so it doesn't overwrite the shaded jar -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -68,48 +68,48 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args}</argLine>
- <excludes>
- <!-- exclude the unit test since the fetch statistic enhancer cannot
- be load during maven build -->
- <exclude>org/apache/openjpa/enhance/stats/TestFetchStatistics.java</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args}</argLine>
+ <excludes>
+ <!-- exclude the unit test since the fetch statistic enhancer cannot
+ be load during maven build -->
+ <exclude>org/apache/openjpa/enhance/stats/TestFetchStatistics.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>org.apache.openjpa:*statistics</include>
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <manifestEntries>
- <Fragment-Host>com.ibm.ws.jpa; bundle-version=8.0.0</Fragment-Host>
- <Export-Package>org.apache.openjpa.enhance.stats</Export-Package>
- <Bundle-SymbolicName>org.apache.openjpa.enhance.stats; singleton:=true</Bundle-SymbolicName>
- <Bundle-Name>FetchStatisticsAuxEnhancer</Bundle-Name>
- </manifestEntries>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.apache.openjpa:*statistics</include>
+ </includes>
+ </artifactSet>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <Fragment-Host>com.ibm.ws.jpa; bundle-version=8.0.0</Fragment-Host>
+ <Export-Package>org.apache.openjpa.enhance.stats</Export-Package>
+ <Bundle-SymbolicName>org.apache.openjpa.enhance.stats; singleton:=true</Bundle-SymbolicName>
+ <Bundle-Name>FetchStatisticsAuxEnhancer</Bundle-Name>
+ </manifestEntries>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/openjpa-tools/openjpa-fetch-statistics/pom.xml b/openjpa-tools/openjpa-fetch-statistics/pom.xml
index 66a6d64..7684331 100644
--- a/openjpa-tools/openjpa-fetch-statistics/pom.xml
+++ b/openjpa-tools/openjpa-fetch-statistics/pom.xml
@@ -1,92 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<!-- Maven release plugin requires the project tag to be on a single line. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-tools</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-tools</artifactId>
+ <version>3.0.1-SNAPSHOT</version>
+ </parent>
- <artifactId>openjpa-fetch-statistics</artifactId>
- <packaging>jar</packaging>
+ <artifactId>openjpa-fetch-statistics</artifactId>
+ <packaging>jar</packaging>
- <name>OpenJPA Fetching Statistic Tool</name>
- <description> OpenJPA tool to capture the fetching statistic data for the persistent fields .</description>
- <inceptionYear>2012</inceptionYear>
+ <name>OpenJPA Fetching Statistic Tool</name>
+ <description> OpenJPA tool to capture the fetching statistic data for the persistent fields .</description>
+ <inceptionYear>2012</inceptionYear>
- <properties>
- <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
- </properties>
+ <properties>
+ <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-kernel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
- <licenses>
- <license>
- <name>Apache License 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>Apache License 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args}</argLine>
- <excludes>
- <!-- exclude the unit test since the fetch statistic enhancer cannot
- be load during maven build -->
- <exclude>org/apache/openjpa/enhance/stats/TestFetchStatistics.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args}</argLine>
+ <excludes>
+ <!-- exclude the unit test since the fetch statistic enhancer cannot
+ be load during maven build -->
+ <exclude>org/apache/openjpa/enhance/stats/TestFetchStatistics.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/openjpa/pom.xml b/openjpa/pom.xml
index 49ac8e2..26ec0d0 100644
--- a/openjpa/pom.xml
+++ b/openjpa/pom.xml
@@ -121,23 +121,23 @@
<Private-Package />
<Export-Package>org.apache.openjpa.*;version=${project.version}</Export-Package>
<Import-Package>
- oracle.jdbc.pool;resolution:=optional,
- oracle.jdbc;resolution:=optional,
- oracle.sql;resolution:=optional,
- com.ibm.*;resolution:=optional,
- org.postgresql.*;resolution:=optional,
- org.apache.tools.ant.*;resolution:=optional,
- org.apache.log4j.*;resolution:=optional,
- org.slf4j.*;resolution:=optional,
- org.apache.commons.logging.*;resolution:=optional,
- javax.activation.xa*;resolution:=optional,
- javax.jms.*;version="[1.1.0,1.2)";resolution:=optional,
- javax.transaction.*;version="[1.1,1.3)";resolution:=optional,
- javax.validation.*;version="[1.0.0,1.1)";resolution:=optional,
- javax.xml.bind.*;resolution:=optional,
- serp.*;resolution:=optional,
- javax.persistence.*;version="[1.1.0,2.2)",
- *
+ oracle.jdbc.pool;resolution:=optional,
+ oracle.jdbc;resolution:=optional,
+ oracle.sql;resolution:=optional,
+ com.ibm.*;resolution:=optional,
+ org.postgresql.*;resolution:=optional,
+ org.apache.tools.ant.*;resolution:=optional,
+ org.apache.log4j.*;resolution:=optional,
+ org.slf4j.*;resolution:=optional,
+ org.apache.commons.logging.*;resolution:=optional,
+ javax.activation.xa*;resolution:=optional,
+ javax.jms.*;version="[1.1.0,1.2)";resolution:=optional,
+ javax.transaction.*;version="[1.1,1.3)";resolution:=optional,
+ javax.validation.*;version="[1.0.0,1.1)";resolution:=optional,
+ javax.xml.bind.*;resolution:=optional,
+ serp.*;resolution:=optional,
+ javax.persistence.*;version="[1.1.0,2.2)",
+ *
</Import-Package>
</instructions>
</configuration>
diff --git a/pom.xml b/pom.xml
index 8e1e5bb..64eee5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -692,7 +692,7 @@
You must also set the following properties:
-Dopenjpa.mssql.url=jdbc:sqlserver://<HOST>:<PORT>;\
- DataBaseName=<DBNAME>
+ DataBaseName=<DBNAME>
-Dopenjpa.mssql.username=<mssql_uid>
-Dopenjpa.mssql.password=<mssql_pwd>
@@ -941,7 +941,7 @@
Example db2 profile. You can use this profile if you:
1) have the DB2 artifacts installed in a local repo and supply
the URL:
- -Ddb2.maven.repo=http://my.local.repo
+ -Ddb2.maven.repo=http://my.local.repo
2) have a copy of the DB2 JCC driver and run the following
commands :
mvn install:install-file -Dfile=${path to db2jcc.jar} \
@@ -1084,10 +1084,10 @@
Example Informix JCC profile. You can use this profile if you:
1a) have the DB2 JCC artifacts installed in a local repo and
supply the URL:
- -Dids.maven.repo=http://my.local.repo
+ -Dids.maven.repo=http://my.local.repo
1b) or have a copy of the DB2 JCC driver and run the commands
listed above in the test-db2-jcc profile.
- 2) have the DRDA service enabled on the IDS server, which
+ 2) have the DRDA service enabled on the IDS server, which
is usually port 9089
You must also set the following properties:
@@ -1227,7 +1227,7 @@
Example oracle profile. You can use this profile if you:
1) have the Oracle artifacts installed in a local repo and
supply the URL:
- -Doracle.maven.repo=http://my.local.repo
+ -Doracle.maven.repo=http://my.local.repo
2) have a copy of the Oracle driver and run the following
command:
mvn install:install-file -Dfile=${path to ojdbc.jar} \
[openjpa] 01/02: OPENJPA-2754 update to latest dbcp2 SNAPSHOT
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit 5c38bfaa49a2f9485a690e147f07399047f7d2d2
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sun Oct 28 13:05:08 2018 +0100
OPENJPA-2754 update to latest dbcp2 SNAPSHOT
This also requires us to update to apache commons-pool-2.6.1-SNAPSHOT
and commons-dbcp2-2.6.0-SNAPSHOT.
Both are NOT yet released, but important to solve a deadlock which kills
our unit tests and has already hit me in production as well.
---
pom.xml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 79916d7..8e1e5bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -584,6 +584,8 @@
<!-- DBCP overrides for MySQL testing -->
<dbcp.maxIdle>0</dbcp.maxIdle>
<dbcp.minIdle>0</dbcp.minIdle>
+
+ <mysql.server.version>5.7</mysql.server.version>
</properties>
<build>
@@ -594,7 +596,7 @@
<configuration>
<images>
<image>
- <name>mysql/mysql-server:5.7</name>
+ <name>mysql/mysql-server:${mysql.server.version}</name>
<run>
<env>
<MYSQL_DATABASE>${openjpa.mysql.dbname}</MYSQL_DATABASE>
@@ -1340,7 +1342,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -1406,7 +1408,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>